diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index a36049ec9..bf458dd69 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -128,8 +128,6 @@
         <meta-data
                 android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
                 android:value="false"/>
-        <activity
-            android:name=".ui.activities.AboutActivity" />
         <activity
             android:name=".ui.activities.TaskFormActivity"
             android:parentActivityName=".ui.activities.MainActivity"
diff --git a/Habitica/AndroidManifestTesting.xml b/Habitica/AndroidManifestTesting.xml
index a22b7fb94..c8bb120d4 100644
--- a/Habitica/AndroidManifestTesting.xml
+++ b/Habitica/AndroidManifestTesting.xml
@@ -66,10 +66,6 @@
             android:screenOrientation="portrait">
         </activity>
 
-        <activity
-            android:name=".ui.activities.AboutActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
-            android:screenOrientation="portrait"/>
         <activity
             android:name=".ui.activities.TaskFormActivity"
             android:theme="@style/AppThemeWithActionBarBlackText"
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 6354a298a..ea97f898e 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -60,7 +60,7 @@ dependencies {
     compileOnly 'com.github.pengrad:jdk9-deps:1.0'
     //App Compatibility and Material Design
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     // Emojis
@@ -343,4 +343,4 @@ gradle.projectsEvaluated {
 
 check { findbugs { skip true } }
 
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'
diff --git a/Habitica/res/drawable-mdpi/layout_rounded_bg_gray.xml b/Habitica/res/drawable-mdpi/layout_rounded_bg_gray.xml
index 2bbaf940d..deb24efa2 100644
--- a/Habitica/res/drawable-mdpi/layout_rounded_bg_gray.xml
+++ b/Habitica/res/drawable-mdpi/layout_rounded_bg_gray.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/task_gray" />
+    <solid android:color="@color/disabled_background" />
     <corners android:radius="@dimen/bar_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/achievement_section_badge_bg.xml b/Habitica/res/drawable/achievement_section_badge_bg.xml
index ae119c105..d71c5e6da 100644
--- a/Habitica/res/drawable/achievement_section_badge_bg.xml
+++ b/Habitica/res/drawable/achievement_section_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_700" />
+    <solid android:color="@color/window_background" />
     <corners android:radius="12dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/adventure_guide_menu_card_bg.xml b/Habitica/res/drawable/adventure_guide_menu_card_bg.xml
index be6da8b36..e0ff6fc6e 100644
--- a/Habitica/res/drawable/adventure_guide_menu_card_bg.xml
+++ b/Habitica/res/drawable/adventure_guide_menu_card_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-            <solid android:color="@color/white" />
+            <solid android:color="?attr/colorContentBackground" />
             <corners android:radius="8dp" />
         </shape>
diff --git a/Habitica/res/drawable/adventure_guide_menu_card_gray.xml b/Habitica/res/drawable/adventure_guide_menu_card_gray.xml
index 4a16d5346..264f19e60 100644
--- a/Habitica/res/drawable/adventure_guide_menu_card_gray.xml
+++ b/Habitica/res/drawable/adventure_guide_menu_card_gray.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
         <size android:width="24dp" android:height="80dp" />
-        <solid android:color="@color/gray_700" />
+        <solid android:color="@color/window_background" />
         <corners android:topRightRadius="8dp" android:bottomRightRadius="8dp" />
     </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/badge_gray.xml b/Habitica/res/drawable/badge_gray.xml
index 206ef9eac..eb5012f9f 100644
--- a/Habitica/res/drawable/badge_gray.xml
+++ b/Habitica/res/drawable/badge_gray.xml
@@ -4,7 +4,7 @@
     <corners
         android:radius="100dip"/>
     <solid
-        android:color="@color/gray_600" />
+        android:color="@color/offset_background" />
     <padding
         android:left="6dip"
         android:right="6dip" />
diff --git a/Habitica/res/drawable/border_1f000000_white.xml b/Habitica/res/drawable/border_1f000000_white.xml
index d873a2142..feea4b815 100644
--- a/Habitica/res/drawable/border_1f000000_white.xml
+++ b/Habitica/res/drawable/border_1f000000_white.xml
@@ -1,7 +1,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/content_background" />
 
     <stroke
         android:width="0.5dip"
diff --git a/Habitica/res/drawable/button_background_gray_700.xml b/Habitica/res/drawable/button_background_gray_700.xml
index 88cf27460..701f12e7a 100644
--- a/Habitica/res/drawable/button_background_gray_700.xml
+++ b/Habitica/res/drawable/button_background_gray_700.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/window_background" />
     <corners android:radius="8dp"/>
     <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/button_background_gray_600.xml b/Habitica/res/drawable/button_background_offset.xml
similarity index 81%
rename from Habitica/res/drawable/button_background_gray_600.xml
rename to Habitica/res/drawable/button_background_offset.xml
index 9d6ccf7a2..f2b1e94c5 100644
--- a/Habitica/res/drawable/button_background_gray_600.xml
+++ b/Habitica/res/drawable/button_background_offset.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_600" />
+    <solid android:color="@color/offset_background" />
     <corners android:radius="8dp"/>
     <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/button_gray_100.xml b/Habitica/res/drawable/button_gray_100.xml
index cb6e59ecd..eb34b9075 100644
--- a/Habitica/res/drawable/button_gray_100.xml
+++ b/Habitica/res/drawable/button_gray_100.xml
@@ -5,7 +5,7 @@
     <item android:state_pressed="true" >
         <shape>
             <solid
-                android:color="@color/gray_200"/>
+                android:color="@color/inverted_background_offset"/>
             <corners
                 android:radius="3dp" />
             <padding
@@ -19,7 +19,7 @@
     <item android:state_focused="true" >
         <shape>
             <solid
-                android:color="@color/gray_200"
+                android:color="@color/inverted_background_offset"
                 android:angle="270" />
             <corners
                 android:radius="3dp" />
@@ -34,7 +34,7 @@
     <item>
         <shape>
             <solid
-                android:color="@color/gray_100"
+                android:color="@color/inverted_background"
                 android:angle="270" />
             <corners
                 android:radius="3dp" />
diff --git a/Habitica/res/drawable/circle_gray300.xml b/Habitica/res/drawable/circle_gray300.xml
index ba3d669da..771682691 100644
--- a/Habitica/res/drawable/circle_gray300.xml
+++ b/Habitica/res/drawable/circle_gray300.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/gray_300" />
+    <solid android:color="@color/dimmed_background" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/circle_gray600.xml b/Habitica/res/drawable/circle_offset.xml
similarity index 71%
rename from Habitica/res/drawable/circle_gray600.xml
rename to Habitica/res/drawable/circle_offset.xml
index e2ac51390..736390730 100644
--- a/Habitica/res/drawable/circle_gray600.xml
+++ b/Habitica/res/drawable/circle_offset.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/gray_600" />
+    <solid android:color="@color/offset_background" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/daily_checked.xml b/Habitica/res/drawable/daily_checked.xml
index 4791df6b4..a4e22f21e 100644
--- a/Habitica/res/drawable/daily_checked.xml
+++ b/Habitica/res/drawable/daily_checked.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-            <solid android:color="@color/gray_600" />
+            <solid android:color="@color/offset_background" />
             <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
             <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
         </shape>
diff --git a/Habitica/res/drawable/edittext.xml b/Habitica/res/drawable/edittext.xml
index d396af7fa..c6d6d5cff 100644
--- a/Habitica/res/drawable/edittext.xml
+++ b/Habitica/res/drawable/edittext.xml
@@ -2,14 +2,14 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:top="18dp">
         <shape android:shape="rectangle">
-            <solid android:color="@color/gray_500" />
+            <solid android:color="@color/content_background_offset" />
             <corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
         </shape>
     </item>
 
     <item android:bottom="2dp" android:top="18dp">
         <shape android:shape="rectangle">
-            <solid android:color="@color/gray_700" />
+            <solid android:color="@color/window_background" />
             <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
         </shape>
     </item>
diff --git a/Habitica/res/drawable/gradient_white.xml b/Habitica/res/drawable/gradient_white.xml
index bb76b3c28..23d57b8da 100644
--- a/Habitica/res/drawable/gradient_white.xml
+++ b/Habitica/res/drawable/gradient_white.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
     <gradient
         android:angle="90"
-        android:endColor="@color/white_80_alpha"
-        android:startColor="@color/white"
+        android:endColor="@color/content_80_alpha"
+        android:startColor="@color/content_background"
         android:type="linear" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/habit_circle_disabled.xml b/Habitica/res/drawable/habit_circle_disabled.xml
index a28001791..02b91d8f0 100644
--- a/Habitica/res/drawable/habit_circle_disabled.xml
+++ b/Habitica/res/drawable/habit_circle_disabled.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size android:width="24dp" android:height="24dp" />
-    <stroke android:color="@color/gray_600" android:width="2dp" />
+    <stroke android:color="@color/offset_background" android:width="2dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/habit_scoring_circle.xml b/Habitica/res/drawable/habit_scoring_circle.xml
index 92011318e..170bb9a37 100644
--- a/Habitica/res/drawable/habit_scoring_circle.xml
+++ b/Habitica/res/drawable/habit_scoring_circle.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size android:width="32dp" android:height="32dp" />
-    <stroke android:width="2dp" android:color="@color/gray_500" />
+    <stroke android:width="2dp" android:color="@color/content_background_offset" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_content.xml
similarity index 70%
rename from Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml
rename to Habitica/res/drawable/layout_rounded_bg_content.xml
index 995c49409..9f6e1d1b0 100644
--- a/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_content.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/content_background" />
     <corners android:radius="@dimen/rounded_button_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
-    <stroke android:color="@color/brand_400" android:width="2dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_white_15.xml b/Habitica/res/drawable/layout_rounded_bg_content_15.xml
similarity index 83%
rename from Habitica/res/drawable/layout_rounded_bg_white_15.xml
rename to Habitica/res/drawable/layout_rounded_bg_content_15.xml
index 105d509bf..857440121 100644
--- a/Habitica/res/drawable/layout_rounded_bg_white_15.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_content_15.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white_15_alpha" />
+    <solid android:color="@color/content_15_alpha" />
     <corners android:radius="@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/layout_rounded_bg_gray_50.xml b/Habitica/res/drawable/layout_rounded_bg_gray_50.xml
index 5956941ef..3ee982385 100644
--- a/Habitica/res/drawable/layout_rounded_bg_gray_50.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_gray_50.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_50" />
+    <solid android:color="@color/equipment_overview_background" />
     <corners android:radius="@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/layout_rounded_bg_light_gray.xml b/Habitica/res/drawable/layout_rounded_bg_light_gray.xml
index cfa64aed6..051bbab11 100644
--- a/Habitica/res/drawable/layout_rounded_bg_light_gray.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_light_gray.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_500" />
+    <solid android:color="@color/content_background_offset" />
     <corners android:radius="@dimen/bar_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_700.xml b/Habitica/res/drawable/layout_rounded_bg_offset.xml
similarity index 83%
rename from Habitica/res/drawable/layout_rounded_bg_gray_700.xml
rename to Habitica/res/drawable/layout_rounded_bg_offset.xml
index a5b041924..e2b945656 100644
--- a/Habitica/res/drawable/layout_rounded_bg_gray_700.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_offset.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/offset_background" />
     <corners android:radius="@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/layout_rounded_bg_shopitem.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem.xml
index cff7a3e3c..026862756 100644
--- a/Habitica/res/drawable/layout_rounded_bg_shopitem.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_shopitem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/window_background" />
     <corners android:radius="6dp"/>
     <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/layout_rounded_bg_shopitem_price.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml
index d6f0b7a0c..fb3137234 100644
--- a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_600_30" />
+    <solid android:color="@color/offset_background_30" />
     <corners android:bottomLeftRadius="6dp" android:bottomRightRadius="6dp"/>
     <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/layout_rounded_bg_white.xml b/Habitica/res/drawable/layout_rounded_bg_white.xml
index 7afab5887..9f6e1d1b0 100644
--- a/Habitica/res/drawable/layout_rounded_bg_white.xml
+++ b/Habitica/res/drawable/layout_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="?colorContentBackground" />
+    <solid android:color="@color/content_background" />
     <corners android:radius="@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/layout_rounded_bg_gray_600.xml b/Habitica/res/drawable/layout_rounded_bg_window.xml
similarity index 83%
rename from Habitica/res/drawable/layout_rounded_bg_gray_600.xml
rename to Habitica/res/drawable/layout_rounded_bg_window.xml
index 30464dd0d..f3645d99d 100644
--- a/Habitica/res/drawable/layout_rounded_bg_gray_600.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_window.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_600" />
+    <solid android:color="@color/window_background" />
     <corners android:radius="@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/layout_rounded_bg_brand_700_blue_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml
similarity index 85%
rename from Habitica/res/drawable/layout_rounded_bg_brand_700_blue_border.xml
rename to Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml
index dc327ae97..8046a6e8e 100644
--- a/Habitica/res/drawable/layout_rounded_bg_brand_700_blue_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/window_background" />
     <corners android:radius="@dimen/bar_radius"/>
     <stroke android:width="2dp" android:color="@color/blue_10" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml
similarity index 85%
rename from Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml
rename to Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml
index 5f9772be1..d178b01ac 100644
--- a/Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/window_background" />
     <corners android:radius="@dimen/bar_radius"/>
     <stroke android:width="2dp" android:color="@color/brand_300" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_red_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml
similarity index 85%
rename from Habitica/res/drawable/layout_rounded_bg_brand_700_red_border.xml
rename to Habitica/res/drawable/layout_rounded_bg_window_red_border.xml
index 122801662..2a67aca44 100644
--- a/Habitica/res/drawable/layout_rounded_bg_brand_700_red_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/window_background" />
     <corners android:radius="@dimen/bar_radius"/>
     <stroke android:width="2dp" android:color="@color/red_10" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
diff --git a/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml
new file mode 100644
index 000000000..d896b0dc6
--- /dev/null
+++ b/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/window_background" />
+    <corners android:radius="@dimen/rounded_button_radius"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+    <stroke android:color="?colorAccent" android:width="2dp" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml
similarity index 85%
rename from Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml
rename to Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml
index dfb258934..984a3d92f 100644
--- a/Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/window_background" />
     <corners android:radius="@dimen/bar_radius"/>
     <stroke android:width="2dp" android:color="@color/yellow_5" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
diff --git a/Habitica/res/drawable/layout_top_rounded_bg.xml b/Habitica/res/drawable/layout_top_rounded_bg.xml
index dc5b74047..bc5828111 100644
--- a/Habitica/res/drawable/layout_top_rounded_bg.xml
+++ b/Habitica/res/drawable/layout_top_rounded_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white" />
+    <solid android:color="?attr/colorContentBackground" />
     <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/nav_item_color_state.xml b/Habitica/res/drawable/nav_item_color_state.xml
index 0f4955173..c9ab128ae 100644
--- a/Habitica/res/drawable/nav_item_color_state.xml
+++ b/Habitica/res/drawable/nav_item_color_state.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:state_enabled="true" />
-    <item android:color="?colorPrimaryOffset" android:state_enabled="false" />
+    <item android:color="@color/content_background" android:state_enabled="true" />
+    <item android:color="@color/brand_background_dark" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg.xml b/Habitica/res/drawable/pill_bg.xml
index c5f636827..70382d6db 100644
--- a/Habitica/res/drawable/pill_bg.xml
+++ b/Habitica/res/drawable/pill_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/pill_gray"/>
+    <solid android:color="@color/window_background"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_white.xml b/Habitica/res/drawable/pill_bg_content.xml
similarity index 81%
rename from Habitica/res/drawable/pill_bg_white.xml
rename to Habitica/res/drawable/pill_bg_content.xml
index f90c324d3..34654a9f6 100644
--- a/Habitica/res/drawable/pill_bg_white.xml
+++ b/Habitica/res/drawable/pill_bg_content.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white"/>
+    <solid android:color="@color/content_background"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_gray.xml b/Habitica/res/drawable/pill_bg_gray.xml
index 37fceb493..04853c7e8 100644
--- a/Habitica/res/drawable/pill_bg_gray.xml
+++ b/Habitica/res/drawable/pill_bg_gray.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_600"/>
+    <solid android:color="@color/offset_background"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_gray_100.xml b/Habitica/res/drawable/pill_bg_gray_100.xml
index d4d0a7406..83a555366 100644
--- a/Habitica/res/drawable/pill_bg_gray_100.xml
+++ b/Habitica/res/drawable/pill_bg_gray_100.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_100"/>
+    <solid android:color="@color/inverted_background"/>
     <corners android:radius="200dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_purple_400.xml b/Habitica/res/drawable/pill_bg_purple_400.xml
index 6d8163ecf..a97045794 100644
--- a/Habitica/res/drawable/pill_bg_purple_400.xml
+++ b/Habitica/res/drawable/pill_bg_purple_400.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/brand_400"/>
+    <solid android:color="@color/color_accent"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_radio_unselected.xml b/Habitica/res/drawable/pill_bg_radio_unselected.xml
index d115dede9..3c7f7ed72 100644
--- a/Habitica/res/drawable/pill_bg_radio_unselected.xml
+++ b/Habitica/res/drawable/pill_bg_radio_unselected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white"/>
+    <solid android:color="@color/content_background"/>
     <corners android:radius="20dip"/>
-    <stroke android:color="@color/days_gray" android:width="1dp" />
+    <stroke android:color="@color/separator" android:width="1dp" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_gray_700.xml b/Habitica/res/drawable/pill_bg_window.xml
similarity index 82%
rename from Habitica/res/drawable/pill_bg_gray_700.xml
rename to Habitica/res/drawable/pill_bg_window.xml
index fc8626c84..70382d6db 100644
--- a/Habitica/res/drawable/pill_bg_gray_700.xml
+++ b/Habitica/res/drawable/pill_bg_window.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700"/>
+    <solid android:color="@color/window_background"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/progressbar_red.xml b/Habitica/res/drawable/progressbar_red.xml
index 07df2d1a5..2a756725a 100644
--- a/Habitica/res/drawable/progressbar_red.xml
+++ b/Habitica/res/drawable/progressbar_red.xml
@@ -4,7 +4,7 @@
     <item android:id="@android:id/background">
         <shape>
             <solid
-                android:color="@color/white"
+                android:color="?attr/colorContentBackground"
                 />
 
         </shape>
diff --git a/Habitica/res/drawable/purchase_button_background.xml b/Habitica/res/drawable/purchase_button_background.xml
index 34ccf9ad2..0937d0259 100644
--- a/Habitica/res/drawable/purchase_button_background.xml
+++ b/Habitica/res/drawable/purchase_button_background.xml
@@ -26,7 +26,7 @@
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/gray_200">
+                android:color="@color/inverted_background_offset">
             </solid>
             <corners
                 android:radius="8dp">
@@ -36,7 +36,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/brand_400">
+                android:color="@color/color_accent">
             </solid>
             <corners
                 android:radius="8dp">
diff --git a/Habitica/res/drawable/quest_difficulty_bg.xml b/Habitica/res/drawable/quest_difficulty_bg.xml
index 96c52e317..7bcd3ecde 100644
--- a/Habitica/res/drawable/quest_difficulty_bg.xml
+++ b/Habitica/res/drawable/quest_difficulty_bg.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">
 
-    <solid android:color="@color/gray_700" />
+    <solid android:color="@color/window_background" />
     <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
 
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/rounded_border.xml b/Habitica/res/drawable/rounded_border.xml
index 8ceff4312..d239815b8 100644
--- a/Habitica/res/drawable/rounded_border.xml
+++ b/Habitica/res/drawable/rounded_border.xml
@@ -3,6 +3,6 @@
     <solid android:color="@color/transparent" />
     <stroke
         android:width="1dp"
-        android:color="@color/gray_600"/>
+        android:color="@color/offset_background"/>
     <corners android:radius="6dp" />
 </shape>
diff --git a/Habitica/res/drawable/rounded_border_white.xml b/Habitica/res/drawable/rounded_border_content.xml
similarity index 63%
rename from Habitica/res/drawable/rounded_border_white.xml
rename to Habitica/res/drawable/rounded_border_content.xml
index b1e7cce44..c768d51cf 100644
--- a/Habitica/res/drawable/rounded_border_white.xml
+++ b/Habitica/res/drawable/rounded_border_content.xml
@@ -1,8 +1,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/white" />
+    <solid android:color="@color/content_background" />
     <stroke
         android:width="1dp"
-        android:color="@color/gray_600"/>
+        android:color="@color/offset_background"/>
     <corners android:radius="6dp" />
 </shape>
diff --git a/Habitica/res/drawable/rounded_purple_square.xml b/Habitica/res/drawable/rounded_purple_square.xml
index 0dc0c7e65..043026ceb 100644
--- a/Habitica/res/drawable/rounded_purple_square.xml
+++ b/Habitica/res/drawable/rounded_purple_square.xml
@@ -2,15 +2,6 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
-    <!-- view background color -->
-    <solid
-        android:color="@color/brand_400" >
-    </solid>
-
-    <!-- Here is the corner radius -->
-    <corners
-        android:radius="5dp"   >
-    </corners>
-
+    <solid android:color="@color/brand_400" />
+    <corners android:radius="5dp"  />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/seekbar_thumb.xml b/Habitica/res/drawable/seekbar_thumb.xml
index 9babaf6f2..74a3d4b0a 100644
--- a/Habitica/res/drawable/seekbar_thumb.xml
+++ b/Habitica/res/drawable/seekbar_thumb.xml
@@ -10,10 +10,10 @@
             <size
                 android:width="10dp"
                 android:height="10dp" />
-            <solid android:color="@color/white" />
+            <solid android:color="@color/content_background" />
             <stroke
                 android:width="1dp"
-                android:color="@color/gray_400" />
+                android:color="@color/content_background_offset" />
         </shape>
     </rotate>
 </item>
diff --git a/Habitica/res/drawable/subscription_box_bg.xml b/Habitica/res/drawable/subscription_box_bg.xml
index cc3311445..bc7b82302 100644
--- a/Habitica/res/drawable/subscription_box_bg.xml
+++ b/Habitica/res/drawable/subscription_box_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700"/>
+    <solid android:color="@color/window_background"/>
     <corners android:radius="8dip"/>
     <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/subscription_box_bg_selected.xml b/Habitica/res/drawable/subscription_box_bg_selected.xml
index 3c5034039..3051368c3 100644
--- a/Habitica/res/drawable/subscription_box_bg_selected.xml
+++ b/Habitica/res/drawable/subscription_box_bg_selected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/gray_700"/>
+    <solid android:color="@color/window_background"/>
     <corners android:radius="8dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
-    <stroke android:color="@color/brand_400" android:width="3dp" />
+    <stroke android:color="@color/text_brand_neon" android:width="3dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/system_chat_background.xml b/Habitica/res/drawable/system_chat_background.xml
index 13de39f8d..ca5a8cd52 100644
--- a/Habitica/res/drawable/system_chat_background.xml
+++ b/Habitica/res/drawable/system_chat_background.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">
-    <stroke android:color="@color/gray_500" android:width="1dp" />
+    <stroke android:color="@color/content_background_offset" android:width="1dp" />
     <corners android:radius="4dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/task_background.xml b/Habitica/res/drawable/task_background.xml
index b803f0bfa..f4d0bf2b5 100644
--- a/Habitica/res/drawable/task_background.xml
+++ b/Habitica/res/drawable/task_background.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_700" />
+ <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="8dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/task_form_control_bg.xml b/Habitica/res/drawable/task_form_control_bg.xml
index 64cd42452..4e8a5ba4f 100644
--- a/Habitica/res/drawable/task_form_control_bg.xml
+++ b/Habitica/res/drawable/task_form_control_bg.xml
@@ -2,14 +2,14 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/gray_500" />
+            <solid android:color="@color/content_background_offset" />
             <corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
         </shape>
     </item>
 
     <item android:bottom="4dp">
         <shape android:shape="rectangle">
-            <solid android:color="@color/gray_700" />
+            <solid android:color="@color/window_background" />
             <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
         </shape>
     </item>
diff --git a/Habitica/res/drawable/todo_checked.xml b/Habitica/res/drawable/todo_checked.xml
index 35960c7b5..bbf9ee7d8 100644
--- a/Habitica/res/drawable/todo_checked.xml
+++ b/Habitica/res/drawable/todo_checked.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="oval">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-            <solid android:color="@color/gray_600" />
+            <solid android:color="@color/offset_background" />
             <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
             <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
         </shape>
diff --git a/Habitica/res/drawable/vertical_divider.xml b/Habitica/res/drawable/vertical_divider.xml
index bbf847fc5..8f0c41fc4 100644
--- a/Habitica/res/drawable/vertical_divider.xml
+++ b/Habitica/res/drawable/vertical_divider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size android:height="1dip" />
-    <solid android:color="@color/gray_500" />
+    <solid android:color="@color/separator" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/achievement_grid_item.xml b/Habitica/res/layout/achievement_grid_item.xml
index acf0fb446..cb586e0f6 100644
--- a/Habitica/res/layout/achievement_grid_item.xml
+++ b/Habitica/res/layout/achievement_grid_item.xml
@@ -8,13 +8,13 @@
     android:gravity="center_vertical"
     android:paddingTop="13dp"
     android:paddingBottom="13dp"
-    tools:background="@color/white">
+    tools:background="?attr/colorContentBackground">
     <LinearLayout
         android:id="@+id/achievement_container"
         android:layout_width="156dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:background="@drawable/layout_rounded_bg_window"
         android:clipChildren="true"
         android:layout_centerHorizontal="true"
         android:layout_alignParentTop="true"
@@ -37,8 +37,8 @@
             android:minHeight="40dp"
             style="@style/Body1"
             android:gravity="center"
-            android:textColor="@color/gray_100"
-            android:background="@color/gray_600"
+            android:textColor="@color/text_secondary"
+            android:background="@color/offset_background"
             android:paddingStart="@dimen/spacing_medium"
             android:paddingEnd="@dimen/spacing_medium"
             android:paddingTop="@dimen/spacing_small"
diff --git a/Habitica/res/layout/achievement_list_item.xml b/Habitica/res/layout/achievement_list_item.xml
index a74f7eb0c..3f14cbad6 100644
--- a/Habitica/res/layout/achievement_list_item.xml
+++ b/Habitica/res/layout/achievement_list_item.xml
@@ -43,12 +43,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/Body1"
-            android:textColor="@color/gray_100"/>
+            android:textColor="@color/text_primary"/>
         <TextView
             android:id="@+id/achievement_description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/Caption3"
-            android:textColor="@color/gray_100"/>
+            android:textColor="@color/text_secondary"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/achievement_quest_item.xml b/Habitica/res/layout/achievement_quest_item.xml
index e02d3234a..16ca8fd0e 100644
--- a/Habitica/res/layout/achievement_quest_item.xml
+++ b/Habitica/res/layout/achievement_quest_item.xml
@@ -12,9 +12,9 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:gravity="center"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         style="@style/Body1"
-        android:background="@drawable/circle_gray600"
+        android:background="@drawable/circle_offset"
         tools:text="12"
         android:layout_marginStart="35dp"
         android:layout_marginEnd="25dp"/>
@@ -23,6 +23,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/Body1"
-            android:textColor="@color/gray_100"
+            android:textColor="@color/text_secondary"
             tools:text="This is the quest title"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/achievement_section_header.xml b/Habitica/res/layout/achievement_section_header.xml
index 3701fd96a..a89675365 100644
--- a/Habitica/res/layout/achievement_section_header.xml
+++ b/Habitica/res/layout/achievement_section_header.xml
@@ -24,7 +24,7 @@
         android:background="@drawable/achievement_section_badge_bg"
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         style="@style/Overline"
         tools:text="1"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_about.xml b/Habitica/res/layout/activity_about.xml
deleted file mode 100644
index 0329f6e21..000000000
--- a/Habitica/res/layout/activity_about.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
-    android:background="@color/white">
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize"
-            android:theme="@style/Toolbar"
-            android:background="@color/brand_300"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
-
-    </com.google.android.material.appbar.AppBarLayout>
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.activities.AboutActivity">
-
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tab_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            android:elevation="6dp"
-            android:minHeight="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-        <androidx.viewpager.widget.ViewPager
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_below="@id/tab_layout"
-            android:background="@color/white"
-            />
-
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_adventure_guide.xml b/Habitica/res/layout/activity_adventure_guide.xml
index 5feab0ad1..bee332101 100644
--- a/Habitica/res/layout/activity_adventure_guide.xml
+++ b/Habitica/res/layout/activity_adventure_guide.xml
@@ -4,9 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.activities.PrefsActivity"
+    android:background="?attr/colorContentBackground"
     android:orientation="vertical"
-    android:background="@color/white">
+    tools:context=".ui.activities.PrefsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -16,86 +16,97 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/colorContentBackground"
             android:minHeight="?attr/actionBarSize"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/Theme.AppCompat.Light"
-            android:background="@color/white"/>
+            app:popupTheme="@style/Theme.AppCompat.Light" />
 
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbarSize="3dp"
-    android:scrollbarThumbVertical="@color/scrollbarThumb"
-    android:scrollbars="vertical">
-<LinearLayout
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal">
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/adventure_guide_art"
-        android:layout_marginBottom="@dimen/spacing_medium"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/getting_started"
-        style="@style/Subheader1"
-        android:textColor="@color/gray_50"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginBottom="@dimen/spacing_medium"/>
-    <TextView
-        android:id="@+id/description_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:text="@string/adventure_guide_description"
-        style="@style/Body2"
-        android:textColor="@color/gray_50"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"/>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/your_progress"
-            android:textColor="@color/gray_100"
-            style="@style/Caption1"/>
-        <Space
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content" />
-        <TextView
-            android:id="@+id/progress_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/Caption2.Regular"
-            android:textColor="@color/gray_300"
-            android:text="@string/lets_get_started"/>
-    </LinearLayout>
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginBottom="@dimen/spacing_medium"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:progressBackgroundTint="@color/gray_600"
-        android:progressTint="@color/yellow_50"/>
 
-    <LinearLayout
-        android:id="@+id/achievement_container"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"/>
-</LinearLayout>
-</androidx.core.widget.NestedScrollView>
+        android:layout_height="match_parent"
+        android:scrollbarSize="3dp"
+        android:scrollbarThumbVertical="@color/scrollbarThumb"
+        android:scrollbars="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_medium"
+                android:src="@drawable/adventure_guide_art" />
+
+            <TextView
+                style="@style/Subheader1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp"
+                android:layout_marginBottom="@dimen/spacing_medium"
+                android:text="@string/getting_started"
+                android:textColor="@color/text_primary" />
+
+            <TextView
+                android:id="@+id/description_view"
+                style="@style/Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp"
+                android:gravity="center_horizontal"
+                android:text="@string/adventure_guide_description"
+                android:textColor="@color/text_primary" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="30dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="30dp">
+
+                <TextView
+                    style="@style/Caption1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/your_progress"
+                    android:textColor="@color/text_secondary" />
+
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/progress_textview"
+                    style="@style/Caption2.Regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/lets_get_started"
+                    android:textColor="@color/text_quad" />
+            </LinearLayout>
+
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp"
+                android:layout_marginBottom="@dimen/spacing_medium"
+                android:progressBackgroundTint="@color/offset_background"
+                android:progressTint="@color/yellow_50" />
+
+            <LinearLayout
+                android:id="@+id/achievement_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml
index c27526a99..b267aa597 100644
--- a/Habitica/res/layout/activity_class_selection.xml
+++ b/Habitica/res/layout/activity_class_selection.xml
@@ -5,7 +5,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:background="@color/white">
+        android:background="@color/content_background">
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -16,10 +16,10 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar"
-            android:background="@color/white"
+            android:background="@color/content_background"
             app:layout_scrollFlags="scroll|enterAlways"
             app:title="@string/choose_class"
-            app:titleTextColor="@color/gray_50"
+            app:titleTextColor="@color/text_primary"
             app:theme="@style/ToolbarDarkBackArrow"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml
index 9c5cab514..1bca0492d 100644
--- a/Habitica/res/layout/activity_create_challenge.xml
+++ b/Habitica/res/layout/activity_create_challenge.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".ui.activities.PrefsActivity"
     android:orientation="vertical"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -202,7 +202,7 @@
 
                     android:hint="@string/identify_your_challenge_with_a_tag"
                     android:maxLines="1"
-                    android:textColor="@color/gray_100"
+                    android:textColor="@color/text_secondary"
                     android:textColorHint="#61000000" />
             </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml
index 7dce1e80b..38a142606 100644
--- a/Habitica/res/layout/activity_fixcharacter.xml
+++ b/Habitica/res/layout/activity_fixcharacter.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -32,7 +32,7 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/outer_inset"
                         android:text="@string/fix_character_description"
-                        android:background="@color/gray_700"
+                        android:background="@color/window_background"
                         android:layout_marginBottom="16dp"
                         />
                     <FrameLayout
@@ -55,7 +55,7 @@
                             android:layout_height="match_parent"
                             android:layout_width="0dp"
                             android:layout_weight="1"
-                            android:background="@drawable/layout_rounded_bg_gray_700"
+                            android:background="@drawable/layout_rounded_bg_window"
                             android:paddingTop="8dp"
                             android:hint="@string/health"
                             android:paddingStart="16dp">
@@ -76,7 +76,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="2dp"
                         android:layout_gravity="bottom"
-                        android:background="@color/gray_500"
+                        android:background="@color/content_background_offset"
                         android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -98,7 +98,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:paddingTop="8dp"
                                 android:hint="@string/experience_points"
                                 android:paddingStart="16dp">
@@ -119,7 +119,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/gray_500"
+                            android:background="@color/content_background_offset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -141,7 +141,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:paddingTop="8dp"
                                 android:hint="@string/mana_points"
                                 android:paddingStart="16dp">
@@ -162,7 +162,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/gray_500"
+                            android:background="@color/content_background_offset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -184,7 +184,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:paddingTop="8dp"
                                 android:hint="@string/gold_capitalilzed"
                                 android:paddingStart="16dp">
@@ -205,7 +205,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/gray_500"
+                            android:background="@color/content_background_offset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -227,7 +227,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:paddingTop="8dp"
                                 android:hint="@string/character_level"
                                 android:paddingStart="16dp">
@@ -248,7 +248,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/gray_500"
+                            android:background="@color/content_background_offset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -271,7 +271,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:paddingTop="8dp"
                                 android:hint="@string/streak_label"
                                 android:paddingStart="16dp">
@@ -292,7 +292,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/gray_500"
+                            android:background="@color/content_background_offset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                 </LinearLayout>
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index e5b00b214..4bc855e1a 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index aa1383e4c..1dea4dc04 100644
--- a/Habitica/res/layout/activity_gem_purchase.xml
+++ b/Habitica/res/layout/activity_gem_purchase.xml
@@ -21,7 +21,7 @@
                 android:id="@+id/fragment_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@android:color/white"
+                android:background="@color/content_background"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
             <com.google.android.material.appbar.AppBarLayout
@@ -35,7 +35,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="?attr/actionBarSize"
-                    android:background="@color/white"
+                    android:background="?attr/colorContentBackground"
                     app:layout_collapseMode="pin"
                     app:popupTheme="@style/Theme.AppCompat.Light" />
             </com.google.android.material.appbar.AppBarLayout>
diff --git a/Habitica/res/layout/activity_gift1get1_info.xml b/Habitica/res/layout/activity_gift1get1_info.xml
index 7834af30f..304d8cfc0 100644
--- a/Habitica/res/layout/activity_gift1get1_info.xml
+++ b/Habitica/res/layout/activity_gift1get1_info.xml
@@ -4,14 +4,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/white">
+    android:background="@color/content_background">
 
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="30dp"
-        android:background="@color/white">
+        android:background="@color/content_background">
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -124,7 +124,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/g1g1_info_2_text"
                 android:gravity="center"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:lineSpacingExtra="1dp"
                 android:layout_marginBottom="22dp"
                 android:layout_marginStart="15dp"
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/g1g1_info_3_text"
                 android:gravity="center"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:lineSpacingExtra="1dp"
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"/>
diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml
index faa1191b7..4fe107bcd 100644
--- a/Habitica/res/layout/activity_gift_gems.xml
+++ b/Habitica/res/layout/activity_gift_gems.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="@color/content_background">
     <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"
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         tools:context=".ui.activities.PrefsActivity"
         android:orientation="vertical"
-        android:background="@color/white">
+        android:background="@color/content_background">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
@@ -51,6 +51,6 @@
             android:layout_width="match_parent"
             android:layout_height="0px"
             android:layout_weight="1"
-            android:background="@android:color/white" />
+            android:background="@color/content_background" />
     </LinearLayout>
 </FrameLayout>
diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml
index 6a1cea61e..ef143df9f 100644
--- a/Habitica/res/layout/activity_gift_subscription.xml
+++ b/Habitica/res/layout/activity_gift_subscription.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
-    android:background="@color/white">
+    android:background="@color/content_background">
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -49,7 +49,7 @@
                 android:id="@+id/username_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:textSize="12sp"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="@dimen/spacing_large"/>
@@ -59,7 +59,7 @@
                 android:layout_gravity="center_horizontal"
                 android:gravity="center_horizontal"
                 android:text="@string/gift_subscription_subtitle"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:layout_marginLeft="@dimen/spacing_large"
                 android:layout_marginRight="@dimen/spacing_large"/>
             <LinearLayout
diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml
index 9096e6b16..4bb55468b 100644
--- a/Habitica/res/layout/activity_group_form.xml
+++ b/Habitica/res/layout/activity_group_form.xml
@@ -4,14 +4,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/gray_700">
+    android:background="@color/window_background">
 
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="30dp"
-        android:background="@color/white">
+        android:background="?attr/colorContentBackground">
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -46,21 +46,21 @@
             android:layout_marginLeft="@dimen/spacing_large"
             android:layout_marginRight="@dimen/spacing_large"
             android:background="@drawable/edittext"
-            android:textColorHint="@color/gray_50">
+            android:textColorHint="@color/text_primary">
             <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
                 android:id="@+id/group_name_edittext"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:hint="@string/name"
-                android:textColor="@android:color/black"
+                android:textColor="@color/text_primary"
                 android:inputType="textCapSentences"
                 android:background="@color/transparent"
                 android:paddingStart="@dimen/spacing_large"
                 android:paddingEnd="@dimen/spacing_large"
                 android:paddingBottom="@dimen/spacing_large"
                 android:paddingTop="20dp"
-                android:textColorHint="@color/gray_50"
+                android:textColorHint="@color/text_secondary"
                 />
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -72,7 +72,7 @@
                 android:layout_marginLeft="@dimen/spacing_large"
                 android:layout_marginRight="@dimen/spacing_large"
                 android:background="@drawable/edittext"
-                android:textColorHint="@color/gray_50">
+                android:textColorHint="@color/text_primary">
 
                 <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
                     android:id="@+id/group_description_edittext"
@@ -80,14 +80,14 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="@string/description"
-                    android:textColor="@android:color/black"
+                    android:textColor="@color/text_primary"
                     android:inputType="textCapSentences|textMultiLine"
                     android:background="@color/transparent"
                     android:paddingStart="@dimen/spacing_large"
                     android:paddingEnd="@dimen/spacing_large"
                     android:paddingBottom="@dimen/spacing_large"
                     android:paddingTop="20dp"
-                    android:textColorHint="@color/gray_50"
+                    android:textColorHint="@color/text_primary"
                     android:minLines="3"
                     android:gravity="top" />
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/Habitica/res/layout/activity_guidelines.xml b/Habitica/res/layout/activity_guidelines.xml
index e22db839a..87588e8ec 100644
--- a/Habitica/res/layout/activity_guidelines.xml
+++ b/Habitica/res/layout/activity_guidelines.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".ui.activities.PrefsActivity"
     android:orientation="vertical"
-    android:background="@color/white">
+    android:background="@color/content_background">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index a5dfb33e2..18b0b2d11 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.habitrpg.android.habitica.ui.activities.MainActivity"
-    android:background="@color/white">
+    android:background="@color/content_background">
 
     <!-- As the main content view, the view below consumes the entire
          space available using match_parent in both dimensions. -->
@@ -53,10 +53,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:minHeight="?attr/actionBarSize"
-                        android:theme="@style/Toolbar.Modern"
+                        style="@style/Toolbar.Modern"
                         android:background="?attr/headerBackgroundColor"
                         app:layout_collapseMode="pin"
-                        app:popupTheme="@style/Theme.AppCompat.Light">
+                        app:popupTheme="@style/Theme.AppCompat.DayNight">
                         <RelativeLayout
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
@@ -96,8 +96,6 @@
                     android:background="?headerOffsetColor"
                     android:elevation="0dp"
                     android:fillViewport="false"
-
-                    android:theme="@style/ThemeOverlay.AppCompat.Light"
                     app:layout_anchor="@+id/collapsing_toolbar"
                     app:layout_anchorGravity="bottom"
 
@@ -110,7 +108,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textColor="@color/white"
-                    android:background="@color/gray_50"
+                    android:background="@color/text_primary"
                     android:textSize="14sp"
                     android:gravity="center_horizontal"
                     android:padding="@dimen/spacing_small"
diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml
index 06f378e3a..b5222c833 100644
--- a/Habitica/res/layout/activity_notifications.xml
+++ b/Habitica/res/layout/activity_notifications.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".ui.activities.NotificationsActivity"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_party_invite.xml b/Habitica/res/layout/activity_party_invite.xml
index 8c62f603f..9b7df7b53 100644
--- a/Habitica/res/layout/activity_party_invite.xml
+++ b/Habitica/res/layout/activity_party_invite.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="@color/content_background">
     <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"
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         tools:context=".ui.activities.PrefsActivity"
         android:orientation="vertical"
-        android:background="@color/white">
+        android:background="@color/content_background">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
-        android:background="@color/gray_700"
+        android:background="@color/window_background"
         android:elevation="0dp"
         android:fillViewport="false"
 
@@ -51,7 +51,7 @@
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="1"
-        android:background="@android:color/white" />
+        android:background="@color/content_background" />
 
 </LinearLayout>
 
diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml
index 2139a4a7f..8667bdae2 100644
--- a/Habitica/res/layout/activity_prefs.xml
+++ b/Habitica/res/layout/activity_prefs.xml
@@ -6,7 +6,7 @@
              android:layout_height="match_parent"
              tools:context=".ui.activities.PrefsActivity"
     android:orientation="vertical"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index b67106b28..d2d6dfaab 100644
--- a/Habitica/res/layout/activity_report_message.xml
+++ b/Habitica/res/layout/activity_report_message.xml
@@ -22,7 +22,7 @@
             android:id="@+id/content_container"
             android:orientation="vertical" android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/white"
+            android:background="@color/content_background"
             >
             <com.google.android.material.appbar.AppBarLayout
                 android:id="@+id/app_bar"
@@ -37,9 +37,9 @@
                     android:minHeight="?attr/actionBarSize"
                     android:theme="@style/Toolbar"
                     app:title=""
-                    android:background="@color/white"
+                    android:background="@color/content_background"
                     app:layout_scrollFlags="scroll|enterAlways"
-                    app:titleTextColor="@color/gray_50"
+                    app:titleTextColor="@color/text_primary"
                     app:theme="@style/ReportMessageToolbar"
                     app:popupTheme="@style/ThemeOverlay.AppCompat.Dark">
                     <ImageButton
@@ -54,7 +54,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/report_violation"
                         android:textSize="20sp"
-                        android:textColor="@color/gray_50"
+                        android:textColor="@color/text_primary"
                         android:layout_marginEnd="36dp"
                         android:id="@+id/toolbar_title" />
                     <Button
@@ -87,7 +87,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     tools:text="Report NAME for violation:"
-                    android:textColor="@color/gray_10"
+                    android:textColor="@color/text_primary"
                     style="@style/Caption1"
                     android:layout_marginBottom="@dimen/spacing_medium"
                     android:layout_marginStart="13dp"/>
@@ -96,7 +96,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/border_1f000000"
-                    android:textColor="@color/gray_300"
+                    android:textColor="@color/text_quad"
                     style="@style/Body2"
                     android:lineSpacingExtra="4sp"
                     android:paddingTop="11dp"
@@ -118,7 +118,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/reason_for_report"
-                        android:textColor="@color/gray_50"
+                        android:textColor="@color/text_primary"
                         android:paddingBottom="34dp"
                         android:paddingTop="16dp"
                         android:paddingStart="@dimen/spacing_large"
@@ -131,7 +131,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     tools:text="@string/report_explanation"
-                    android:textColor="@color/gray_200"
+                    android:textColor="@color/text_ternary"
                     style="@style/Caption3"
                     android:textColorLink="?colorAccent"
                     />
diff --git a/Habitica/res/layout/activity_skill_members.xml b/Habitica/res/layout/activity_skill_members.xml
index e536a11c9..840564aa4 100644
--- a/Habitica/res/layout/activity_skill_members.xml
+++ b/Habitica/res/layout/activity_skill_members.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".ui.activities.PrefsActivity"
     android:orientation="vertical"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_skill_tasks.xml b/Habitica/res/layout/activity_skill_tasks.xml
index 499a5bb2e..c6a966e56 100644
--- a/Habitica/res/layout/activity_skill_tasks.xml
+++ b/Habitica/res/layout/activity_skill_tasks.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".ui.activities.PrefsActivity"
     android:orientation="vertical"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -46,6 +46,6 @@
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="1"
-        android:background="@android:color/white" />
+        android:background="@color/content_background" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index ca908127c..56bff5cca 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -30,7 +30,7 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/white"
+            android:background="?attr/colorContentBackground"
             android:paddingBottom="@dimen/spacing_large">
             <LinearLayout
                 android:id="@+id/upper_text_wrapper"
@@ -82,7 +82,7 @@
                     android:visibility="gone"
                     style="@style/Caption1"
                     android:gravity="center"
-                    android:textColor="@color/gray_10"
+                    android:textColor="@color/text_primary"
                     tools:visibility="visible"
                     tools:text="Challenge Name"/>
             </LinearLayout>
diff --git a/Habitica/res/layout/activity_verify_username.xml b/Habitica/res/layout/activity_verify_username.xml
index 861aed5a5..0c46a739c 100644
--- a/Habitica/res/layout/activity_verify_username.xml
+++ b/Habitica/res/layout/activity_verify_username.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/white">
+    android:background="@color/content_background">
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="@dimen/spacing_large"
-                android:background="@color/white"
+                android:background="@color/content_background"
                 android:orientation="vertical">
                 <TextView
                     android:layout_width="match_parent"
@@ -36,7 +36,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/gray_100"
+                    android:textColor="@color/text_secondary"
                     android:text="@string/usernamePromptBody"
                     android:gravity="center"
                     android:textSize="14sp"
@@ -45,7 +45,7 @@
                     android:id="@+id/wiki_text_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/gray_100"
+                    android:textColor="@color/text_secondary"
                     android:text="@string/usernamePromptWiki"
                     android:gravity="center"
                     android:textSize="14sp"
@@ -63,7 +63,7 @@
                             android:paddingLeft="@dimen/spacing_medium"
                             android:paddingRight="@dimen/spacing_medium"
                             android:layout_marginLeft="1dp"
-                            android:background="@color/gray_700"
+                            android:background="@color/window_background"
                             android:gravity="center_vertical"
                             />
                         <View android:background="@color/gray_600"
@@ -79,17 +79,17 @@
                     <TableRow>
                         <View android:layout_width="match_parent"
                             android:layout_height="1dp"
-                            android:background="@color/gray_600" android:layout_span="3" />
+                            android:background="@color/offset_background" android:layout_span="3" />
                     </TableRow>
                     <TableRow>
                         <TextView android:text="@string/username"
-                            android:background="@color/gray_700"
+                            android:background="@color/window_background"
                             android:layout_height="41dp"
                             android:paddingLeft="@dimen/spacing_medium"
                             android:paddingRight="@dimen/spacing_medium"
                             android:layout_marginLeft="1dp"
                             android:gravity="center_vertical"/>
-                        <View android:background="@color/gray_600"
+                        <View android:background="@color/offset_background"
                             android:layout_width="1dp"
                             android:layout_height="42dp"/>
                         <LinearLayout
@@ -100,7 +100,7 @@
                                 android:layout_height="match_parent"
                                 android:text="\@"
                                 android:gravity="center_vertical"
-                                android:textColor="@color/gray_400"/>
+                                android:textColor="@color/text_dimmed"/>
                             <EditText android:id="@+id/username_edit_text"
                                 android:background="@color/transparent"
                                 android:layout_width="0dp"
@@ -143,7 +143,7 @@
                     android:layout_marginLeft="@dimen/spacing_large"
                     android:layout_marginRight="@dimen/spacing_large"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_200"/>
+                    android:textColor="@color/text_ternary"/>
                 <ImageView
                     android:layout_width="121dp"
                     android:layout_height="31dp"
@@ -158,7 +158,7 @@
                 android:text="@string/usernamePromptDisclaimer"
                 android:gravity="center"
                 android:textSize="12sp"
-                android:textColor="@color/gray_300"/>
+                android:textColor="@color/text_quad"/>
         </LinearLayout>
     </ScrollView>
     <FrameLayout
diff --git a/Habitica/res/layout/adventure_guide_menu_banner.xml b/Habitica/res/layout/adventure_guide_menu_banner.xml
index f9258362e..e5d7e0ea2 100644
--- a/Habitica/res/layout/adventure_guide_menu_banner.xml
+++ b/Habitica/res/layout/adventure_guide_menu_banner.xml
@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/onboarding_tasks"
                 style="@style/Body1"
-                android:textColor="@color/gray_50"/>
+                android:textColor="@color/text_primary"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -42,7 +42,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:textColor="@color/gray_50"
+                    android:textColor="@color/text_primary"
                     android:textSize="12sp" />
 
                 <TextView
@@ -60,7 +60,7 @@
                 android:layout_height="4dp"
                 android:progressTint="@color/yellow_50"
                 style="@android:style/Widget.ProgressBar.Horizontal"
-                android:progressBackgroundTint="@color/gray_600"
+                android:progressBackgroundTint="@color/offset_background"
                 tools:progress="2"
                 android:max="5"/>
         </LinearLayout>
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index b9d83cebb..f3dc3905e 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -37,7 +37,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/header_bar_spacing"
                     app:barForegroundColor="@color/hpColor"
-                app:lightBackground="true"
+                app:barBackgroundColor="@color/window_background"
                     app:description="@string/HP_default"/>
 
             <com.habitrpg.android.habitica.ui.views.ValueBar
@@ -46,7 +46,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/header_bar_spacing"
                     app:barForegroundColor="@color/xpColor"
-                app:lightBackground="true"
+                app:barBackgroundColor="@color/window_background"
                     app:description="@string/XP_default"/>
 
             <com.habitrpg.android.habitica.ui.views.ValueBar
@@ -54,7 +54,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:barForegroundColor="@color/mpColor"
-                app:lightBackground="true"
+                app:barBackgroundColor="@color/window_background"
                     app:description="@string/MP_default"/>
 
         </LinearLayout>
@@ -91,7 +91,6 @@
         <com.habitrpg.android.habitica.ui.views.CurrencyViews
                 android:id="@+id/currencyView"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:hasLightBackground="true"/>
+                android:layout_height="wrap_content"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index 12dd4f1fa..d5f47fba7 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -61,7 +61,7 @@
             android:id="@+id/challenge_shorttext"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray_200"
+            android:textColor="@color/text_ternary"
             android:textSize="12sp"
             tools:text="Description"
             android:layout_marginTop="@dimen/spacing_small"
diff --git a/Habitica/res/layout/challenge_task_divider.xml b/Habitica/res/layout/challenge_task_divider.xml
index ea9c59351..b9c78a6e1 100644
--- a/Habitica/res/layout/challenge_task_divider.xml
+++ b/Habitica/res/layout/challenge_task_divider.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#f9f9f9"
+    android:background="@color/window_background"
     android:orientation="vertical"
     android:gravity="center">
 
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/chat_bar_view.xml
similarity index 95%
rename from Habitica/res/layout/tavern_chat_new_entry_item.xml
rename to Habitica/res/layout/chat_bar_view.xml
index 05c31bba4..fba476f60 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/chat_bar_view.xml
@@ -25,7 +25,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
                     android:hint="@string/write_message"
-                    android:textColor="@android:color/black"
+                    android:textColor="@color/text_primary"
                     android:inputType="textCapSentences|textMultiLine"
                     android:lineSpacingExtra="2dp"
                     android:background="@drawable/rounded_border"
@@ -61,7 +61,7 @@
                     android:layout_height="30dp"
                     android:layout_gravity="center"
                     android:background="@color/transparent"
-                    android:tint="@color/gray_400"
+                    android:tint="@color/disabled_background"
                     android:src="@drawable/ic_send_grey_600_24dp"
                     android:contentDescription="@string/send"/>
             </LinearLayout>
@@ -71,7 +71,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:background="@color/brand_300"
+            android:background="@color/brand_background"
             android:paddingStart="@dimen/spacing_large"
             android:paddingEnd="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_large"
@@ -89,7 +89,7 @@
                 android:id="@+id/communityGuidelinesAcceptButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/HabiticaButton.Blue"
+                style="@style/HabiticaButton.Primary"
                 android:text="@string/i_agree_to_follow_the_guidelines"/>
         </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/tavern_chat_item.xml b/Habitica/res/layout/chat_item.xml
similarity index 93%
rename from Habitica/res/layout/tavern_chat_item.xml
rename to Habitica/res/layout/chat_item.xml
index ee85c7df9..3886bfdc9 100644
--- a/Habitica/res/layout/tavern_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/gray_700"
+    android:background="@color/window_background"
     android:paddingLeft="@dimen/chat_horizontal_inset"
     android:paddingRight="@dimen/chat_horizontal_inset"
     android:paddingTop="@dimen/spacing_small"
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             style="@style/CardContent.Compact"
-            android:background="@drawable/layout_rounded_bg"
+            android:background="@drawable/layout_rounded_bg_content"
             android:padding="@dimen/spacing_medium">
             <TableLayout
                 android:layout_width="match_parent"
@@ -92,7 +92,7 @@
                 android:ellipsize="end"
                 tools:text="2d ago"
                 android:textSize="12sp"
-                android:textColor="@color/gray_300"/>
+                android:textColor="@color/text_quad"/>
             <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/message_text"
                 android:layout_width="match_parent"
@@ -101,7 +101,7 @@
                 android:layout_marginBottom="8dp"
                 android:lineSpacingMultiplier="1.0"
                 tools:text="This is the chat message"
-                android:textColor="@color/gray_10" />
+                android:textColor="@color/text_primary" />
             <com.nex3z.flowlayout.FlowLayout
                 android:id="@+id/buttons_wrapper"
                 android:layout_width="match_parent"
@@ -112,7 +112,7 @@
                     android:layout_height="36dp"
                     style="@style/Base.Widget.AppCompat.Button.Borderless"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_300"
+                    android:textColor="@color/text_quad"
                     android:text="@string/reply"
                     android:gravity="center_vertical"
                     android:drawablePadding="@dimen/spacing_small"/>
@@ -122,7 +122,7 @@
                     android:layout_height="36dp"
                     style="@style/Base.Widget.AppCompat.Button.Borderless"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_300"
+                    android:textColor="@color/text_quad"
                     android:text="@string/copy"
                     android:gravity="center_vertical"
                     android:drawablePadding="@dimen/spacing_small" />
@@ -132,7 +132,7 @@
                     android:layout_height="36dp"
                     style="@style/Base.Widget.AppCompat.Button.Borderless"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_300"
+                    android:textColor="@color/text_quad"
                     android:text="@string/report"
                     android:gravity="center_vertical"
                     android:drawablePadding="@dimen/spacing_small" />
@@ -142,7 +142,7 @@
                     android:layout_height="36dp"
                     style="@style/Base.Widget.AppCompat.Button.Borderless"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_300"
+                    android:textColor="@color/text_quad"
                     android:text="@string/delete"
                     android:gravity="center_vertical"
                     android:drawablePadding="@dimen/spacing_small"/>
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index 5d60f1577..b092308a2 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -11,7 +11,7 @@
         android:id="@+id/wrapper"
         android:layout_width="76dp"
         android:layout_height="wrap_content"
-        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:background="@drawable/layout_rounded_bg_window"
         android:orientation="vertical"
         android:layout_gravity="center">
 
@@ -30,7 +30,7 @@
                         android:id="@+id/price_label"
                         android:layout_width="wrap_content"
                         android:layout_height="32dp"
-                        android:textColor="@color/gray_300"
+                        android:textColor="@color/text_quad"
                         tools:text="150"
                         style="@style/Body1"
                         app:hasLightBackground="true"
diff --git a/Habitica/res/layout/customization_section_header.xml b/Habitica/res/layout/customization_section_header.xml
index 4a0706b37..e2fa4b35d 100644
--- a/Habitica/res/layout/customization_section_header.xml
+++ b/Habitica/res/layout/customization_section_header.xml
@@ -14,13 +14,13 @@
     android:layout_weight="1"
     tools:text="Test header"
     style="@style/Overline"
-    android:textColor="@color/gray_200"/>
+    android:textColor="@color/text_ternary"/>
 <TextView
     android:id="@+id/count_pill"
     android:layout_width="wrap_content"
     android:layout_height="24dp"
     android:visibility="gone"
-    style="@style/Pill.Gray700"
+    style="@style/Pill.Window"
     android:textSize="10sp"
     android:textAllCaps="true"
     android:letterSpacing="0.15"
@@ -36,13 +36,13 @@
         tools:visibility="visible"
         android:paddingStart="@dimen/spacing_medium"
         android:paddingEnd="@dimen/spacing_medium"
-        android:background="@drawable/layout_rounded_bg_gray_700">
+        android:background="@drawable/layout_rounded_bg_window">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/buy_all"
             android:textAllCaps="true"
-            android:textColor="@color/brand_300"
+            android:textColor="@color/text_brand_neon"
             style="@style/Body1"
             android:layout_marginEnd="@dimen/spacing_medium"/>
         <com.habitrpg.android.habitica.ui.views.CurrencyView
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 0b58c3ff6..50bcdec72 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?attr/colorContentBackground"
     android:foreground="?selectableItemBackground"
     android:orientation="vertical">
 
diff --git a/Habitica/res/layout/dialog_achievement_detail.xml b/Habitica/res/layout/dialog_achievement_detail.xml
index e72e6a9e9..8daf70c92 100644
--- a/Habitica/res/layout/dialog_achievement_detail.xml
+++ b/Habitica/res/layout/dialog_achievement_detail.xml
@@ -46,6 +46,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         android:gravity="center_horizontal"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_bulk_allocate.xml b/Habitica/res/layout/dialog_bulk_allocate.xml
index 8a7abbc83..26219bffd 100644
--- a/Habitica/res/layout/dialog_bulk_allocate.xml
+++ b/Habitica/res/layout/dialog_bulk_allocate.xml
@@ -9,7 +9,7 @@
         android:id="@+id/titleView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/gray_400"
+        android:background="@color/disabled_background"
         android:orientation="vertical"
         android:padding="18dp"
         android:focusable="true"
@@ -43,27 +43,27 @@
         android:layout_height="wrap_content"
         app:statsTitle="@string/str_abbrv"
         app:statsColor="@color/red_100"
-        app:statsTextColor="@color/red_10"/>
+        app:statsTextColor="@color/text_red"/>
     <com.habitrpg.android.habitica.ui.views.stats.StatsSliderView
         android:id="@+id/intelligenceSliderView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:statsTitle="@string/int_abbrv"
         app:statsColor="@color/blue_100"
-        app:statsTextColor="@color/blue_10"/>
+        app:statsTextColor="@color/text_blue"/>
     <com.habitrpg.android.habitica.ui.views.stats.StatsSliderView
         android:id="@+id/constitutionSliderView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:statsTitle="@string/con_abbrv"
         app:statsColor="@color/yellow_100"
-        app:statsTextColor="@color/yellow_10"/>
+        app:statsTextColor="@color/text_yellow"/>
     <com.habitrpg.android.habitica.ui.views.stats.StatsSliderView
         android:id="@+id/perceptionSliderView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:statsTitle="@string/per_abbrv"
         app:statsColor="@color/brand_300"
-        app:statsTextColor="@color/brand_300"/>
+        app:statsTextColor="@color/text_brand"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail_habit.xml b/Habitica/res/layout/dialog_challenge_detail_habit.xml
index 609a82ed9..827a98de6 100644
--- a/Habitica/res/layout/dialog_challenge_detail_habit.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_habit.xml
@@ -13,7 +13,7 @@
         android:id="@+id/lock_icon_background_plus"
         android:layout_width="48dp"
         android:layout_height="match_parent"
-        android:background="@color/gray_700"
+        android:background="@color/window_background"
         android:layout_marginRight="@dimen/spacing_large"
         android:layout_marginTop="0.5dp"
         android:layout_marginBottom="0.5dp">
@@ -48,7 +48,7 @@
         android:id="@+id/lock_icon_background_minus"
         android:layout_width="48dp"
         android:layout_height="match_parent"
-        android:background="@color/gray_700"
+        android:background="@color/window_background"
         android:layout_marginLeft="@dimen/spacing_large"
         android:layout_marginTop="0.5dp"
         android:layout_marginBottom="0.5dp">
diff --git a/Habitica/res/layout/dialog_challenge_detail_reward.xml b/Habitica/res/layout/dialog_challenge_detail_reward.xml
index d5b591980..88b6aae6a 100644
--- a/Habitica/res/layout/dialog_challenge_detail_reward.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_reward.xml
@@ -14,8 +14,6 @@
             android:layout_height="16dp"
             android:layout_marginBottom="18dp"
             android:layout_marginEnd="15.5dp"
-            android:layout_marginLeft="14.5dp"
-            android:layout_marginRight="15.5dp"
             android:layout_marginStart="14.5dp"
             android:layout_marginTop="18dp"  />
         <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
diff --git a/Habitica/res/layout/dialog_challenge_detail_task_group.xml b/Habitica/res/layout/dialog_challenge_detail_task_group.xml
index c908c8756..2bc551fda 100644
--- a/Habitica/res/layout/dialog_challenge_detail_task_group.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_task_group.xml
@@ -24,8 +24,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/spacing_medium"
-            style="@style/Pill.White"
-            android:textColor="@color/gray_400"
+            style="@style/Pill.Content"
+            android:textColor="@color/text_dimmed"
             tools:text="2"/>
     </LinearLayout>
 
diff --git a/Habitica/res/layout/dialog_choose_message_recipient.xml b/Habitica/res/layout/dialog_choose_message_recipient.xml
index 5408a9872..bdb0cfc52 100644
--- a/Habitica/res/layout/dialog_choose_message_recipient.xml
+++ b/Habitica/res/layout/dialog_choose_message_recipient.xml
@@ -13,7 +13,7 @@
             android:layout_height="wrap_content"
             android:text="@string/enter_recipient_username"
         android:textSize="12sp"
-        android:textColor="@color/gray_200"/>
+        android:textColor="@color/text_ternary"/>
     <EditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/dialog_first_drop.xml b/Habitica/res/layout/dialog_first_drop.xml
index c37fb490a..fd8476fea 100644
--- a/Habitica/res/layout/dialog_first_drop.xml
+++ b/Habitica/res/layout/dialog_first_drop.xml
@@ -14,7 +14,7 @@
         <FrameLayout
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:background="@drawable/layout_rounded_bg_window"
             android:layout_marginEnd="@dimen/spacing_large">
             <com.facebook.drawee.view.SimpleDraweeView
                 android:id="@+id/egg_view"
@@ -25,7 +25,7 @@
         <FrameLayout
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:background="@drawable/layout_rounded_bg_gray_700">
+            android:background="@drawable/layout_rounded_bg_window">
             <com.facebook.drawee.view.SimpleDraweeView
                 android:id="@+id/hatchingPotion_view"
                 android:layout_width="@dimen/gear_image_size"
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         android:gravity="center_horizontal"
         android:text="@string/first_drop_explanation1"
         android:layout_marginBottom="@dimen/spacing_medium"/>
@@ -45,7 +45,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body1"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         android:text="@string/first_drop_explanation2"
         android:gravity="center_horizontal"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_habitica_base.xml b/Habitica/res/layout/dialog_habitica_base.xml
index 246d9671a..1f1c6d5ae 100644
--- a/Habitica/res/layout/dialog_habitica_base.xml
+++ b/Habitica/res/layout/dialog_habitica_base.xml
@@ -14,7 +14,7 @@
     android:orientation="vertical"
     android:layout_width="320dp"
     android:layout_height="wrap_content"
-    tools:background="@color/black"
+    tools:background="@android:color/black"
     android:minWidth="300dp"
     android:gravity="center_horizontal"
     android:layout_gravity="center_horizontal"
@@ -75,7 +75,7 @@
             android:id="@+id/scrolling_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/gray_600"
+            android:background="@color/offset_background"
             android:visibility="gone"/>
         <LinearLayout
             android:id="@+id/buttons_wrapper"
@@ -98,11 +98,11 @@
             android:paddingBottom="@dimen/spacing_medium"
             android:paddingStart="@dimen/spacing_large"
             android:paddingEnd="@dimen/spacing_large"
-            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:background="@drawable/layout_rounded_bg_window"
             android:visibility="gone"
             android:gravity="center"
             style="@style/Caption3"
-            android:textColor="@color/gray_100"
+            android:textColor="@color/text_secondary"
             tools:text="This is a small label"
             tools:visibility="visible"/>
     </LinearLayout>
diff --git a/Habitica/res/layout/dialog_levelup.xml b/Habitica/res/layout/dialog_levelup.xml
index a39bdd4b6..45e0ef965 100644
--- a/Habitica/res/layout/dialog_levelup.xml
+++ b/Habitica/res/layout/dialog_levelup.xml
@@ -25,5 +25,5 @@
         android:text="@string/levelup_detail"
         style="@style/Body2"
         android:gravity="center_horizontal"
-        android:textColor="@color/gray_200"/>
+        android:textColor="@color/text_ternary"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_levelup_10.xml b/Habitica/res/layout/dialog_levelup_10.xml
index d2d1a7c20..9c9db90c0 100644
--- a/Habitica/res/layout/dialog_levelup_10.xml
+++ b/Habitica/res/layout/dialog_levelup_10.xml
@@ -37,7 +37,7 @@
         android:text="@string/levelup_title_10"
         style="@style/Subheader1"
         android:gravity="center_horizontal"
-        android:textColor="@color/gray_50"
+        android:textColor="@color/text_primary"
         android:layout_marginBottom="@dimen/spacing_medium"/>
     <TextView
         android:layout_width="wrap_content"
@@ -45,5 +45,5 @@
         android:text="@string/levelup_detail_10"
         style="@style/Body2"
         android:gravity="center_horizontal"
-        android:textColor="@color/gray_200"/>
+        android:textColor="@color/text_ternary"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_login_incentive.xml b/Habitica/res/layout/dialog_login_incentive.xml
index 5d8313ff9..c99bdd280 100644
--- a/Habitica/res/layout/dialog_login_incentive.xml
+++ b/Habitica/res/layout/dialog_login_incentive.xml
@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:id="@+id/next_unlock_message"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         android:gravity="center_horizontal"
         style="@style/Body1"/>
 
diff --git a/Habitica/res/layout/dialog_pet_suggest_hatch.xml b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
index 12ca1906c..ba4c4e72e 100644
--- a/Habitica/res/layout/dialog_pet_suggest_hatch.xml
+++ b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
@@ -19,7 +19,7 @@
                 android:id="@+id/egg_frame_view"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:background="@drawable/layout_rounded_bg_gray_700"
+                android:background="@drawable/layout_rounded_bg_window"
                 android:layout_centerVertical="true"
                 android:layout_alignParentStart="true">
                 <com.facebook.drawee.view.SimpleDraweeView
@@ -44,7 +44,7 @@
         <FrameLayout
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:background="@drawable/layout_rounded_bg_window"
             android:layout_marginEnd="13dp"
             android:layout_marginStart="@dimen/spacing_small">
             <com.facebook.drawee.view.SimpleDraweeView
@@ -61,7 +61,7 @@
                 android:id="@+id/potion_frame_view"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:background="@drawable/layout_rounded_bg_gray_700"
+                android:background="@drawable/layout_rounded_bg_window"
                 android:layout_centerVertical="true"
                 android:layout_alignParentStart="true">
                 <com.facebook.drawee.view.SimpleDraweeView
@@ -89,7 +89,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Subheader2"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         android:gravity="center_horizontal"
         android:layout_marginBottom="@dimen/spacing_medium"/>
     <TextView
@@ -97,7 +97,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         android:gravity="center_horizontal"
         android:layout_marginBottom="@dimen/spacing_medium"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml
index 466e0748d..371a91a71 100644
--- a/Habitica/res/layout/dialog_purchase_content_gear.xml
+++ b/Habitica/res/layout/dialog_purchase_content_gear.xml
@@ -106,7 +106,7 @@
         android:layout_width="match_parent"
         android:text="@string/purchase_amount_error"
         android:textSize="12sp"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         android:layout_marginTop="@dimen/spacing_medium"
         android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_content_item.xml b/Habitica/res/layout/dialog_purchase_content_item.xml
index 568e5b470..258f458f2 100644
--- a/Habitica/res/layout/dialog_purchase_content_item.xml
+++ b/Habitica/res/layout/dialog_purchase_content_item.xml
@@ -20,6 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Headline"
+        android:textColor="@color/text_primary"
         tools:text="This is the Title"
         android:gravity="center"
         android:layout_marginTop="14dp"
@@ -29,7 +30,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
-        android:textColor="@color/black_50_alpha"
+        android:textColor="@color/text_secondary"
         tools:text="These are the notes"
         android:gravity="center"/>
 
@@ -46,7 +47,7 @@
         android:layout_width="match_parent"
         android:text="@string/purchase_amount_error"
         android:textSize="12sp"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         android:layout_marginTop="@dimen/spacing_medium"
         android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_content_quest.xml b/Habitica/res/layout/dialog_purchase_content_quest.xml
index be54a9fd5..f25d6984e 100644
--- a/Habitica/res/layout/dialog_purchase_content_quest.xml
+++ b/Habitica/res/layout/dialog_purchase_content_quest.xml
@@ -28,7 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
-        android:textColor="@color/black_50_alpha"
+        android:textColor="@color/text_secondary"
         tools:text="These are the notes"
         android:gravity="center"/>
 
@@ -185,7 +185,7 @@
         android:layout_width="match_parent"
         android:text="@string/purchase_amount_error"
         android:textSize="12sp"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         android:layout_marginTop="@dimen/spacing_medium"
         android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_customization.xml b/Habitica/res/layout/dialog_purchase_customization.xml
index 62e99357f..945089e95 100644
--- a/Habitica/res/layout/dialog_purchase_customization.xml
+++ b/Habitica/res/layout/dialog_purchase_customization.xml
@@ -36,7 +36,7 @@
         android:layout_width="match_parent"
         android:text="@string/purchase_amount_error"
         android:textSize="12sp"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         android:layout_marginTop="@dimen/spacing_medium"
         android:visibility="gone"
         android:gravity="center_horizontal"/>
diff --git a/Habitica/res/layout/dialog_purchase_gems.xml b/Habitica/res/layout/dialog_purchase_gems.xml
index abb83f39d..9124683f8 100644
--- a/Habitica/res/layout/dialog_purchase_gems.xml
+++ b/Habitica/res/layout/dialog_purchase_gems.xml
@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
-    tools:background="@color/white"
+    tools:background="?attr/colorContentBackground"
     tools:orientation="vertical">
 
     <com.facebook.drawee.view.SimpleDraweeView
@@ -48,7 +48,7 @@
         android:layout_width="match_parent"
         android:text="@string/purchase_amount_error"
         android:textSize="12sp"
-        android:textColor="@color/gray_200"
+        android:textColor="@color/text_ternary"
         android:layout_marginTop="@dimen/spacing_medium"
         android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_button.xml b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
index 726ac5800..1d7a85dce 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
@@ -6,7 +6,7 @@
     android:layout_width="wrap_content"
     android:layout_height="40dp"
     android:gravity="center"
-    android:background="@drawable/layout_rounded_bg_gray_700"
+    android:background="@drawable/layout_rounded_bg_window"
     android:paddingLeft="16dp"
     android:paddingRight="16dp">
     <TextView
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_header.xml b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
index 6c7dd1373..c7bfbe570 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_header.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
@@ -5,14 +5,14 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingLeft="12dp"
         android:paddingRight="12dp"
-        android:background="@color/gray_700">
+        android:background="@color/window_background">
         <Button
             android:id="@+id/pin_button"
             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 349e9ddeb..3a3dcff4e 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -7,7 +7,7 @@
 <View
     android:layout_width="match_parent"
     android:layout_height="2dp"
-    android:background="@color/pill_gray"
+    android:background="@color/separator"
         android:layout_marginTop="16dp"/>
 
     <LinearLayout
@@ -58,7 +58,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="2dp"
-            android:background="@color/pill_gray" />
+            android:background="@color/separator" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -83,7 +83,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:text="@string/edit_tag_btn_edit"
-                    android:textColor="#6133b4"
+                    android:textColor="@color/text_brand"
                     android:textSize="16sp"
                     android:gravity="end|center_vertical"
                     android:paddingEnd="0dp"/>
@@ -107,5 +107,5 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="2dp"
-        android:background="@color/pill_gray" />
+        android:background="@color/separator" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_yesterdaily.xml b/Habitica/res/layout/dialog_yesterdaily.xml
index a741bd6da..f429d1e61 100644
--- a/Habitica/res/layout/dialog_yesterdaily.xml
+++ b/Habitica/res/layout/dialog_yesterdaily.xml
@@ -6,4 +6,4 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="8dp"
-    android:background="@color/gray_700"/>
+    android:background="@color/window_background"/>
diff --git a/Habitica/res/layout/dialog_yesterdaily_task.xml b/Habitica/res/layout/dialog_yesterdaily_task.xml
index 60884e21a..58c1092dd 100644
--- a/Habitica/res/layout/dialog_yesterdaily_task.xml
+++ b/Habitica/res/layout/dialog_yesterdaily_task.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+<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:minHeight="60dp"
     android:elevation="2dp"
     android:layout_margin="4dp"
@@ -32,7 +34,8 @@
             style="@style/Subheader3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="12dp" />
+            android:layout_margin="12dp"
+            tools:text="Title"/>
     </LinearLayout>
     <LinearLayout
         android:id="@+id/checklistView"
diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml
index ce2b4dde3..315accc1a 100644
--- a/Habitica/res/layout/drawer_main.xml
+++ b/Habitica/res/layout/drawer_main.xml
@@ -165,5 +165,5 @@
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"/>
+        android:background="?attr/colorContentBackground"/>
 </LinearLayout>
diff --git a/Habitica/res/layout/drawer_main_item.xml b/Habitica/res/layout/drawer_main_item.xml
index b93f50008..231703746 100644
--- a/Habitica/res/layout/drawer_main_item.xml
+++ b/Habitica/res/layout/drawer_main_item.xml
@@ -17,7 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/Body1"
-            android:textColor="@color/gray_50"
+            android:textColor="@color/text_primary"
             tools:text="Tasks"/>
         <TextView
             android:id="@+id/additionalInfoView"
diff --git a/Habitica/res/layout/drawer_main_section_header.xml b/Habitica/res/layout/drawer_main_section_header.xml
index cfcd03d51..3409fe581 100644
--- a/Habitica/res/layout/drawer_main_section_header.xml
+++ b/Habitica/res/layout/drawer_main_section_header.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:layout_width="match_parent"
-          android:layout_height="22dp"
-          xmlns:tools="http://schemas.android.com/tools"
-          android:background="?colorPrimary"
-          tools:text="Social"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/Body1"
-    android:textSize="12sp"
-    android:textColor="@color/white"
+    android:layout_width="match_parent"
+    android:layout_height="22dp"
+    android:gravity="center_vertical"
     android:paddingLeft="@dimen/drawer_padding"
     android:paddingRight="@dimen/drawer_padding"
     android:textAllCaps="true"
-    android:gravity="center_vertical"/>
\ No newline at end of file
+    android:textColor="@color/white"
+    android:textSize="12sp"
+    tools:text="Social" />
\ No newline at end of file
diff --git a/Habitica/res/layout/empty_view_seasonal_shop.xml b/Habitica/res/layout/empty_view_seasonal_shop.xml
index 9a1df1d65..9d565a1a3 100644
--- a/Habitica/res/layout/empty_view_seasonal_shop.xml
+++ b/Habitica/res/layout/empty_view_seasonal_shop.xml
@@ -13,12 +13,12 @@
         android:text="@string/come_back_soon"
         android:textSize="18sp"
         android:gravity="center"
-        android:textColor="@color/gray_200"/>
+        android:textColor="@color/text_ternary"/>
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/seasonal_closed_description"
-        android:textColor="@color/gray_300"
+        android:textColor="@color/text_quad"
         android:layout_marginTop="12dp"
         android:gravity="center"
         android:textSize="14sp"/>
diff --git a/Habitica/res/layout/empty_view_timetravelers.xml b/Habitica/res/layout/empty_view_timetravelers.xml
index 5c190cc3d..377487b25 100644
--- a/Habitica/res/layout/empty_view_timetravelers.xml
+++ b/Habitica/res/layout/empty_view_timetravelers.xml
@@ -13,12 +13,12 @@
         android:text="@string/subscribe_for_hourglasses"
         android:textSize="18sp"
         android:gravity="center"
-        android:textColor="@color/gray_200"/>
+        android:textColor="@color/text_ternary"/>
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/timetravelers_closed_description"
-        android:textColor="@color/gray_300"
+        android:textColor="@color/text_quad"
         android:layout_marginTop="12dp"
         android:gravity="center"
         android:textSize="14sp"/>
diff --git a/Habitica/res/layout/equipment_overview_item.xml b/Habitica/res/layout/equipment_overview_item.xml
index f7c08d05c..88f8ac31f 100644
--- a/Habitica/res/layout/equipment_overview_item.xml
+++ b/Habitica/res/layout/equipment_overview_item.xml
@@ -10,7 +10,7 @@
         android:layout_width="70dp"
         android:layout_height="70dp"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/layout_rounded_bg_white">
+        android:background="@drawable/layout_rounded_bg_content">
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/icon_view"
             android:layout_width="@dimen/gear_image_size"
@@ -34,7 +34,7 @@
         android:id="@+id/title_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/gray_400"
+        android:textColor="@color/text_dimmed"
         style="@style/Caption2"
         android:layout_marginTop="4dp"
         android:gravity="center_horizontal"/>
diff --git a/Habitica/res/layout/fixvalues_edittext.xml b/Habitica/res/layout/fixvalues_edittext.xml
index 12b720da0..8dcba41cf 100644
--- a/Habitica/res/layout/fixvalues_edittext.xml
+++ b/Habitica/res/layout/fixvalues_edittext.xml
@@ -5,7 +5,7 @@
        android:layout_width="match_parent"
        android:layout_height="56dp"
        android:layout_margin="6dp"
-       android:background="@drawable/layout_rounded_bg"
+       android:background="@drawable/layout_rounded_bg_content"
        tools:parentTag="FrameLayout">
     <View
         android:id="@+id/iconBackgroundView"
@@ -21,7 +21,7 @@
             android:layout_height="match_parent"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:background="@drawable/layout_rounded_bg_window"
             android:paddingTop="8dp"
             android:paddingStart="16dp">
             <com.google.android.material.textfield.TextInputEditText
@@ -41,6 +41,6 @@
         android:layout_width="match_parent"
         android:layout_height="2dp"
         android:layout_gravity="bottom"
-        android:background="@color/gray_500"
+        android:background="@color/content_background_offset"
         android:layout_marginEnd="56dp"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/form_stepper_value.xml b/Habitica/res/layout/form_stepper_value.xml
index 7070970e4..488df39bf 100644
--- a/Habitica/res/layout/form_stepper_value.xml
+++ b/Habitica/res/layout/form_stepper_value.xml
@@ -7,19 +7,19 @@
     tools:parentTag="android.widget.RelativeLayout">
     <View android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_700"
+        android:background="@color/window_background"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"/>
     <View android:layout_width="match_parent"
         android:layout_height="2dp"
-        android:background="@color/gray_500"
+        android:background="@color/content_background_offset"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"/>
     <ImageButton
         android:id="@+id/down_button"
         android:layout_width="56dp"
         android:layout_height="match_parent"
-        android:background="@color/gray_600"
+        android:background="@color/offset_background"
         android:src="@drawable/ic_arrow_drop_down_gray_48dp_states"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
@@ -28,7 +28,7 @@
         android:id="@+id/up_button"
         android:layout_width="56dp"
         android:layout_height="match_parent"
-        android:background="@color/gray_600"
+        android:background="@color/offset_background"
         android:src="@drawable/ic_arrow_drop_up_gray_48dp_states"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
@@ -39,7 +39,7 @@
         android:layout_height="match_parent"
         android:layout_centerHorizontal="true"
         android:background="@color/transparent"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         android:textSize="16sp"
         tools:text="100.0"
         android:inputType="numberDecimal"
diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index 787574e97..4c2145369 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -6,7 +6,7 @@
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -38,7 +38,7 @@
             android:layout_width="250dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:background="@drawable/layout_rounded_bg_window"
             android:layout_marginTop="@dimen/spacing_small"
             android:orientation="vertical"
             android:paddingTop="@dimen/spacing_small"
@@ -94,25 +94,23 @@
         <Button
             android:id="@+id/googlePlayStoreButton"
             android:layout_width="250dp"
-            android:layout_height="35dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="35sp"
-            android:background="@drawable/rounded_purple_square"
+            style="@style/HabiticaButton.Gray"
             android:text="@string/about_rate_our_app"
             android:textAllCaps="false"
-            android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
 
         <Button
             android:id="@+id/reportBug"
             android:layout_width="250dp"
-            android:layout_height="35dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20sp"
-            android:background="@drawable/rounded_purple_square"
+            style="@style/HabiticaButton.Gray"
             android:text="@string/about_bugreport"
             android:textAllCaps="false"
-            android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
 
         <TextView
@@ -127,13 +125,12 @@
         <Button
             android:id="@+id/sourceCodeButton"
             android:layout_width="250dp"
-            android:layout_height="35dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10sp"
-            android:background="@drawable/rounded_purple_square"
+            style="@style/HabiticaButton.Gray"
             android:text="@string/about_source_code"
             android:textAllCaps="false"
-            android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 3df8e873e..c88f4bd90 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -56,7 +56,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:textSize="17sp"
-                            android:textColor="@color/gray_100"
+                            android:textColor="@color/text_secondary"
                             tools:text="5"
                             android:layout_marginLeft="@dimen/spacing_small"
                             />
@@ -67,7 +67,7 @@
                         android:text="@string/participants"
                         android:gravity="center"
                         android:textSize="12sp"
-                        android:textColor="@color/gray_200"/>
+                        android:textColor="@color/text_ternary"/>
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="0dp"
@@ -91,7 +91,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:textSize="17sp"
-                            android:textColor="@color/gray_100"
+                            android:textColor="@color/text_secondary"
                             tools:text="5"
                             android:layout_marginLeft="@dimen/spacing_small"
                             />
@@ -102,7 +102,7 @@
                         android:text="@string/challenge_prize"
                         android:gravity="center"
                         android:textSize="12sp"
-                        android:textColor="@color/gray_200"/>
+                        android:textColor="@color/text_ternary"/>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
@@ -114,7 +114,7 @@
             android:paddingRight="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_medium"
             android:paddingBottom="@dimen/spacing_medium"
-            android:background="@color/white">
+            android:background="?attr/colorContentBackground">
             <Button
                 android:id="@+id/join_button"
                 android:layout_width="match_parent"
@@ -130,7 +130,7 @@
             android:paddingRight="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_medium"
             android:paddingBottom="@dimen/spacing_medium"
-            android:background="@color/white"
+            android:background="?attr/colorContentBackground"
             android:orientation="horizontal">
             <com.habitrpg.android.habitica.ui.RoundedFrameLayout
                 android:layout_width="@dimen/avatar_chat_size"
@@ -160,7 +160,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/created_challenge"
-                    android:textColor="@color/gray_200"
+                    android:textColor="@color/text_ternary"
                     android:textSize="12sp"/>
             </LinearLayout>
             <ImageButton
@@ -172,7 +172,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:title="@string/challenge_categories"
-            android:background="@color/white">
+            android:background="?attr/colorContentBackground">
             <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/challenge_description"
                 style="@style/Body2"
diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml
index 1c51e1ab0..65b4396d4 100644
--- a/Habitica/res/layout/fragment_faq_detail.xml
+++ b/Habitica/res/layout/fragment_faq_detail.xml
@@ -19,7 +19,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/black"
+            android:textColor="@color/text_primary"
             style="@style/Headline6"
             android:id="@+id/questionTextView"
             android:layout_gravity="center_horizontal"/>
@@ -30,7 +30,7 @@
             android:id="@+id/answerTextView"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="12dp"
-            android:textColor="@color/gray_200"
+            android:textColor="@color/text_ternary"
             style="@style/Subheader3"
             />
     </LinearLayout>
diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml
index b861b8a7a..f2e2159d0 100644
--- a/Habitica/res/layout/fragment_faq_overview.xml
+++ b/Habitica/res/layout/fragment_faq_overview.xml
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/white">
+    android:background="@color/content_background">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -115,14 +115,14 @@
         android:paddingEnd="32dp"
         android:paddingBottom="32dp"
         android:orientation="vertical"
-        android:background="@color/gray_700"
+        android:background="@color/window_background"
         android:layout_marginTop="@dimen/spacing_large"
         android:gravity="center">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/still_questions"
-            android:textColor="@color/black"
+            android:textColor="@color/text_primary"
             style="@style/Subheader3"
             android:layout_marginBottom="@dimen/spacing_small"/>
     <TextView
@@ -130,7 +130,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         android:gravity="center"/>
 </LinearLayout>
 </LinearLayout>
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index 2b49b5aca..7e1d91f8e 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -6,7 +6,7 @@
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical"
-    android:background="@color/white">
+    android:background="@color/content_background">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -233,7 +233,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:text="@string/gems_gift_description"
                 android:gravity="center_horizontal"
                 android:layout_marginLeft="@dimen/spacing_large"
@@ -258,10 +258,10 @@
             android:text="@string/gem_purchase_title"
             android:layout_gravity="center_horizontal"
             android:gravity="center"
-            android:textColor="@color/gray_200"
+            android:textColor="@color/text_ternary"
             android:textSize="14sp"
             android:lineSpacingExtra="4dp"
-            android:background="@color/gray_700"
+            android:background="@color/window_background"
             android:drawablePadding="@dimen/spacing_medium"/>
 
         <com.habitrpg.android.habitica.ui.views.promo.SubscriptionBuyGemsPromoView
diff --git a/Habitica/res/layout/fragment_gift_gem_balance.xml b/Habitica/res/layout/fragment_gift_gem_balance.xml
index 4527d0f13..a32848233 100644
--- a/Habitica/res/layout/fragment_gift_gem_balance.xml
+++ b/Habitica/res/layout/fragment_gift_gem_balance.xml
@@ -28,7 +28,7 @@
             android:id="@+id/username_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             android:textSize="12sp"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/spacing_large"/>
@@ -38,7 +38,7 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
             android:text="@string/gift_gems_balance_subtitle"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             android:layout_marginLeft="@dimen/spacing_large"
             android:layout_marginRight="@dimen/spacing_large"
             android:layout_marginBottom="@dimen/spacing_large"/>
diff --git a/Habitica/res/layout/fragment_gift_gem_purchase.xml b/Habitica/res/layout/fragment_gift_gem_purchase.xml
index 22d720b7f..15750d859 100644
--- a/Habitica/res/layout/fragment_gift_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gift_gem_purchase.xml
@@ -28,7 +28,7 @@
             android:id="@+id/username_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             android:textSize="12sp"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/spacing_large"/>
@@ -38,7 +38,7 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
             android:text="@string/gift_gems_subtitle"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             android:layout_marginLeft="@dimen/spacing_large"
             android:layout_marginRight="@dimen/spacing_large"
             android:layout_marginBottom="@dimen/spacing_large"/>
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index bed3ad46a..2b9f6a447 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -5,16 +5,16 @@
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/refreshLayout"
-    android:background="@color/gray_700">
+    android:background="@color/window_background">
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_700">
+        android:background="@color/window_background">
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/gray_700">
+            android:background="@color/window_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_white"
+                    android:background="@drawable/layout_rounded_bg_content"
                     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_white"
+                    android:background="@drawable/layout_rounded_bg_content"
                     android:paddingTop="@dimen/spacing_small"
                     android:paddingBottom="@dimen/spacing_small"
                     android:paddingLeft="@dimen/spacing_medium"
@@ -102,11 +102,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:background="@color/white">
+                android:background="?attr/colorContentBackground">
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="@color/gray_500" />
+                    android:background="@color/content_background_offset" />
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -135,7 +135,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="@color/gray_500" />
+                    android:background="@color/content_background_offset" />
                 <LinearLayout
                     android:id="@+id/leader_wrapper"
                     android:layout_width="match_parent"
@@ -202,7 +202,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:background="@color/gray_500"
+                    android:background="@color/content_background_offset"
                     android:layout_marginTop="@dimen/spacing_medium"/>
             </LinearLayout>
             <Button
diff --git a/Habitica/res/layout/fragment_inbox.xml b/Habitica/res/layout/fragment_inbox.xml
index 0ac3d8998..dbe77b4dc 100644
--- a/Habitica/res/layout/fragment_inbox.xml
+++ b/Habitica/res/layout/fragment_inbox.xml
@@ -26,7 +26,7 @@
                 android:text="@string/pms_disabled"
                 android:gravity="center"
                 style="@style/Subheader1"
-                android:textColor="@color/gray_50"
+                android:textColor="@color/text_primary"
                 android:layout_marginBottom="4dp"/>
             <TextView
                 android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index fe9c93314..4a5dd94b4 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -16,7 +16,7 @@
         android:id="@+id/refreshLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
+        android:background="@color/content_background"
         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_no_party.xml b/Habitica/res/layout/fragment_no_party.xml
index 241f4bf7c..ddd189e77 100644
--- a/Habitica/res/layout/fragment_no_party.xml
+++ b/Habitica/res/layout/fragment_no_party.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/refreshLayout"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -64,7 +64,7 @@
                         android:layout_height="wrap_content"
                         style="@style/Headline"
                         android:textSize="16sp"
-                        android:textColor="@color/gray_200"
+                        android:textColor="@color/text_ternary"
                         android:text="@string/no_party_title"
                         android:gravity="center"
                         android:layout_marginBottom="@dimen/spacing_medium"/>
@@ -73,7 +73,7 @@
                         android:layout_height="wrap_content"
                         style="@style/Body2"
                         android:text="@string/no_party_description"
-                        android:textColor="@color/gray_300"
+                        android:textColor="@color/text_quad"
                         android:gravity="center"
                         android:layout_marginLeft="@dimen/spacing_large"
                         android:layout_marginRight="@dimen/spacing_large"/>
@@ -81,8 +81,8 @@
                         android:id="@+id/createPartyButton"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/HabiticaButton.Gray.600"
-                        android:background="@drawable/layout_rounded_bg_gray_700"
+                        style="@style/HabiticaButton.Offset"
+                        android:background="@drawable/layout_rounded_bg_window"
                         android:text="@string/create_party"
                         android:layout_marginTop="@dimen/spacing_large"/>
                 </LinearLayout>
@@ -105,7 +105,7 @@
                         android:layout_height="wrap_content"
                         style="@style/Body2"
                         android:text="@string/join_party_description"
-                        android:textColor="@color/gray_300"
+                        android:textColor="@color/text_quad"
                         android:gravity="center"
                         android:layout_marginLeft="@dimen/spacing_large"
                         android:layout_marginRight="@dimen/spacing_large"/>
@@ -115,8 +115,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:textColor="?colorAccent"
-                        style="@style/HabiticaButton.Gray.600"
-                        android:background="@drawable/layout_rounded_bg_gray_700"
+                        style="@style/HabiticaButton.Offset"
+                        android:background="@drawable/layout_rounded_bg_window"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:layout_marginBottom="@dimen/spacing_large"/>
 
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index 55057c186..3d6cd23f5 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -38,7 +38,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:background="@color/white"
+                android:background="?attr/colorContentBackground"
                 android:showDividers="beginning|end|middle"
                 android:divider="@drawable/vertical_divider">
                 <LinearLayout
@@ -60,7 +60,7 @@
                         android:id="@+id/quest_detail_button"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/layout_rounded_bg_gray_700"
+                        android:background="@drawable/layout_rounded_bg_window"
                         android:padding="@dimen/spacing_medium"
                         android:gravity="center_vertical"
                         android:layout_marginBottom="@dimen/spacing_medium"
@@ -86,7 +86,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 tools:text="3 Participants"
-                                android:textColor="@color/gray_300" />
+                                android:textColor="@color/text_quad" />
                         </LinearLayout>
                         <ImageView
                             android:layout_width="wrap_content"
@@ -98,7 +98,7 @@
                         android:id="@+id/quest_image_wrapper"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/layout_rounded_bg_gray_700"
+                        android:background="@drawable/layout_rounded_bg_window"
                         android:padding="@dimen/spacing_medium"
                         android:layout_marginBottom="@dimen/spacing_medium">
                         <com.habitrpg.android.habitica.ui.views.WrapContentDraweeView
diff --git a/Habitica/res/layout/fragment_promo_info.xml b/Habitica/res/layout/fragment_promo_info.xml
index 2764d4d6f..25bf63a6e 100644
--- a/Habitica/res/layout/fragment_promo_info.xml
+++ b/Habitica/res/layout/fragment_promo_info.xml
@@ -88,7 +88,7 @@
             android:gravity="center"
             android:fontFamily="@string/font_family_medium"
             android:textSize="15sp"
-            android:textColor="@color/gray_100"
+            android:textColor="@color/text_secondary"
             android:text="@string/how_it_works"
             android:layout_marginTop="22dp"
             android:layout_marginBottom="7dp"/>
@@ -98,7 +98,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textSize="15sp"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             android:lineSpacingExtra="2dp"/>
 
         <TextView
@@ -108,7 +108,7 @@
             android:gravity="center"
             android:fontFamily="@string/font_family_medium"
             android:textSize="15sp"
-            android:textColor="@color/gray_100"
+            android:textColor="@color/text_secondary"
             android:text="@string/limitations"
             android:layout_marginTop="22dp"
             android:layout_marginBottom="7dp"/>
@@ -118,7 +118,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textSize="15sp"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             tools:text="This is some text"
             android:lineSpacingExtra="2dp"/>
     </LinearLayout>
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index 85ef37ffe..750a4de51 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         >
         <LinearLayout
-            android:background="@color/white"
+            android:background="@color/content_background"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/content_border"
@@ -24,7 +24,7 @@
                 android:layout_height="63dp"
                 android:scaleType="fitCenter"
                 android:padding="6dp"
-                android:background="@color/gray_700"/>
+                android:background="@color/window_background"/>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
             android:layout_height="1dp"
             android:background="@color/black_10_alpha"/>
         <LinearLayout
-            android:background="@color/white"
+            android:background="@color/content_background"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -87,7 +87,7 @@
                     android:layout_height="wrap_content"
                     style="@style/Body1"
                     tools:text="3"
-                    android:textColor="@color/gray_300"
+                    android:textColor="@color/text_quad"
                     android:layout_marginLeft="6dp"/>
             </LinearLayout>
             <LinearLayout
diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml
index c7608e656..788bbf05c 100644
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@@ -2,7 +2,8 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/content_background">
 
     <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
         android:id="@+id/recyclerView"
@@ -11,8 +12,7 @@
         android:scrollbarSize="3dp"
         android:scrollbarThumbVertical="@color/scrollbarThumb"
         android:scrollbars="vertical"
-        android:clipToPadding="false"
-        android:background="@color/white"/>
+        android:clipToPadding="false"/>
 
     <TextView
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_recyclerview_stable.xml b/Habitica/res/layout/fragment_recyclerview_stable.xml
index c7608e656..e9db037ea 100644
--- a/Habitica/res/layout/fragment_recyclerview_stable.xml
+++ b/Habitica/res/layout/fragment_recyclerview_stable.xml
@@ -12,7 +12,7 @@
         android:scrollbarThumbVertical="@color/scrollbarThumb"
         android:scrollbars="vertical"
         android:clipToPadding="false"
-        android:background="@color/white"/>
+        android:background="@color/content_background"/>
 
     <TextView
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
index c4482c5df..cb7d78fc4 100644
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -5,7 +5,7 @@
     android:id="@+id/refreshLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/gray_700"
+    android:background="@color/window_background"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <FrameLayout
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="6dp"
                 android:gravity="center"
-                android:textColor="@color/gray_200"
+                android:textColor="@color/text_ternary"
                 android:textSize="@dimen/card_medium_text"
                 tools:text="No Items" />
 
@@ -44,7 +44,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:textColor="@color/gray_200"
+                android:textColor="@color/text_ternary"
                 tools:text="No Items" />
         </LinearLayout>
 
diff --git a/Habitica/res/layout/fragment_skills.xml b/Habitica/res/layout/fragment_skills.xml
index 22d0a0906..c620013b8 100644
--- a/Habitica/res/layout/fragment_skills.xml
+++ b/Habitica/res/layout/fragment_skills.xml
@@ -5,6 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbarSize="3dp"
-    android:background="@color/white"
+    android:background="@color/content_background"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical" />
diff --git a/Habitica/res/layout/fragment_stats.xml b/Habitica/res/layout/fragment_stats.xml
index 5b5ce8c0c..353b27c78 100644
--- a/Habitica/res/layout/fragment_stats.xml
+++ b/Habitica/res/layout/fragment_stats.xml
@@ -8,7 +8,7 @@
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -94,7 +94,7 @@
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/content_border"
             android:paddingRight="@dimen/content_border"
-            android:background="@color/gray_700"
+            android:background="@color/window_background"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"
             android:orientation="vertical">
@@ -152,7 +152,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/gray_600"
+            android:background="@color/offset_background"
             android:layout_marginBottom="20dp"/>
         <LinearLayout
             android:layout_width="match_parent"
@@ -172,12 +172,12 @@
                 style="@style/Subheader3"
                 android:layout_marginBottom="8dp"
                 android:layout_marginTop="18dp"
-                android:textColor="@color/gray_10"/>
+                android:textColor="@color/text_primary"/>
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/character_build_description"
-                android:textColor="@color/gray_100"/>
+                android:textColor="@color/text_secondary"/>
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -190,7 +190,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/strength_description"
-                android:textColor="@color/gray_100"/>
+                android:textColor="@color/text_secondary"/>
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -203,7 +203,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/intelligence_description"
-                android:textColor="@color/gray_100"/>
+                android:textColor="@color/text_secondary"/>
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -216,7 +216,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/constitution_description"
-                android:textColor="@color/gray_100"/>
+                android:textColor="@color/text_secondary"/>
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -229,7 +229,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/perception_description"
-                android:textColor="@color/gray_100"
+                android:textColor="@color/text_secondary"
                 android:layout_marginBottom="28dp"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index c6a2986ef..27d44ea1c 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -13,7 +13,7 @@
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical"
-    android:background="@color/white">
+    android:background="@color/content_background">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -114,13 +114,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem1"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Body1"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem1_description"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Caption2.Regular"/>
                 </LinearLayout>
             </LinearLayout>
@@ -143,13 +143,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem2"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Body1"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem2_description"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Caption2.Regular"/>
                 </LinearLayout>
             </LinearLayout>
@@ -172,14 +172,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem3"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Body1"/>
                     <TextView
                         android:id="@+id/sub_benefits_mystery_item_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem3_description"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Caption2.Regular"/>
                 </LinearLayout>
             </LinearLayout>
@@ -202,13 +202,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem4"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Body1"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem4_description"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Caption2.Regular"/>
                 </LinearLayout>
             </LinearLayout>
@@ -231,13 +231,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem5"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Body1"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/subscribe_listitem5_description"
-                        android:textColor="@color/black"
+                        android:textColor="@color/text_primary"
                         style="@style/Caption2.Regular"/>
                 </LinearLayout>
             </LinearLayout>
@@ -339,7 +339,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:text="@string/subscribe_gift_description"
                 android:gravity="center_horizontal"
                 android:layout_marginLeft="@dimen/spacing_large"
@@ -356,7 +356,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/gray_700">
+            android:background="@color/window_background">
             <TextView android:id="@+id/supportTextView"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
@@ -367,7 +367,7 @@
                 android:text="@string/subscribe_title"
                 android:layout_gravity="center_horizontal"
                 android:gravity="center"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:textSize="14sp"
                 android:lineSpacingExtra="4dp"
                 android:layout_marginTop="16dp"
diff --git a/Habitica/res/layout/fragment_support_bug_fix.xml b/Habitica/res/layout/fragment_support_bug_fix.xml
index bab44c9fc..71013a04b 100644
--- a/Habitica/res/layout/fragment_support_bug_fix.xml
+++ b/Habitica/res/layout/fragment_support_bug_fix.xml
@@ -5,7 +5,7 @@
 <LinearLayout
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/content_background"
     android:layout_marginBottom="@dimen/spacing_large">
     <TextView
         android:layout_width="match_parent"
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:padding="19dp"
         android:orientation="vertical"
-        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:background="@drawable/layout_rounded_bg_window"
         android:layout_marginLeft="@dimen/spacing_medium"
         android:layout_marginRight="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
@@ -30,7 +30,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/clear_cache"
-            android:textColor="@color/black"
+            android:textColor="@color/text_primary"
             style="@style/Body1"
             android:layout_marginBottom="4dp"/>
         <TextView
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         android:padding="19dp"
         android:orientation="vertical"
-        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:background="@drawable/layout_rounded_bg_window"
         android:layout_marginLeft="@dimen/spacing_medium"
         android:layout_marginRight="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
@@ -52,7 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/manual_sync_restart"
-            android:textColor="@color/black"
+            android:textColor="@color/text_primary"
             style="@style/Body1"
             android:layout_marginBottom="4dp"/>
         <TextView
@@ -66,7 +66,7 @@
         android:layout_height="wrap_content"
         android:padding="19dp"
         android:orientation="vertical"
-        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:background="@drawable/layout_rounded_bg_window"
         android:layout_marginLeft="@dimen/spacing_medium"
         android:layout_marginRight="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
@@ -74,7 +74,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/update_app"
-            android:textColor="@color/black"
+            android:textColor="@color/text_primary"
             style="@style/Body1"
             android:layout_marginBottom="4dp"/>
         <TextView
@@ -97,7 +97,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/send_bug_prompt"
-        android:textColor="@color/gray_300"
+        android:textColor="@color/text_quad"
         android:gravity="center"
         android:textSize="14sp"
         android:layout_marginTop="@dimen/spacing_small"
diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
index 5d98b294c..52ddfd4ba 100644
--- a/Habitica/res/layout/fragment_support_main.xml
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -8,12 +8,12 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/layout_rounded_bg_gray_700">
+    android:background="@drawable/layout_rounded_bg_window">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@color/white"
+        android:background="@color/content_background"
         android:paddingTop="@dimen/spacing_large"
         android:paddingBottom="@dimen/spacing_large">
         <LinearLayout
@@ -24,7 +24,7 @@
             android:layout_marginEnd="@dimen/spacing_large"
             android:gravity="center_horizontal"
             android:paddingTop="@dimen/spacing_large"
-            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:background="@drawable/layout_rounded_bg_window"
             android:orientation="vertical">
             <TextView
                 android:layout_width="wrap_content"
@@ -34,7 +34,7 @@
                 android:layout_marginEnd="@dimen/spacing_large"
                 style="@style/Subheader2"
                 android:letterSpacing="0.015"
-                android:textColor="@color/black"
+                android:textColor="@color/text_primary"
                 />
             <TextView
                 android:layout_width="wrap_content"
@@ -42,7 +42,7 @@
                 android:text="@string/using_habitica_description"
                 style="@style/Body2"
                 android:lineSpacingExtra="3sp"
-                android:textColor="@color/gray_100"
+                android:textColor="@color/text_secondary"
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
                 android:gravity="center"
@@ -74,7 +74,7 @@
             android:gravity="center_horizontal"
             android:paddingTop="@dimen/spacing_large"
             android:layout_marginTop="@dimen/spacing_medium"
-            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:background="@drawable/layout_rounded_bg_window"
             android:orientation="vertical">
             <TextView
                 android:layout_width="wrap_content"
@@ -84,7 +84,7 @@
                 android:layout_marginEnd="@dimen/spacing_large"
                 style="@style/Subheader2"
                 android:letterSpacing="0.015"
-                android:textColor="@color/black"
+                android:textColor="@color/text_primary"
                 />
             <TextView
                 android:layout_width="wrap_content"
@@ -92,7 +92,7 @@
                 android:text="@string/bugs_fixes_description"
                 style="@style/Body2"
                 android:lineSpacingExtra="3sp"
-                android:textColor="@color/gray_100"
+                android:textColor="@color/text_secondary"
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
                 android:gravity="center"
@@ -122,7 +122,7 @@
             android:layout_marginTop="@dimen/spacing_medium"
             android:layout_marginStart="@dimen/spacing_large"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:background="@drawable/layout_rounded_bg_window"
             android:gravity="center_horizontal"
             android:paddingTop="@dimen/spacing_large"
             android:orientation="vertical">
@@ -134,7 +134,7 @@
                 android:layout_marginEnd="@dimen/spacing_large"
                 style="@style/Subheader2"
                 android:letterSpacing="0.015"
-                android:textColor="@color/black"
+                android:textColor="@color/text_primary"
                 />
             <TextView
                 android:layout_width="wrap_content"
@@ -142,7 +142,7 @@
                 android:text="@string/suggestions_feedback_description"
                 style="@style/Body2"
                 android:lineSpacingExtra="3sp"
-                android:textColor="@color/gray_100"
+                android:textColor="@color/text_secondary"
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
                 android:gravity="center"
@@ -168,13 +168,13 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/gray_500"/>
+        android:background="@color/content_background_offset"/>
     <Button
         android:id="@+id/reset_tutorial_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/HabiticaButton.Gray.600"
-        android:textColor="@color/gray_50"
+        style="@style/HabiticaButton.Offset"
+        android:textColor="@color/text_primary"
         android:text="@string/reset_walkthrough"
         android:layout_margin="@dimen/spacing_large"/>
 </LinearLayout>
diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml
index d4b567730..b555edb0f 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
     <include layout="@layout/shop_header"
         android:layout_marginBottom="@dimen/spacing_large"
         android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
         android:layout_height="wrap_content"
         app:title="@string/community_guidelines"
         app:identifier="tavernGuidelines">
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/guidelinesButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_viewpager.xml b/Habitica/res/layout/fragment_viewpager.xml
index e94b93dc7..030bcdfb0 100644
--- a/Habitica/res/layout/fragment_viewpager.xml
+++ b/Habitica/res/layout/fragment_viewpager.xml
@@ -2,5 +2,5 @@
 <androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/content_background"
     android:id="@+id/viewPager" />
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
index 96d1830d5..0e37779a2 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:stretchColumns="2"
-        android:background="@drawable/rounded_border_white">
+        android:background="@drawable/rounded_border_content">
         <TableRow>
             <TextView
                 android:layout_height="42dp"
@@ -49,7 +49,7 @@
                 android:gravity="center_vertical"
                 android:textSize="14sp"
                 />
-            <View android:background="@color/gray_600"
+            <View android:background="@color/offset_background"
                 android:layout_height="42dp"
                 android:layout_width="1dp" />
             <EditText android:id="@+id/display_name_edit_text"
@@ -63,7 +63,7 @@
         <TableRow>
             <View android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="@color/gray_600" android:layout_span="3" />
+                android:background="@color/offset_background" android:layout_span="3" />
         </TableRow>
         <TableRow>
             <TextView android:text="@string/username"
@@ -74,7 +74,7 @@
                 android:layout_marginLeft="1dp"
                 android:gravity="center_vertical"
                 android:textSize="14sp"/>
-            <View android:background="@color/gray_600"
+            <View android:background="@color/offset_background"
                 android:layout_width="1dp"
                 android:layout_height="42dp"/>
             <LinearLayout
@@ -85,7 +85,7 @@
                     android:layout_height="match_parent"
                     android:text="@"
                     android:gravity="center_vertical"
-                    android:textColor="@color/gray_400"
+                    android:textColor="@color/text_dimmed"
                     android:textSize="14sp"/>
                 <EditText android:id="@+id/username_edit_text"
                     android:background="@color/transparent"
diff --git a/Habitica/res/layout/gear_list_item.xml b/Habitica/res/layout/gear_list_item.xml
index 5e2927df8..9970ac65d 100644
--- a/Habitica/res/layout/gear_list_item.xml
+++ b/Habitica/res/layout/gear_list_item.xml
@@ -61,7 +61,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equipment_str"
                 android:textSize="14sp"
-                android:textColor="@color/gray_200"
+                android:textColor="@color/text_ternary"
                 android:layout_marginRight="5dp"/>
             <TextView
                 android:id="@+id/str_value"
@@ -76,7 +76,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equipment_con"
                 android:textSize="14sp"
-                android:textColor="@color/gray_200"
+                android:textColor="@color/text_ternary"
                 android:layout_marginRight="5dp"/>
             <TextView
                 android:id="@+id/con_value"
@@ -91,7 +91,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equipment_int"
                 android:textSize="14sp"
-                android:textColor="@color/gray_200"
+                android:textColor="@color/text_ternary"
                 android:layout_marginRight="5dp"/>
             <TextView
                 android:id="@+id/int_value"
@@ -106,7 +106,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equipment_per"
                 android:textSize="14sp"
-                android:textColor="@color/gray_200"
+                android:textColor="@color/text_ternary"
                 android:layout_marginRight="5dp"/>
             <TextView
                 android:id="@+id/per_value"
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index 09b64a062..adcd59eb5 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
 
     <LinearLayout
         android:id="@+id/main_task_wrapper"
diff --git a/Habitica/res/layout/help_header.xml b/Habitica/res/layout/help_header.xml
index 45ab2fa0f..f23b645c4 100644
--- a/Habitica/res/layout/help_header.xml
+++ b/Habitica/res/layout/help_header.xml
@@ -4,7 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/gray_700"
+    android:background="@color/window_background"
     android:paddingTop="@dimen/spacing_large"
     android:paddingBottom="@dimen/spacing_large"
     android:paddingLeft="@dimen/spacing_large"
diff --git a/Habitica/res/layout/item_inbox_overview.xml b/Habitica/res/layout/item_inbox_overview.xml
index c0374992c..9b2ff5d01 100644
--- a/Habitica/res/layout/item_inbox_overview.xml
+++ b/Habitica/res/layout/item_inbox_overview.xml
@@ -44,7 +44,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="12sp"
-                android:textColor="@color/gray_300"/>
+                android:textColor="@color/text_quad"/>
         </LinearLayout>
         <TextView
             android:id="@+id/username_textview"
diff --git a/Habitica/res/layout/item_item.xml b/Habitica/res/layout/item_item.xml
index 3e68c8900..6a24a14f3 100644
--- a/Habitica/res/layout/item_item.xml
+++ b/Habitica/res/layout/item_item.xml
@@ -22,12 +22,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Title"
+            android:textColor="@color/text_primary"
             style="@style/RowTitle"/>
         <TextView
             android:id="@+id/ownedTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Value"
+            android:textColor="@color/text_secondary"
             style="@style/RowText" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/main_navigation_view.xml b/Habitica/res/layout/main_navigation_view.xml
index ce12da747..ca628b866 100644
--- a/Habitica/res/layout/main_navigation_view.xml
+++ b/Habitica/res/layout/main_navigation_view.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.RelativeLayout"
-    tools:background="@color/gray_600">
+    tools:background="@color/offset_background">
 
     <LinearLayout
         android:id="@+id/bottom_navigation_background"
@@ -23,17 +23,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-        <ImageView
-            android:id="@+id/cutout_background"
-            android:layout_width="wrap_content"
-            android:layout_height="62dp"
-            android:src="@drawable/bottom_navigation_inset"
-            android:layout_gravity="top"/>
+            <ImageView
+                android:id="@+id/cutout_background"
+                android:layout_width="wrap_content"
+                android:layout_height="62dp"
+                android:src="@drawable/bottom_navigation_inset"
+                android:layout_gravity="top"/>
             <View
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="?barColor" />
-    </LinearLayout>
+        </LinearLayout>
         <View
             android:layout_width="0dp"
             android:layout_weight="1"
diff --git a/Habitica/res/layout/menu_bottom_sheet.xml b/Habitica/res/layout/menu_bottom_sheet.xml
index fcc654b20..b3e3657c7 100644
--- a/Habitica/res/layout/menu_bottom_sheet.xml
+++ b/Habitica/res/layout/menu_bottom_sheet.xml
@@ -13,7 +13,7 @@
         tools:text="Title"
         android:gravity="center"
         style="@style/Subheader1"
-        android:background="@color/gray_700"
+        android:background="@color/window_background"
         android:padding="8dp"/>
     <LinearLayout
         android:id="@+id/menu_items"
diff --git a/Habitica/res/layout/mount_overview_item.xml b/Habitica/res/layout/mount_overview_item.xml
index 3fbe20860..62502d03e 100644
--- a/Habitica/res/layout/mount_overview_item.xml
+++ b/Habitica/res/layout/mount_overview_item.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clickable="true"
-    android:background="@color/white"
+    android:background="?attr/colorContentBackground"
     android:focusable="true">
 
     <LinearLayout
diff --git a/Habitica/res/layout/notification_item.xml b/Habitica/res/layout/notification_item.xml
index 26a6827df..e66f0ff02 100644
--- a/Habitica/res/layout/notification_item.xml
+++ b/Habitica/res/layout/notification_item.xml
@@ -3,7 +3,7 @@
     android:id="@+id/notification_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?attr/colorContentBackground"
     android:orientation="horizontal"
     android:paddingLeft="20dp"
     android:paddingTop="10dp"
diff --git a/Habitica/res/layout/notification_item_actionable.xml b/Habitica/res/layout/notification_item_actionable.xml
index 89efb25f3..37bb9c8f8 100644
--- a/Habitica/res/layout/notification_item_actionable.xml
+++ b/Habitica/res/layout/notification_item_actionable.xml
@@ -4,7 +4,7 @@
     android:id="@+id/notification_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="@color/content_background"
     android:orientation="vertical"
     android:paddingLeft="20dp"
     android:paddingTop="10dp"
diff --git a/Habitica/res/layout/notifications_header.xml b/Habitica/res/layout/notifications_header.xml
index a03897f70..1c57d0e41 100644
--- a/Habitica/res/layout/notifications_header.xml
+++ b/Habitica/res/layout/notifications_header.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?attr/colorContentBackground"
     android:orientation="horizontal"
     android:paddingLeft="20dp"
     android:paddingTop="10dp"
@@ -26,7 +26,7 @@
             android:background="@color/transparent"
             android:text="@string/notifications"
             android:textAllCaps="true"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             android:textSize="12sp" />
 
         <TextView
@@ -37,7 +37,7 @@
             android:background="@drawable/badge_gray"
             android:gravity="center"
             android:minWidth="24dp"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             android:textSize="12sp"
             tools:text="1" />
     </LinearLayout>
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index d97072e71..9f9921d81 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -80,13 +80,13 @@
                     android:layout_height="13dp"
                     android:id="@+id/health_bar"
                     app:barForegroundColor="@color/hpColor"
-                    app:barBackgroundColor="@color/gray_700"/>
+                    app:barBackgroundColor="@color/window_background"/>
                 <TextView
                     android:id="@+id/health_textview"
                     android:layout_width="wrap_content"
                     android:layout_height="19dp"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_200"
+                    android:textColor="@color/text_ternary"
                     tools:text="50 / 50"
                     android:layout_marginStart="13dp"/>
             </TableRow>
@@ -98,13 +98,13 @@
                     android:layout_height="13dp"
                     android:id="@+id/experience_bar"
                     app:barForegroundColor="@color/xpColor"
-                    app:barBackgroundColor="@color/gray_700"/>
+                    app:barBackgroundColor="@color/window_background"/>
                 <TextView
                     android:id="@+id/experience_textview"
                     android:layout_width="wrap_content"
                     android:layout_height="19dp"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_200"
+                    android:textColor="@color/text_ternary"
                     tools:text="50 / 50"
                     android:layout_marginStart="13dp"/>
             </TableRow>
@@ -116,13 +116,13 @@
                     android:layout_height="13dp"
                     android:id="@+id/mana_bar"
                     app:barForegroundColor="@color/mpColor"
-                    app:barBackgroundColor="@color/gray_700"/>
+                    app:barBackgroundColor="@color/window_background"/>
                 <TextView
                     android:id="@+id/mana_textview"
                     android:layout_width="wrap_content"
                     android:layout_height="19dp"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_200"
+                    android:textColor="@color/text_ternary"
                     tools:text="50 / 5000"
                     android:layout_marginStart="13dp"/>
             </TableRow>
diff --git a/Habitica/res/layout/pet_detail_item.xml b/Habitica/res/layout/pet_detail_item.xml
index 8d8ac26f1..91a6202ab 100644
--- a/Habitica/res/layout/pet_detail_item.xml
+++ b/Habitica/res/layout/pet_detail_item.xml
@@ -4,7 +4,7 @@
     android:id="@+id/card_view"
     android:layout_height="88dp"
     android:layout_width="76dp"
-    android:background="@drawable/layout_rounded_bg_gray_700"
+    android:background="@drawable/layout_rounded_bg_window"
     android:orientation="vertical"
     android:padding="8dp">
     <com.facebook.drawee.view.SimpleDraweeView
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:id="@+id/trainedProgressBar"
         android:progressTint="@color/green_100"
-        android:progressBackgroundTint="@color/gray_600"
+        android:progressBackgroundTint="@color/offset_background"
         android:layout_marginStart="7dp"
         android:layout_marginEnd="7dp"
         android:max="50" />
diff --git a/Habitica/res/layout/pet_overview_item.xml b/Habitica/res/layout/pet_overview_item.xml
index cea0dfe82..91b8bdbbd 100644
--- a/Habitica/res/layout/pet_overview_item.xml
+++ b/Habitica/res/layout/pet_overview_item.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clickable="true"
-    android:background="@color/white"
+    android:background="?attr/colorContentBackground"
     android:focusable="true">
     <LinearLayout
         android:id="@+id/card_view"
@@ -34,6 +34,7 @@
                 android:id="@+id/titleTextView"
                 android:textSize="12sp"
                 android:gravity="center"
+                android:textColor="@color/text_primary"
                 style="@style/RowTitle"/>
             <TextView
                 android:layout_width="match_parent"
@@ -43,6 +44,7 @@
                 android:gravity="center"
                 android:textSize="12sp"
                 android:background="@drawable/layout_rounded_bg_shopitem_price"
+                android:textColor="@color/text_secondary"
                 style="@style/RowText"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/Habitica/res/layout/preference_category.xml b/Habitica/res/layout/preference_category.xml
index 76fdf79b7..5805c6e47 100644
--- a/Habitica/res/layout/preference_category.xml
+++ b/Habitica/res/layout/preference_category.xml
@@ -21,7 +21,7 @@
     android:textAllCaps="true"
     android:textSize="12sp"
     android:background="@color/transparent"
-    android:textColor="@color/gray_300"
+    android:textColor="@color/text_quad"
     android:paddingLeft="32dip"
     android:paddingRight="32dip"
     android:paddingTop="16dip"
diff --git a/Habitica/res/layout/preference_child_summary.xml b/Habitica/res/layout/preference_child_summary.xml
index 394259e73..b4467e44c 100644
--- a/Habitica/res/layout/preference_child_summary.xml
+++ b/Habitica/res/layout/preference_child_summary.xml
@@ -29,7 +29,7 @@
         android:fadingEdge="horizontal"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/black"
+        android:textColor="@color/text_primary"
         tools:text="Title"/>
 
     <TextView
diff --git a/Habitica/res/layout/preference_child_summary_error.xml b/Habitica/res/layout/preference_child_summary_error.xml
index 924677962..2d67c295a 100644
--- a/Habitica/res/layout/preference_child_summary_error.xml
+++ b/Habitica/res/layout/preference_child_summary_error.xml
@@ -28,7 +28,7 @@
             android:fadingEdge="horizontal"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/black"
+            android:textColor="@color/text_primary"
             tools:text="Title"/>
 
         <TextView
diff --git a/Habitica/res/layout/profile_new_message_dialog.xml b/Habitica/res/layout/profile_new_message_dialog.xml
index 4fd0e13e6..02e6b4cb1 100644
--- a/Habitica/res/layout/profile_new_message_dialog.xml
+++ b/Habitica/res/layout/profile_new_message_dialog.xml
@@ -12,7 +12,7 @@
         android:text="@string/chat"
         android:id="@+id/new_message_title"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="@color/gray_50" />
+        android:textColor="@color/text_primary" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/progress_bar.xml b/Habitica/res/layout/progress_bar.xml
index 095f1b3ae..9e7e95a94 100644
--- a/Habitica/res/layout/progress_bar.xml
+++ b/Habitica/res/layout/progress_bar.xml
@@ -29,8 +29,6 @@
             android:id="@+id/bar"
             android:layout_width="0dip"
             android:layout_height="match_parent" />
-
-
         <View
             android:id="@+id/emptyBarSpace"
             android:layout_width="0dip"
diff --git a/Habitica/res/layout/promo_gift_one_get_one.xml b/Habitica/res/layout/promo_gift_one_get_one.xml
index d320e4e4f..719f627a7 100644
--- a/Habitica/res/layout/promo_gift_one_get_one.xml
+++ b/Habitica/res/layout/promo_gift_one_get_one.xml
@@ -38,7 +38,7 @@
             android:layout_height="32dp"
             android:minWidth="110dp"
             android:text="@string/learn_more"
-            style="@style/HabiticaButton.White"
+            style="@style/HabiticaButton.Content"
             android:textSize="14sp"
             android:textColor="@color/teal_50"
             android:layout_marginTop="14dp"/>
diff --git a/Habitica/res/layout/promo_menu.xml b/Habitica/res/layout/promo_menu.xml
index e5d943f1d..0b174b659 100644
--- a/Habitica/res/layout/promo_menu.xml
+++ b/Habitica/res/layout/promo_menu.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:parentTag="android.widget.RelativeLayout"
-    android:background="@color/gray_700">
+    android:background="@color/window_background">
     <LinearLayout
         android:id="@+id/contentWrapper"
         android:layout_width="wrap_content"
@@ -25,7 +25,7 @@
             android:id="@+id/title_text_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray_100"
+            android:textColor="@color/text_secondary"
             android:textSize="14sp"
             android:textStyle="bold"/>
         <ImageView
@@ -36,7 +36,7 @@
             android:id="@+id/description_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray_100"
+            android:textColor="@color/text_secondary"
             android:textSize="12sp"
             android:textAlignment="center"
             android:maxWidth="240dp"/>
diff --git a/Habitica/res/layout/promo_subscription_buy_gems.xml b/Habitica/res/layout/promo_subscription_buy_gems.xml
index 36842d3aa..dbcfec906 100644
--- a/Habitica/res/layout/promo_subscription_buy_gems.xml
+++ b/Habitica/res/layout/promo_subscription_buy_gems.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:parentTag="android.widget.RelativeLayout"
-    android:background="@color/gray_700">
+    android:background="@color/window_background">
 <LinearLayout
     android:id="@+id/contentWrapper"
     android:layout_width="wrap_content"
@@ -21,14 +21,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/promo_subscription_buy_gems_prompt"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         android:textSize="14sp"
         android:textStyle="bold"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/promo_subscription_buy_gems_description"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         android:textSize="12sp"
         android:textAlignment="center"
         android:maxWidth="240dp"/>
diff --git a/Habitica/res/layout/purchase_subscription_view.xml b/Habitica/res/layout/purchase_subscription_view.xml
index b0446b472..5f7ee51f1 100644
--- a/Habitica/res/layout/purchase_subscription_view.xml
+++ b/Habitica/res/layout/purchase_subscription_view.xml
@@ -38,7 +38,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:id="@+id/priceLabel"
-                android:textColor="@color/gray_50"
+                android:textColor="@color/text_primary"
                 android:textSize="24sp"
                 android:fontFamily="@string/font_family_medium"
                 tools:text="$ 21" />
diff --git a/Habitica/res/layout/quest_menu_view.xml b/Habitica/res/layout/quest_menu_view.xml
index 597fc5bc5..0a48c5ebc 100644
--- a/Habitica/res/layout/quest_menu_view.xml
+++ b/Habitica/res/layout/quest_menu_view.xml
@@ -81,13 +81,13 @@
                 android:paddingTop="@dimen/spacing_medium"
                 android:paddingBottom="@dimen/spacing_small"
                 app:barForegroundColor="@color/red_50"
-                app:barBackgroundColor="@color/white_15_alpha"/>
+                app:barBackgroundColor="@color/content_15_alpha"/>
             <ImageView
                 android:id="@+id/pendingDamageIconView"
                 android:layout_width="18dp"
                 android:layout_height="18dp"
-                android:layout_marginLeft="@dimen/spacing_medium"
-                android:layout_marginRight="@dimen/spacing_small"/>
+                android:layout_marginStart="@dimen/spacing_medium"
+                android:layout_marginEnd="@dimen/spacing_small"/>
             <TextView
                 android:id="@+id/pendingDamageTextView"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/quest_progress.xml b/Habitica/res/layout/quest_progress.xml
index 685e1049f..b7c9aa5a6 100644
--- a/Habitica/res/layout/quest_progress.xml
+++ b/Habitica/res/layout/quest_progress.xml
@@ -29,10 +29,10 @@
             android:id="@+id/artCreditTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="By @AnnDeLune"
+            tools:text="By @AnnDeLune"
             android:textColor="@color/white"
             android:textSize="12sp"
-            android:layout_marginRight="@dimen/spacing_medium"/>
+            android:layout_marginEnd="@dimen/spacing_medium"/>
         <ImageView
             android:id="@+id/caretView"
             android:layout_width="wrap_content"
@@ -99,7 +99,7 @@
         android:layout_height="wrap_content"
         app:barForegroundColor="@color/red_50"
         app:valueTextColor="@color/white"
-        app:barBackgroundColor="@color/white_15_alpha"
+        app:barBackgroundColor="@color/content_15_alpha"
         app:barHeight="8dp"
         app:labelSpacing="@dimen/spacing_medium"
         android:paddingLeft="@dimen/spacing_large"
@@ -125,7 +125,7 @@
             android:layout_height="wrap_content"
             tools:text="Boss Rage"
             android:textSize="14sp"
-            android:layout_marginLeft="@dimen/spacing_medium"
+            android:layout_marginStart="@dimen/spacing_medium"
             android:textColor="@color/white"/>
     </LinearLayout>
     <com.habitrpg.android.habitica.ui.views.ValueBar
@@ -134,7 +134,7 @@
         android:layout_height="wrap_content"
         app:barForegroundColor="@color/orange_100"
         app:valueTextColor="@color/white"
-        app:barBackgroundColor="@color/white_15_alpha"
+        app:barBackgroundColor="@color/content_15_alpha"
         app:barHeight="8dp"
         app:labelSpacing="@dimen/spacing_medium"
         android:paddingLeft="@dimen/spacing_large"
@@ -153,7 +153,7 @@
         android:layout_height="wrap_content"
         tools:text="Rage Strikes: 1/3"
         style="@style/Body1"
-        android:background="@drawable/layout_rounded_bg_white_15"
+        android:background="@drawable/layout_rounded_bg_content_15"
         android:gravity="center"
         android:paddingTop="@dimen/spacing_small"
         android:paddingBottom="@dimen/spacing_small"
@@ -174,7 +174,7 @@
         android:layout_height="wrap_content"
         app:title="@string/world_boss_description"
         app:identifier="questDescription"
-        app:color="@color/white">
+        app:color="@color/content_background">
     <TextView
         android:id="@+id/questDescription"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 32987d455..5540a6bc8 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white">
+    android:background="@color/content_background">
 
     <LinearLayout
         android:id="@+id/main_task_wrapper"
diff --git a/Habitica/res/layout/row_quest_reward.xml b/Habitica/res/layout/row_quest_reward.xml
index 8474a4646..767cadc90 100644
--- a/Habitica/res/layout/row_quest_reward.xml
+++ b/Habitica/res/layout/row_quest_reward.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/layout_rounded_bg_gray_700"
+    android:background="@drawable/layout_rounded_bg_window"
     android:gravity="center_vertical"
     android:layout_marginBottom="4dp">
 
diff --git a/Habitica/res/layout/row_quest_reward_imageview.xml b/Habitica/res/layout/row_quest_reward_imageview.xml
index 9453a8aca..c0c924624 100644
--- a/Habitica/res/layout/row_quest_reward_imageview.xml
+++ b/Habitica/res/layout/row_quest_reward_imageview.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/layout_rounded_bg_gray_700"
+    android:background="@drawable/layout_rounded_bg_window"
     android:gravity="center_vertical"
     android:layout_marginBottom="4dp">
 
diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index 158cb0a2b..ca23fa519 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -5,7 +5,7 @@
                 android:layout_height="wrap_content"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:clickable="true"
-                android:background="@color/white"
+                android:background="@color/content_background"
                 android:focusable="true">
     <LinearLayout
         android:id="@+id/container"
@@ -33,7 +33,7 @@
                 android:id="@+id/priceLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 tools:text="150"
                 style="@style/Body1"
                 app:hasLightBackground="true"
@@ -46,7 +46,7 @@
                 android:layout_gravity="center"
                 style="@style/Body1"
                 android:textSize="11sp"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:paddingStart="2dp"
                 android:paddingRight="2dp"
                 />
diff --git a/Habitica/res/layout/shop_section_header.xml b/Habitica/res/layout/shop_section_header.xml
index f2f774896..7bc2d6e4d 100644
--- a/Habitica/res/layout/shop_section_header.xml
+++ b/Habitica/res/layout/shop_section_header.xml
@@ -40,7 +40,7 @@
         android:gravity="center"
         android:layout_marginBottom="12dp"
         android:textSize="12sp"
-        android:textColor="@color/gray_300"
+        android:textColor="@color/text_quad"
         android:visibility="gone"
         tools:visibility="visible"
         tools:text="@string/class_gear_disclaimer"/>
diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index 9dc866268..80186075e 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -8,7 +8,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:background="@drawable/layout_rounded_bg_window"
         android:clipToPadding="true"
         android:clipChildren="true"
         android:layout_marginStart="16dp"
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index dd66c4bd7..91271069f 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml
index e7e5ff79c..5dedc0ffa 100644
--- a/Habitica/res/layout/speechbubble.xml
+++ b/Habitica/res/layout/speechbubble.xml
@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="46dp"
-        android:background="@drawable/white_rounded_bg"
+        android:background="@drawable/layout_rounded_bg_content"
         android:orientation="vertical"
         android:paddingBottom="16dp"
         android:paddingLeft="21dp"
diff --git a/Habitica/res/layout/stats_slider_view.xml b/Habitica/res/layout/stats_slider_view.xml
index 64ba9f21d..437a5d719 100644
--- a/Habitica/res/layout/stats_slider_view.xml
+++ b/Habitica/res/layout/stats_slider_view.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         tools:text="STR"
         tools:textColor="@color/red_50"
-        android:layout_marginRight="4dp"
+        android:layout_marginEnd="4dp"
         style="@style/Body3"
         android:textSize="16sp"
         android:textAllCaps="true" />
@@ -24,10 +24,10 @@
         android:minWidth="28dp"
         android:layout_height="wrap_content"
         tools:text="10"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         style="@style/Body3"
         android:textSize="16sp"
-        android:gravity="right"/>
+        android:gravity="end"/>
 
     <SeekBar
         android:id="@+id/statsSeekBar"
@@ -40,7 +40,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="+"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         android:textSize="16sp"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/valueEditText"
@@ -48,9 +48,9 @@
         android:layout_height="wrap_content"
         tools:text="0"
         android:gravity="center_horizontal"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         style="@style/Body1"
-        app:backgroundTint="@color/gray_500"
+        app:backgroundTint="@color/content_background_offset"
         android:textSize="16sp"
         android:inputType="number"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/stats_view.xml b/Habitica/res/layout/stats_view.xml
index fd8cf6dd7..9c8bc8f5b 100644
--- a/Habitica/res/layout/stats_view.xml
+++ b/Habitica/res/layout/stats_view.xml
@@ -4,7 +4,7 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:background="@drawable/layout_rounded_bg_gray_700"
+              android:background="@drawable/layout_rounded_bg_window"
               android:layout_marginLeft="16dp"
               android:layout_marginRight="16dp">
     <LinearLayout
@@ -56,7 +56,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/level"
                 android:textSize="12sp"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:gravity="center_horizontal"/>
         </LinearLayout>
         <LinearLayout
@@ -78,7 +78,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/sidebar_equipment"
                 android:textSize="12sp"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:gravity="center_horizontal"/>
         </LinearLayout>
         <LinearLayout
@@ -100,7 +100,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/buffs"
                 android:textSize="12sp"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:gravity="center_horizontal"/>
         </LinearLayout>
             <LinearLayout
@@ -124,7 +124,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/allocated"
                     android:textSize="12sp"
-                    android:textColor="@color/gray_300"
+                    android:textColor="@color/text_quad"
                     android:gravity="center_horizontal"/>
             </LinearLayout>
         <ImageButton
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index af78981c1..e5ae0b24d 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:background="@color/white">
+    tools:background="@color/content_background">
     <ImageView
         android:id="@+id/heart_icon"
         android:layout_width="20dp"
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:text="@string/thanks_for_subscribing"
         style="@style/Body2"
-        android:textColor="@color/gray_300"
+        android:textColor="@color/text_quad"
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="12dp"
         android:layout_marginTop="4dp"
diff --git a/Habitica/res/layout/support_collapsible_section.xml b/Habitica/res/layout/support_collapsible_section.xml
index db70187a9..88b8487b9 100644
--- a/Habitica/res/layout/support_collapsible_section.xml
+++ b/Habitica/res/layout/support_collapsible_section.xml
@@ -32,7 +32,7 @@
                 android:id="@+id/subtitle_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/gray_200"
+                android:textColor="@color/text_ternary"
                 style="@style/Body2"
                 tools:text="Subtitle" />
         </LinearLayout>
diff --git a/Habitica/res/layout/support_faq_item.xml b/Habitica/res/layout/support_faq_item.xml
index 8d78e746b..8359eed23 100644
--- a/Habitica/res/layout/support_faq_item.xml
+++ b/Habitica/res/layout/support_faq_item.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        android:textColor="@color/gray_100"
+        android:textColor="@color/text_secondary"
         tools:text="Title"
         android:layout_marginRight="@dimen/spacing_large"
         android:layout_marginTop="@dimen/spacing_medium"
diff --git a/Habitica/res/layout/system_chat_message.xml b/Habitica/res/layout/system_chat_message.xml
index bd0fda0bb..5c775e01c 100644
--- a/Habitica/res/layout/system_chat_message.xml
+++ b/Habitica/res/layout/system_chat_message.xml
@@ -8,7 +8,7 @@
     android:paddingRight="@dimen/chat_horizontal_inset"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
-    android:background="@color/gray_700">
+    android:background="@color/window_background">
     <TextView
         android:background="@drawable/system_chat_background"
         android:id="@+id/text_view"
diff --git a/Habitica/res/layout/task_form_task_scheduling.xml b/Habitica/res/layout/task_form_task_scheduling.xml
index f16663c4f..d872a42c8 100644
--- a/Habitica/res/layout/task_form_task_scheduling.xml
+++ b/Habitica/res/layout/task_form_task_scheduling.xml
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/start_date"
-            android:textColor="@color/gray_300"
+            android:textColor="@color/text_quad"
             android:textSize="12sp" />
         <TextView
             android:id="@+id/start_date_textview"
@@ -59,7 +59,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/repeats"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:textSize="12sp"
                 android:labelFor="@+id/repeats_every_spinner"/>
 
@@ -86,7 +86,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/every"
-                android:textColor="@color/gray_300"
+                android:textColor="@color/text_quad"
                 android:textSize="12sp" />
 
             <LinearLayout
@@ -103,14 +103,14 @@
                     tools:text="1"
                     android:inputType="number"
                     android:background="@color/transparent"
-                    android:textColor="@color/gray_100"/>
+                    android:textColor="@color/text_secondary"/>
 
                 <TextView
                     android:id="@+id/repeats_every_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/days"
-                    android:textColor="@color/gray_300"
+                    android:textColor="@color/text_quad"
                     android:labelFor="@+id/repeats_every_edittext"/>
             </LinearLayout>
         </LinearLayout>
@@ -147,7 +147,7 @@
         android:id="@+id/summary_textview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/gray_300"
+        android:textColor="@color/text_quad"
         android:textSize="12sp"
         android:layout_marginTop="@dimen/spacing_medium"/>
 </merge>
\ 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 befb2f00e..19102a436 100644
--- a/Habitica/res/layout/task_main_content.xml
+++ b/Habitica/res/layout/task_main_content.xml
@@ -14,7 +14,7 @@
         <com.habitrpg.android.habitica.ui.views.EllipsisTextView
             android:id="@+id/checkedTextView"
             style="@style/Subheader3"
-            android:textColor="#000"
+            android:textColor="?attr/textColorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:lineSpacingExtra="2sp"
@@ -26,6 +26,7 @@
             style="@style/Caption2.Regular"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textColor="?attr/textColorSecondary"
             android:maxLines="3"
             android:ellipsize="end"
             android:textSize="11sp"
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 963544f5f..2c0698523 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?attr/colorContentBackground"
     android:foreground="?selectableItemBackground"
     android:orientation="vertical">
 
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
index 0b5a9d6f7..e654fd0a3 100644
--- a/Habitica/res/layout/view_collapsible_section.xml
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -9,7 +9,7 @@
         android:id="@+id/separator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/gray_500"/>
+        android:background="@color/content_background_offset"/>
     <LinearLayout
         android:id="@+id/title_view"
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
             android:layout_marginTop="@dimen/spacing_large"
             android:layout_marginBottom="@dimen/spacing_large"
             android:textSize="16sp"
-            android:textColor="@color/gray_50"
+            android:textColor="@color/text_primary"
             tools:text="Example"/>
         <FrameLayout
             android:layout_width="0dp"
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
new file mode 100644
index 000000000..1ff83cf72
--- /dev/null
+++ b/Habitica/res/values-night/colors.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="color_accent">@color/brand_300</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_dimmed">@color/gray_200</color>
+    <color name="text_brand">@color/brand_400</color>
+    <color name="text_brand_neon">@color/brand_500</color>
+    <color name="text_red">@color/red_10</color>
+    <color name="text_orange">@color/orange_100</color>
+    <color name="text_yellow">@color/yellow_100</color>
+    <color name="text_green">@color/green_100</color>
+    <color name="text_blue">@color/blue_100</color>
+    <color name="text_teal">@color/teal_100</color>
+
+    <color name="content_background">@color/gray_1</color>
+    <color name="window_background">@color/gray_10</color>
+    <color name="offset_background">@color/gray_50</color>
+    <color name="offset_background_30">#4c4e4a57</color>
+    <color name="content_background_offset">@color/gray_100</color>
+    <color name="brand_background">@color/gray_10</color>
+    <color name="brand_background_dark">@color/gray_10</color>
+    <color name="dimmed_background">@color/gray_200</color>
+    <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="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="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>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 2239551b5..cbfcc8c51 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -67,8 +67,6 @@
     <color name="gray_600">#edecee</color>
     <color name="gray_700">#f9f9f9</color>
 
-    <color name="gray_600_30">#4cedecee</color>
-
     <color name="hpColor">@color/red_100</color>
     <color name="xpColor">@color/yellow_100</color>
     <color name="mpColor">@color/blue_100</color>
@@ -81,8 +79,8 @@
 
     <!-- Cards -->
     <color name="text_light">#66000000</color>
-    <color name="card_text">@color/gray_200</color>
-    <color name="card_title_text">@color/gray_100</color>
+    <color name="card_text">@color/text_ternary</color>
+    <color name="card_title_text">@color/text_secondary</color>
 
     <!-- dialog -->
     <color name="primary_text_light">#000000</color>
@@ -94,9 +92,8 @@
 
     <color name="white">#ffffff </color>
 
-    <color name="cell_separator">@color/gray_400</color>
-    <color name="checklist_separator">@color/gray_600</color>
-    <color name="task_gray">@color/gray_400</color>
+    <color name="cell_separator">@color/separator</color>
+    <color name="checklist_separator">@color/offset_background</color>
     <color name="checkbox_fill">#50ffffff</color>
     <color name="checkbox_checked_fill">#c8ffffff</color>
     <color name="checkbox_checklist_fill">#23000000</color>
@@ -111,12 +108,11 @@
 
     <color name="widget_background">#c8432874</color>
 
-    <color name="gem_view_background">@color/gray_700</color>
+    <color name="gem_view_background">@color/window_background</color>
     <color name="task_border_gray">#1a000000</color>
     <color name="task_secondary_text">#B2B2B2</color>
     <color name="gem_icon_color">#24cc8f</color>
     <color name="subscription_description_text">#b1000000</color>
-    <color name="pill_gray">#efefef</color>
     <color name="white_95_alpha">#f2ffffff</color>
     <color name="white_80_alpha">#ccffffff</color>
     <color name="white_75_alpha">#bfffffff</color>
@@ -145,8 +141,7 @@
     <color name="hair_black">#313131</color>
     <color name="reward_buy_button_bg">#4cfedead</color>
     <color name="ic_launcher_background">#331960</color>
-    <color name="scrollbarThumb">@color/gray_500</color>
-    <color name="black">#000</color>
+    <color name="scrollbarThumb">@color/content_background_offset</color>
     <color name="setup_background">#efeff4</color>
     <color name="setup_label_background">#fafaff</color>
     <color name="animalitem_all_eggs">#6ECDB2</color>
@@ -157,4 +152,44 @@
     <color name="green_1">#005737</color>
     <color name="yellow_1">#794b00</color>
     <color name="orange_1">#7f3300</color>
+
+
+
+
+    <color name="color_accent">@color/brand_400</color>
+
+    <color name="text_primary">@color/gray_50</color>
+    <color name="text_secondary">@color/gray_100</color>
+    <color name="text_ternary">@color/gray_200</color>
+    <color name="text_quad">@color/gray_300</color>
+    <color name="text_dimmed">@color/gray_400</color>
+    <color name="text_brand">@color/brand_300</color>
+    <color name="text_brand_neon">@color/brand_400</color>
+    <color name="text_red">@color/red_10</color>
+    <color name="text_orange">@color/orange_10</color>
+    <color name="text_yellow">@color/yellow_10</color>
+    <color name="text_green">@color/green_10</color>
+    <color name="text_blue">@color/blue_10</color>
+    <color name="text_teal">@color/teal_10</color>
+
+    <color name="content_background">@color/white</color>
+    <color name="window_background">@color/gray_700</color>
+    <color name="offset_background">@color/gray_600</color>
+    <color name="offset_background_30">#4cedecee</color>
+    <color name="content_background_offset">@color/gray_500</color>
+    <color name="brand_background">@color/brand_300</color>
+    <color name="brand_background_dark">@color/brand_200</color>
+    <color name="dimmed_background">@color/gray_300</color>
+    <color name="disabled_background">@color/gray_400</color>
+    <color name="separator">@color/gray_400</color>
+    <color name="system_bars">@color/brand_50</color>
+    <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="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>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 42bc04bfd..7c7679474 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1103,4 +1103,7 @@
     <string name="spooky_promo_info_instructions">Between October 29th and November 2nd, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="spooky_promo_info_limitations">This promotion only applies during the limited time event. This event starts on October 29th at 8:00 AM EDT (12:00 UTC) and will end November 2nd at 8:00 PM EDT (00:00 UTC). The promo offer is only available when buying Gems for yourself.</string>
     <string name="spooky_promo_info_prompt">The Gem Sale is back to haunt the very end of this year’s Fall Gala! This is one last chance to get more Gems than ever, so stock up while it lasts!</string>
+    <string name="dark_mode">Dark Mode</string>
+    <string name="theme_mode">Theme Mode</string>
+    <string name="theme_color">Theme Color</string>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 2b8edcef5..456cfdc39 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle</item>
 
         <item name="android:elevation" tools:targetApi="21">0dp</item>
@@ -18,7 +18,7 @@
         <!-- ...and here we setting appcompat’s color theming attrs -->
         <item name="colorPrimary">@color/brand</item>
         <item name="colorPrimaryDark">@color/brand_50</item>
-        <item name="colorAccent">@color/brand_400</item>
+        <item name="colorAccent">@color/color_accent</item>
         <item name="android:colorPrimary">@color/brand</item>
         <item name="android:colorPrimaryDark">@color/brand_50</item>
         <item name="android:colorAccent">@color/brand_400</item>
@@ -27,14 +27,16 @@
         <item name="colorBadgeBackground">@color/brand_400</item>
         <item name="taskFormTint">@color/brand_300</item>
 
-        <item name="textColorPrimary">@color/gray_50</item>
-        <item name="textColorSecondary">@color/gray_200</item>
+        <item name="textColorPrimary">@color/text_primary</item>
+        <item name="textColorSecondary">@color/text_secondary</item>
         <item name="textColorPrimaryDark">#D5C8FF</item>
         <item name="textColorSecondaryDark">@color/brand_500</item>
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_ternary</item>
         <item name="barColor">@color/brand_100</item>
 
-        <item name="colorContentBackground">@color/white</item>
-        <item name="colorWindowBackground">@color/gray_700</item>
+        <item name="colorContentBackground">@color/content_background</item>
+        <item name="colorWindowBackground">@color/window_background</item>
 
         <item name="popupMenuStyle">@style/PopupTheme</item>
         <item name="actionOverflowMenuStyle">@style/PopupTheme</item>
@@ -44,20 +46,27 @@
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="android:windowTranslucentStatus">false</item>
 
-        <item name="android:statusBarColor">@color/brand_50</item>
-        <item name="android:navigationBarColor">@color/brand_50</item>
+        <item name="android:statusBarColor">@color/system_bars</item>
+        <item name="android:navigationBarColor">@color/system_bars</item>
 
         <item name="searchViewStyle">@style/SearchViewStyle</item>
         <item name="toolbarContentColor">@color/white</item>
         <item name="colorPrimaryText">@color/brand_50</item>
-        <item name="headerBackgroundColor">@color/white</item>
-        <item name="headerOffsetColor">@color/gray_700</item>
-        <item name="headerTextColor">@color/gray_10</item>
+        <item name="headerBackgroundColor">@color/content_background</item>
+        <item name="headerOffsetColor">@color/window_background</item>
+        <item name="headerTextColor">@color/text_primary</item>
     </style>
 
     <style name="MainAppTheme" parent="AppTheme">
     </style>
 
+    <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="colorPrimaryText">@color/brand_500</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+    </style>
 
     <style name="MainAppTheme.Red">
         <item name="colorPrimary">@color/red_10</item>
@@ -78,6 +87,12 @@
         <item name="colorPrimaryText">@color/red_1</item>
     </style>
 
+    <style name="MainAppTheme.Red.Dark">
+        <item name="barColor">@color/gray_10</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="colorPrimaryText">@color/red_500</item>
+    </style>
+
     <style name="MainAppTheme.Maroon">
         <item name="colorPrimary">@color/red_10</item>
         <item name="colorPrimaryDark">@color/maroon_5</item>
@@ -96,6 +111,12 @@
         <item name="colorPrimaryText">@color/maroon_1</item>
     </style>
 
+    <style name="MainAppTheme.Maroon.Dark">
+        <item name="barColor">@color/gray_10</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="colorPrimaryText">@color/maroon_500</item>
+    </style>
+
     <style name="MainAppTheme.Orange">
         <item name="colorPrimary">@color/orange_50</item>
         <item name="colorPrimaryDark">@color/orange_10</item>
@@ -115,6 +136,12 @@
         <item name="colorPrimaryText">@color/orange_1</item>
     </style>
 
+    <style name="MainAppTheme.Orange.Dark">
+        <item name="barColor">@color/gray_10</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="colorPrimaryText">@color/orange_500</item>
+    </style>
+
     <style name="MainAppTheme.Yellow">
         <item name="colorPrimary">@color/yellow_50</item>
         <item name="colorPrimaryDark">@color/yellow_10</item>
@@ -134,6 +161,12 @@
         <item name="colorPrimaryText">@color/yellow_1</item>
     </style>
 
+    <style name="MainAppTheme.Yellow.Dark">
+        <item name="barColor">@color/gray_10</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="colorPrimaryText">@color/yellow_500</item>
+    </style>
+
     <style name="MainAppTheme.Green">
         <item name="colorPrimary">@color/green_10</item>
         <item name="colorPrimaryDark">@color/green_5</item>
@@ -153,6 +186,12 @@
         <item name="colorPrimaryText">@color/green_1</item>
     </style>
 
+    <style name="MainAppTheme.Green.Dark">
+        <item name="barColor">@color/gray_10</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="colorPrimaryText">@color/green_500</item>
+    </style>
+
     <style name="MainAppTheme.Teal">
         <item name="colorPrimary">@color/teal_10</item>
         <item name="colorPrimaryDark">@color/teal_5</item>
@@ -172,6 +211,12 @@
         <item name="colorPrimaryText">@color/teal_1</item>
     </style>
 
+    <style name="MainAppTheme.Teal.Dark">
+        <item name="barColor">@color/gray_10</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="colorPrimaryText">@color/teal_500</item>
+    </style>
+
     <style name="MainAppTheme.Blue">
         <item name="colorPrimary">@color/blue_10</item>
         <item name="colorPrimaryDark">@color/blue_5</item>
@@ -191,6 +236,12 @@
         <item name="colorPrimaryText">@color/blue_1</item>
     </style>
 
+    <style name="MainAppTheme.Blue.Dark">
+        <item name="barColor">@color/gray_10</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="colorPrimaryText">@color/blue_500</item>
+    </style>
+
     <style name="BottomSheetTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowIsTranslucent">false</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -208,7 +259,7 @@
 
 
     <style name="PopupTheme" parent="Widget.AppCompat.Light.PopupMenu">
-        <item name="android:popupBackground">@android:color/white</item>
+        <item name="android:popupBackground">@color/content_background</item>
     </style>
 
     <style name="CardText">
@@ -230,7 +281,7 @@
         <item name="android:padding">@dimen/card_padding_compact</item>
     </style>
 
-    <style name="CardView.Default" parent="CardView.Light">
+    <style name="CardView.Default" parent="CardView">
         <item name="android:layout_margin">@dimen/card_margin</item>
     </style>
 
@@ -302,11 +353,11 @@
         <item name="android:textColor">@color/brand_100</item>
     </style>
 
-    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@color/brand_400</item>
     </style>
 
-    <style name="HabiticaAlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <style name="HabiticaAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@color/brand_400</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
@@ -327,7 +378,7 @@
     <style name="SectionHeaderCaps">
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">10sp</item>
-        <item name="android:textColor">@color/gray_200</item>
+        <item name="android:textColor">@color/text_ternary</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:layout_marginStart">@dimen/spacing_large</item>
         <item name="android:letterSpacing">0.15</item>
@@ -399,15 +450,15 @@
         <item name="android:paddingLeft">@dimen/pill_horizontal_padding</item>
         <item name="android:paddingTop">@dimen/pill_vertical_padding</item>
         <item name="android:paddingBottom">@dimen/pill_vertical_padding</item>
-        <item name="android:textColor">@color/gray_200</item>
+        <item name="android:textColor">@color/text_ternary</item>
     </style>
 
-    <style name="Pill.Gray700">
-        <item name="android:background">@drawable/pill_bg_gray_700</item>
+    <style name="Pill.Window">
+        <item name="android:background">@drawable/pill_bg_window</item>
     </style>
 
-    <style name="Pill.White">
-        <item name="android:background">@drawable/pill_bg_white</item>
+    <style name="Pill.Content">
+        <item name="android:background">@drawable/pill_bg_content</item>
     </style>
     <style name="Pill.Purple">
         <item name="android:textColor">@color/white</item>
@@ -449,7 +500,7 @@
         <item name="android:fontFamily" tools:targetApi="jelly_bean">
             @string/font_family_medium
         </item>
-        <item name="android:textColor">@color/black</item>
+        <item name="android:textColor">@color/text_primary</item>
         <item name="android:layout_marginBottom">4dp</item>
     </style>
 
@@ -458,7 +509,7 @@
         <item name="android:fontFamily" tools:targetApi="jelly_bean">
             @string/font_family_regular
         </item>
-        <item name="android:textColor">@color/gray_50</item>
+        <item name="android:textColor">@color/text_primary</item>
     </style>
 
     <style name="SubscriptionListDescription" parent="GemPurchaseListItemDescription">
@@ -474,13 +525,13 @@
     </style>
 
     <style name="HabiticaButton.Purple" parent="HabiticaButton">
-        <item name="android:background">@drawable/rounded_purple_square</item>
+        <item name="android:backgroundTint">@color/color_accent</item>
         <item name="android:textColor">@color/white</item>
     </style>
 
-    <style name="HabiticaButton.White" parent="HabiticaButton">
-        <item name="android:background">@drawable/layout_rounded_bg_white</item>
-        <item name="android:textColor">@color/black</item>
+    <style name="HabiticaButton.Content" parent="HabiticaButton">
+        <item name="android:backgroundTint">@color/content_background</item>
+        <item name="android:textColor">@color/text_primary</item>
     </style>
 
     <style name="HabiticaButton.Purple.Small" parent="HabiticaButton.Purple">
@@ -542,14 +593,13 @@
         <item name="android:orientation">vertical</item>
     </style>
 
-    <style name="HabiticaButton" parent="@style/Widget.AppCompat.Button">
+    <style name="HabiticaButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">16sp</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>
-        <item name="android:shadowColor">@color/gray_400</item>
-        <item name="android:layout_height">@dimen/button_height</item>
+        <item name="android:shadowColor">@color/disabled_background</item>
         <item name="android:paddingStart">@dimen/spacing_large</item>
         <item name="android:paddingEnd">@dimen/spacing_large</item>
         <item name="android:elevation">0dp</item>
@@ -563,14 +613,13 @@
         <item name="android:minHeight">@dimen/button_height</item>
         <item name="android:shadowColor">@color/transparent</item>
         <item name="android:textColor">@color/white</item>
-        <item name="android:layout_height">@dimen/button_height</item>
         <item name="android:paddingStart">@dimen/spacing_large</item>
         <item name="android:paddingEnd">@dimen/spacing_large</item>
         <item name="android:minWidth">147dp</item>
     </style>
 
     <style name="HabiticaButton.Primary" parent="HabiticaButton">
-        <item name="android:background">@drawable/button_background_primary</item>
+        <item name="android:backgroundTint">@color/color_accent</item>
         <item name="android:text">?textColorPrimaryDark</item>
     </style>
 
@@ -583,25 +632,25 @@
     </style>
 
     <style name="HabiticaButton.Gray" parent="HabiticaButton">
-        <item name="android:background">@drawable/layout_rounded_bg_gray_700</item>
-        <item name="android:textColor">@color/brand_400</item>
+        <item name="android:backgroundTint">@color/window_background</item>
+        <item name="android:textColor">@color/text_brand_neon</item>
     </style>
 
-    <style name="HabiticaButton.Gray.600" parent="HabiticaButton">
-        <item name="android:background">@drawable/layout_rounded_bg_gray_600</item>
+    <style name="HabiticaButton.Offset" parent="HabiticaButton">
+        <item name="android:backgroundTint">@color/offset_background</item>
         <item name="android:textColor">@color/brand_400</item>
     </style>
 
     <style name="HabiticaButton.Red" parent="HabiticaButton">
-        <item name="android:background">@drawable/layout_rounded_bg_red</item>
+        <item name="android:backgroundTint">@color/red_100</item>
     </style>
 
     <style name="HabiticaButton.Blue" parent="HabiticaButton">
-        <item name="android:background">@drawable/layout_rounded_bg_blue</item>
+        <item name="android:backgroundTint">@color/blue_100</item>
     </style>
 
     <style name="HabiticaButton.Red.Small" parent="HabiticaButton.Small">
-        <item name="android:background">@drawable/layout_rounded_bg_red</item>
+        <item name="android:backgroundTint">@color/red_100</item>
     </style>
 
     <style name="SegmentTitle" parent="Headline">
@@ -609,15 +658,15 @@
     </style>
 
     <style name="HabiticaButton.Green" parent="HabiticaButton">
-        <item name="android:background">@drawable/layout_rounded_bg_green</item>
+        <item name="android:backgroundTint">@color/green_100</item>
     </style>
 
     <style name="HabiticaButton.Green.Small" parent="HabiticaButton.Small">
-        <item name="android:background">@drawable/layout_rounded_bg_green</item>
+        <item name="android:backgroundTint">@color/green_100</item>
     </style>
 
     <style name="HabiticaButton.Yellow" parent="HabiticaButton">
-        <item name="android:background">@drawable/layout_rounded_bg_yellow</item>
+        <item name="android:backgroundTint">@color/yellow_100</item>
     </style>
 
     <style name="CurrencyTextView">
@@ -668,7 +717,7 @@
     <style name="TextInputLayoutAppearanceTheme">
         <item name="boxBackgroundColor">@color/taskform_gray</item>
         <item name="android:textColor">?attr/colorPrimaryText</item>
-        <item name="android:textColorHint">@color/gray_300</item>
+        <item name="android:textColorHint">@color/text_quad</item>
         <item name="android:colorControlNormal">?attr/colorPrimary</item>
         <item name="android:colorControlActivated">?attr/colorPrimary</item>
         <item name="android:colorControlHighlight">?attr/colorPrimary</item>
@@ -678,19 +727,19 @@
     <style name="TextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
         <item name="boxBackgroundColor">@color/taskform_gray</item>
         <item name="android:textColor">@color/textColorLight</item>
-        <item name="android:textColorHint">@color/gray_300</item>
+        <item name="android:textColorHint">@color/text_quad</item>
     </style>
 
     <style name="TaskFormSectionheader">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/gray_10</item>
+        <item name="android:textColor">@color/text_primary</item>
         <item name="android:layout_marginTop">@dimen/spacing_large</item>
         <item name="android:layout_marginBottom">@dimen/spacing_medium</item>
         <item name="android:accessibilityHeading">true</item>
     </style>
 
     <style name="TaskFormToggle">
-        <item name="android:background">@drawable/layout_rounded_bg_white</item>
+        <item name="android:background">@drawable/layout_rounded_bg_content</item>
         <item name="android:gravity">center</item>
         <item name="android:paddingTop">@dimen/spacing_small</item>
         <item name="android:paddingBottom">@dimen/spacing_small</item>
@@ -707,14 +756,14 @@
         <item name="android:gravity">center</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:background">@drawable/layout_rounded_bg_gray_700</item>
+        <item name="android:background">@drawable/layout_rounded_bg_window</item>
         <item name="android:paddingStart">@dimen/spacing_medium</item>
         <item name="android:paddingEnd">@dimen/spacing_medium</item>
     </style>
 
     <style name="ToolbarDarkBackArrow" parent="Base.Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorControlNormal">@color/gray_50</item>
-        <item name="android:actionMenuTextColor">@color/gray_50</item>
+        <item name="colorControlNormal">@color/text_primary</item>
+        <item name="android:actionMenuTextColor">@color/text_primary</item>
     </style>
 
     <style name="ReportMessageToolbar">
@@ -729,7 +778,7 @@
     <color name="taskform_gray">#99edecee</color>
 
     <style name="PreferenceThemeOverlay.v14" tools:override="true">
-        <item name="android:background">@color/white</item>
+        <item name="android:background">@color/content_background</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index 3eec99b73..0015fc935 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -151,6 +151,18 @@
         <item>blue</item>
     </string-array>
 
+    <string-array name="AppThemeModes">
+        <item>Follow System</item>
+        <item>Always Light</item>
+        <item>Always Dark</item>
+    </string-array>
+
+    <string-array name="AppThemeModeValues">
+        <item>system</item>
+        <item>light</item>
+        <item>dark</item>
+    </string-array>
+
     <string-array name="server_urls">
         <item>https://habitica.com</item>
         <item>https://habitrpg-staging.herokuapp.com</item>
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index a41d1e925..026816a5d 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -150,11 +150,16 @@
             android:entryValues="@array/AudioValues"
             android:summary="@string/AudioTheme_summary"
             android:layout="@layout/preference_child_summary"/>
-        <ListPreference android:title="@string/app_theme"
+        <ListPreference android:title="@string/theme_color"
             android:key="theme_name"
             android:entries="@array/AppThemes"
             android:entryValues="@array/AppThemeValues"
             android:layout="@layout/preference_child_summary"/>
+        <ListPreference android:title="@string/theme_mode"
+            android:key="theme_mode"
+            android:entries="@array/AppThemeModes"
+            android:entryValues="@array/AppThemeModeValues"
+            android:layout="@layout/preference_child_summary" />
         <CheckBoxPreference android:title="@string/dailyDueDefaultView"
             android:key="dailyDueDefaultView"
             android:summary="@string/dailyDueDefaultViewDescription"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index 95e9c36b9..169f7f0d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -196,7 +196,7 @@ abstract class HabiticaBaseApplication : MultiDexApplication() {
                 .setMinimumFetchIntervalInSeconds(if (BuildConfig.DEBUG) 0 else 3600)
                 .build()
         remoteConfig.setConfigSettingsAsync(configSettings)
-        remoteConfig.setDefaults(R.xml.remote_config_defaults)
+        remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
         remoteConfig.fetchAndActivate()
     }
 
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 eecab8eb6..fdad191f0 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
@@ -12,7 +12,6 @@ import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
 import com.habitrpg.android.habitica.receivers.NotificationPublisher;
 import com.habitrpg.android.habitica.receivers.TaskAlarmBootReceiver;
 import com.habitrpg.android.habitica.receivers.TaskReceiver;
-import com.habitrpg.android.habitica.ui.activities.AboutActivity;
 import com.habitrpg.android.habitica.ui.activities.AdventureGuideActivity;
 import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
@@ -77,7 +76,6 @@ import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment;
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.ChatFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment;
@@ -125,8 +123,6 @@ import dagger.Subcomponent;
 public interface UserComponent {
     void inject(ClassSelectionActivity classSelectionActivity);
 
-    void inject(AboutActivity aboutActivity);
-
     void inject(GroupFormActivity groupFormActivity);
 
     void inject(IntroActivity introActivity);
@@ -187,8 +183,6 @@ public interface UserComponent {
 
     void inject(PartyInviteFragment partyInviteFragment);
 
-    void inject(ChatListFragment chatListFragment);
-
     void inject(NoPartyFragmentFragment noPartyFragmentFragment);
 
     void inject(GuildFragment guildFragment);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index 8a7b78a26..f91d954b2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -243,7 +243,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
             val tasksObservable = this.tasks
 
             userObservable = Flowable.zip(userObservable, tasksObservable,
-                    BiFunction { habitRPGUser, tasks ->
+                    { habitRPGUser, tasks ->
                         habitRPGUser.tasks = tasks
                         habitRPGUser
                     })
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 74569cb9b..061e1cba1 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
@@ -119,9 +119,9 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
                 .flatMap { item -> sellItem(user, item) }
     }
 
-    override fun sellItem(user: User?, ownedItem: OwnedItem): Flowable<User> {
-        return localRepository.getItem(ownedItem.itemType ?: "", ownedItem.key ?: "")
-                .flatMap { item -> sellItem(user, item, ownedItem) }
+    override fun sellItem(user: User?, item: OwnedItem): Flowable<User> {
+        return localRepository.getItem(item.itemType ?: "", item.key ?: "")
+                .flatMap { newItem -> sellItem(user, newItem, item) }
     }
 
     override fun getLatestMysteryItem(): Flowable<Equipment> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index 15df600e5..4077fe492 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -71,7 +71,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
     }
 
     override fun markMessagesSeen(seenGroupId: String) {
-        apiClient.seenMessages(seenGroupId).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+        apiClient.seenMessages(seenGroupId).subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     override fun flagMessage(chatMessage: ChatMessage, additionalInfo: String): Flowable<Void> {
@@ -130,7 +130,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
     override fun retrieveGroup(id: String): Flowable<Group> {
         return Flowable.zip(apiClient.getGroup(id).doOnNext { localRepository.saveSyncronous(it) }, retrieveGroupChat(id)
                 .toFlowable(),
-                BiFunction<Group, List<ChatMessage>, Group> { group, _ ->
+                { group, _ ->
                     group
                 }
         )
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt
index 3cbe73bc0..b2981fa00 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt
@@ -44,7 +44,7 @@ class TagRepositoryImpl(localRepository: TagLocalRepository, apiClient: ApiClien
 
     override fun createTags(tags: Collection<Tag>): Single<List<Tag>> {
         return Flowable.defer { Flowable.fromIterable(tags) }
-                .filter { tag -> tag.name != null && !tag.name.isEmpty() }
+                .filter { tag -> tag.name.isNotEmpty() }
                 .flatMap { this.createTag(it) }
                 .toList()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index b5663043c..c7dab7ad7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -277,11 +277,11 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
             getTask(taskid).map { localRepository.getUnmanagedCopy(it) }
 
     override fun updateTaskInBackground(task: Task) {
-        updateTask(task).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+        updateTask(task).subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     override fun createTaskInBackground(task: Task) {
-        createTask(task).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+        createTask(task).subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     override fun getTaskCopies(userId: String): Flowable<List<Task>> =
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 0eec59177..31bad18bf 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
@@ -92,7 +92,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
                     updateData
                 }
                 .flatMap { updateData -> updateUser(user, updateData).firstElement() }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     override fun sleep(user: User): Flowable<User> {
@@ -284,7 +284,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         }
         observable.flatMap { apiClient.runCron().firstElement() }
                 .flatMap { this.retrieveUser(withTasks = true, forced = true).firstElement() }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     override fun useCustomization(user: User?, type: String, category: String?, identifier: String): Flowable<User> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index 47efab428..0c91f03fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -202,7 +202,7 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
     }
 
     override fun changeOwnedCount(type: String, key: String, userID: String, amountToAdd: Int) {
-        getOwnedItem(userID, type, key, true).firstElement().subscribe( Consumer { changeOwnedCount(it, amountToAdd)}, RxErrorHandler.handleEmptyError())
+        getOwnedItem(userID, type, key, true).firstElement().subscribe({ changeOwnedCount(it, amountToAdd)}, RxErrorHandler.handleEmptyError())
     }
 
     override fun changeOwnedCount(item: OwnedItem, amountToAdd: Int?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
index daf4a57b9..865d001d0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
@@ -254,20 +254,20 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         return party != null && party.isValid
     }
 
-    override fun getInboxMessages(userID: String, replyToUserID: String?): Flowable<RealmResults<ChatMessage>> {
+    override fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<RealmResults<ChatMessage>> {
         return realm.where(ChatMessage::class.java)
                 .equalTo("isInboxMessage", true)
                 .equalTo("uuid", replyToUserID)
-                .equalTo("userID", userID)
+                .equalTo("userID", userId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
     }
 
-    override fun getInboxConversation(userID: String): Flowable<RealmResults<InboxConversation>> {
+    override fun getInboxConversation(userId: String): Flowable<RealmResults<InboxConversation>> {
         return realm.where(InboxConversation::class.java)
-                .equalTo("userID", userID)
+                .equalTo("userID", userId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Context-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Context-Extensions.kt
index 57f3d35af..34ca9eb48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Context-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Context-Extensions.kt
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.extensions
 
 import android.app.Service
 import android.content.Context
+import android.content.res.Configuration
 import android.util.TypedValue
 import android.view.LayoutInflater
 
@@ -13,4 +14,14 @@ fun Context.getThemeColor(colorRes: Int): Int {
     val value = TypedValue()
     theme.resolveAttribute(colorRes, value, true)
     return value.data
+}
+
+fun Context.isUsingNightModeResources(): Boolean {
+    return when (resources.configuration.uiMode and
+            Configuration.UI_MODE_NIGHT_MASK) {
+        Configuration.UI_MODE_NIGHT_YES -> true
+        Configuration.UI_MODE_NIGHT_NO -> false
+        Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+        else -> false
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
index 7b52165cf..80ab2d1c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
@@ -100,10 +100,6 @@ class AppConfigManager {
         }
     }
 
-    fun reorderMenu(): Boolean {
-        return remoteConfig.getBoolean("reorderMenu")
-    }
-
     fun enableAdventureGuide(): Boolean {
         return remoteConfig.getBoolean("enableAdventureGuide")
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
index fb06fd50f..53da0b252 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
@@ -116,7 +116,7 @@ class NotificationsManager (private val context: Context) {
             EventBus.getDefault().post(event)
             if (apiClient != null) {
                 apiClient?.readNotification(notification.id)
-                        ?.subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+                        ?.subscribe({}, RxErrorHandler.handleEmptyError())
             }
         }
         return true
@@ -131,7 +131,7 @@ class NotificationsManager (private val context: Context) {
         }
         val sub = Completable.complete()
                 .delay(delay, TimeUnit.MILLISECONDS)
-                .subscribe(Action {
+                .subscribe({
                     EventBus.getDefault().post(ShowAchievementDialog(achievement, notification.id, isLastOnboardingAchievement))
                 }, RxErrorHandler.handleEmptyError())
         logOnboardingEvents(achievement)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
index 25834344d..8205c2e76 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
@@ -48,7 +48,7 @@ class SoundManager {
             val soundFiles = ArrayList<SoundFile>()
 
             soundFiles.add(SoundFile(soundTheme, type))
-            soundFileLoader.download(soundFiles).observeOn(Schedulers.newThread()).subscribe(Consumer {
+            soundFileLoader.download(soundFiles).observeOn(Schedulers.newThread()).subscribe({
                 val file = soundFiles[0]
                 loadedSoundFiles[type] = file
                 file.play()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
index 4f4094b80..4fbb73e15 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
@@ -49,7 +49,7 @@ class TaskAlarmManager(private var context: Context, private var taskRepository:
         taskRepository.getTaskCopy(taskId)
                 .filter { task -> task.isValid && task.isManaged && Task.TYPE_DAILY == task.type }
                 .firstElement()
-                .subscribe(Consumer { this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError())
+                .subscribe({ this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError())
     }
 
     fun scheduleAllSavedAlarms(preventDailyReminder: Boolean) {
@@ -57,7 +57,7 @@ class TaskAlarmManager(private var context: Context, private var taskRepository:
                 .firstElement()
                 .toFlowable()
                 .flatMap<Task> { Flowable.fromIterable(it) }
-                .subscribe(Consumer { this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError())
+                .subscribe({ this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError())
 
         if (!preventDailyReminder) {
             scheduleDailyReminder(context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
index 7354b0dc2..0c6e910c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
@@ -43,14 +43,14 @@ class PushNotificationManager(var apiClient: ApiClient, private val sharedPrefer
         val pushDeviceData = HashMap<String, String>()
         pushDeviceData["regId"] = this.refreshedToken
         pushDeviceData["type"] = "android"
-        apiClient.addPushDevice(pushDeviceData).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+        apiClient.addPushDevice(pushDeviceData).subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     fun removePushDeviceUsingStoredToken() {
         if (this.refreshedToken.isEmpty()) {
             return
         }
-        apiClient.deletePushDevice(this.refreshedToken).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+        apiClient.deletePushDevice(this.refreshedToken).subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     private fun userHasPushDevice(): Boolean {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
index ebe88862a..f1a19186c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
@@ -64,7 +64,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 event.sharedMessage = requestValues.activity.getString(R.string.share_levelup, requestValues.newLevel)
                 val avatarView = AvatarView(requestValues.activity, showBackground = true, showMount = true, showPet = true)
                 avatarView.setAvatar(requestValues.user)
-                avatarView.onAvatarImageReady(Consumer { t -> event.shareImage = t })
+                avatarView.onAvatarImageReady({ t -> event.shareImage = t })
 
                 val alert = HabiticaAlertDialog(requestValues.activity)
                 alert.setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
@@ -87,7 +87,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
 
     private fun showClassSelection(requestValues: RequestValues) {
         checkClassSelectionUseCase.observable(CheckClassSelectionUseCase.RequestValues(requestValues.user, true, null, requestValues.activity))
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     class RequestValues(val user: User, val activity: AppCompatActivity) : UseCase.RequestValues {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index 9d33367c6..6921ff821 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -199,7 +199,7 @@ open class Task : RealmObject, Parcelable {
             return this.parsedText ?: ""
         }
 
-        MarkdownParser.parseMarkdownAsync(this.text, Consumer { parsedText ->
+        MarkdownParser.parseMarkdownAsync(this.text, { parsedText ->
             this.parsedText = parsedText
             callback(parsedText)
         })
@@ -213,7 +213,7 @@ open class Task : RealmObject, Parcelable {
         }
 
         if (notes?.isNotEmpty() == true) {
-            MarkdownParser.parseMarkdownAsync(notes, Consumer { parsedText ->
+            MarkdownParser.parseMarkdownAsync(notes, { parsedText ->
                 parsedNotes = parsedText
                 callback(parsedText)
             })
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
index 1eb1589a5..576e729f2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
@@ -70,8 +70,7 @@ public class ContributorInfo extends RealmObject {
     }
 
     public int getContributorColor() {
-        int rColor = android.R.color.black;
-
+        int rColor = R.color.text_primary;
 
         if (CONTRIBUTOR_COLOR_DICT.get(this.level, -1) > 0) {
             rColor = CONTRIBUTOR_COLOR_DICT.get(this.level);
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 2fd86f3dc..e5d09d4d1 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
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.models.user
 
 import com.google.gson.annotations.SerializedName
+import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.*
 import com.habitrpg.android.habitica.models.invitations.Invitations
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
@@ -53,7 +54,7 @@ open class User : RealmObject(), Avatar, VersionedObject {
             for (test in abTests ?: emptyList<ABTest>()) {
                 test.userID = id
             }
-            for (achievement in achievements ?: emptyList<UserAchievement>()) {
+            for (achievement in achievements) {
                 achievement.userId = id
             }
         }
@@ -167,7 +168,7 @@ open class User : RealmObject(), Avatar, VersionedObject {
         get() = this.items?.mounts?.size ?: 0
 
     val contributorColor: Int
-        get() = this.contributor?.contributorColor ?: android.R.color.black
+        get() = this.contributor?.contributorColor ?: R.color.text_primary
     val username: String?
     get() = authentication?.localAuthentication?.username
     val formattedUsername: String?
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
index de9d5b28c..d742c6925 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
@@ -48,34 +48,34 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
         when (action) {
             context?.getString(R.string.accept_party_invite) -> {
                 groupID?.let {
-                    socialRepository.joinGroup(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    socialRepository.joinGroup(it).subscribe({ }, RxErrorHandler.handleEmptyError())
                 }
             }
             context?.getString(R.string.reject_party_invite) -> {
                 groupID?.let {
-                    socialRepository.rejectGroupInvite(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    socialRepository.rejectGroupInvite(it).subscribe({ }, RxErrorHandler.handleEmptyError())
                 }
             }
             context?.getString(R.string.accept_quest_invite) -> {
-                socialRepository.acceptQuest(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                socialRepository.acceptQuest(user).subscribe({ }, RxErrorHandler.handleEmptyError())
             }
             context?.getString(R.string.reject_quest_invite) -> {
-                socialRepository.rejectQuest(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                socialRepository.rejectQuest(user).subscribe({ }, RxErrorHandler.handleEmptyError())
             }
             context?.getString(R.string.accept_guild_invite) -> {
                 groupID?.let {
-                    socialRepository.joinGroup(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    socialRepository.joinGroup(it).subscribe({ }, RxErrorHandler.handleEmptyError())
                 }
             }
             context?.getString(R.string.reject_guild_invite) -> {
                 groupID?.let {
-                    socialRepository.rejectGroupInvite(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    socialRepository.rejectGroupInvite(it).subscribe({ }, RxErrorHandler.handleEmptyError())
                 }
             }
             context?.getString(R.string.group_message_reply) -> {
                 groupID?.let {
                     getMessageText(context?.getString(R.string.group_message_reply))?.let { message ->
-                        socialRepository.postGroupChat(it, message).subscribe(Consumer {
+                        socialRepository.postGroupChat(it, message).subscribe({
                             context?.let { c -> NotificationManagerCompat.from(c).cancel(it.hashCode()) }
                         }, RxErrorHandler.handleEmptyError())
                     }
@@ -84,14 +84,14 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
             context?.getString(R.string.inbox_message_reply) -> {
                 senderID?.let {
                     getMessageText(context?.getString(R.string.inbox_message_reply))?.let { message ->
-                        socialRepository.postPrivateMessage(it, message).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                        socialRepository.postPrivateMessage(it, message).subscribe({ }, RxErrorHandler.handleEmptyError())
                     }
                 }
             }
             context?.getString(R.string.complete_task_action) -> {
                 intent?.extras?.getString("taskID")?.let {
                     taskRepository.taskChecked(null, it, up = true, force = false) { _ ->
-                    }.subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+                    }.subscribe({}, RxErrorHandler.handleEmptyError())
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
index 0ddeb1960..1e2299fbb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
@@ -65,7 +65,7 @@ class NotificationPublisher : BroadcastReceiver() {
         if (checkDailies) {
             taskRepository.getTasks(Task.TYPE_DAILY).firstElement().zipWith(userRepository.getUser().firstElement(), BiFunction<RealmResults<Task>, User, Pair<RealmResults<Task>, User>> { tasks, user ->
                 return@BiFunction Pair(tasks, user)
-            }).subscribe(Consumer { pair ->
+            }).subscribe({ pair ->
                 var showNotifications = false
                 for (task in pair.first) {
                     if (task?.checkIfDue() == true) {
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 396edfe86..fd64539a1 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
@@ -15,6 +15,7 @@ import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder
 import com.facebook.drawee.view.DraweeHolder
 import com.facebook.drawee.view.MultiDraweeHolder
 import com.facebook.imagepipeline.image.ImageInfo
+import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.Avatar
@@ -42,7 +43,6 @@ class AvatarView : View {
     private var avatarBitmap: Bitmap? = null
     private var avatarCanvas: Canvas? = null
     private var currentLayers: Map<LayerType, String>? = null
-    var enableNewSnowman = false
 
     private val layerMap: Map<LayerType, String>
         get() {
@@ -56,8 +56,9 @@ class AvatarView : View {
 
     private val avatarImage: Bitmap?
         get() {
-            assert(avatar != null)
-            assert(avatarRectF != null)
+            if (BuildConfig.DEBUG && (avatar == null || avatarRectF == null)) {
+                error("Assertion failed")
+            }
             val canvasRect = Rect()
             avatarRectF?.round(canvasRect)
             avatarBitmap = Bitmap.createBitmap(canvasRect.width(), canvasRect.height(), Bitmap.Config.ARGB_8888)
@@ -189,7 +190,7 @@ class AvatarView : View {
     }
 
     private fun substituteOrReturn(substitutions: Map<String, String>?, name: String): String {
-        for (key in substitutions?.keys ?: arrayListOf<String>()) {
+        for (key in substitutions?.keys ?: arrayListOf()) {
             if (name.contains(key)) {
                 return substitutions?.get(key) ?: name
             }
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 8186be945..de639d11b 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
@@ -18,7 +18,6 @@ import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.ValueBar
 import io.reactivex.disposables.Disposable
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
@@ -126,16 +125,6 @@ class AvatarWithBarsViewModel(private val context: Context, private val binding:
     }
 
     companion object {
-        fun setHpBarData(valueBar: ValueBar, stats: Stats) {
-            var maxHP = stats.maxHealth
-            if (maxHP == null || maxHP == 0) {
-                maxHP = 50
-            }
-
-            val hp = stats.hp?.let { HealthFormatter.format(it) } ?: 0.0
-            valueBar.set(hp, maxHP.toDouble())
-        }
-
         private fun setUserLevel(context: Context, textView: TextView, level: Int?) {
             textView.text = context.getString(R.string.user_level, level)
             textView.contentDescription = context.getString(R.string.level_unabbreviated, level)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt
deleted file mode 100644
index 6db1df3c6..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
-import androidx.viewpager.widget.ViewPager
-import com.google.android.material.tabs.TabLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.ui.fragments.AboutFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.mikepenz.aboutlibraries.Libs
-import com.mikepenz.aboutlibraries.LibsBuilder
-
-class AboutActivity : BaseActivity() {
-
-    private val pager: ViewPager by bindView(R.id.pager)
-    private val tabLayout: TabLayout by bindView(R.id.tab_layout)
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_about
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val actionBar = supportActionBar
-        if (actionBar != null) {
-            actionBar.setTitle(R.string.about_title)
-            actionBar.setDisplayHomeAsUpEnabled(true)
-            actionBar.setDisplayShowHomeEnabled(false)
-            actionBar.setDisplayShowTitleEnabled(true)
-            actionBar.setDisplayUseLogoEnabled(false)
-            actionBar.setHomeButtonEnabled(false)
-            actionBar.elevation = 0f
-        }
-
-        tabLayout.tabGravity = TabLayout.GRAVITY_FILL
-
-        val adapter = PagerAdapter(supportFragmentManager, 2)
-        pager.adapter = adapter
-        pager.addOnPageChangeListener(TabLayout.TabLayoutOnPageChangeListener(tabLayout))
-        pager.offscreenPageLimit = 1
-
-        tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
-            override fun onTabSelected(tab: TabLayout.Tab) {
-                pager.currentItem = tab.position
-            }
-
-            override fun onTabUnselected(tab: TabLayout.Tab) { /* no-on */ }
-
-            override fun onTabReselected(tab: TabLayout.Tab) { /* no-on */ }
-        })
-
-        tabLayout.setupWithViewPager(pager)
-    }
-
-    override fun injectActivity(component: UserComponent?) {
-        component?.inject(this)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        val id = item.itemId
-
-
-        if (id == android.R.id.home) {
-            finish()
-            return true
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private inner class PagerAdapter(fm: FragmentManager, internal var mNumOfTabs: Int) : FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
-
-        override fun getItem(position: Int): Fragment {
-            return when (position) {
-                0 -> AboutFragment()
-                1 -> LibsBuilder()
-                        //Pass the fields of your application to the lib so it can find all external lib information
-                        .withFields(R.string::class.java.fields)
-                        .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
-                        .withAboutAppName(getString(R.string.app_name))
-                        .withAboutDescription("<h2>Used Libraries</h2>")
-                        .withAboutIconShown(true)
-                        .withAboutVersionShown(true)
-                        .withAboutVersionShownCode(true)
-                        .withAboutVersionShownName(true)
-                        .supportFragment()
-                else -> Fragment()
-            }
-        }
-
-        override fun getPageTitle(position: Int): CharSequence? {
-            return when (position) {
-                0 -> getString(R.string.about_title)
-                1 -> getString(R.string.about_libraries)
-                else -> ""
-            }
-        }
-
-        override fun getCount(): Int {
-            return mNumOfTabs
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
index 7553900bc..dfebfd72e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
@@ -85,7 +85,7 @@ class AdventureGuideActivity : BaseActivity() {
 
     override fun onStart() {
         super.onStart()
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribe({
             updateUser(it)
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -118,11 +118,11 @@ class AdventureGuideActivity : BaseActivity() {
             DataBindingUtils.loadImage(itemBinding.iconView, iconName)
             if (achievement.earned) {
                 itemBinding.titleView.paintFlags = itemBinding.titleView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-                itemBinding.titleView.setTextColor(ContextCompat.getColor(this, R.color.gray_200))
-                itemBinding.descriptionView.setTextColor(ContextCompat.getColor(this, R.color.gray_200))
+                itemBinding.titleView.setTextColor(ContextCompat.getColor(this, R.color.text_ternary))
+                itemBinding.descriptionView.setTextColor(ContextCompat.getColor(this, R.color.text_ternary))
             } else {
-                itemBinding.titleView.setTextColor(ContextCompat.getColor(this, R.color.gray_50))
-                itemBinding.descriptionView.setTextColor(ContextCompat.getColor(this, R.color.gray_50))
+                itemBinding.titleView.setTextColor(ContextCompat.getColor(this, R.color.text_primary))
+                itemBinding.descriptionView.setTextColor(ContextCompat.getColor(this, R.color.text_primary))
                 itemBinding.iconView.alpha = 0.5f
             }
         }
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 ae2c6c917..73fd637b8 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
@@ -1,23 +1,16 @@
 package com.habitrpg.android.habitica.ui.activities
 
-import android.app.Activity
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.Configuration
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
 import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.Menu
 import android.view.View
-import android.view.ViewGroup
-import android.view.ViewTreeObserver.OnGlobalLayoutListener
-import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.view.menu.ActionMenuItemView
 import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import com.habitrpg.android.habitica.HabiticaApplication
 import com.habitrpg.android.habitica.HabiticaBaseApplication
@@ -25,6 +18,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.events.ShowConnectionProblemEvent
 import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.LanguageHelper
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
@@ -37,6 +31,7 @@ import java.util.*
 abstract class BaseActivity : AppCompatActivity() {
 
     private var currentTheme: String? = null
+    private var isNightMode: Boolean = false
     internal var forcedTheme: String? = null
     private var destroyed: Boolean = false
 
@@ -66,9 +61,14 @@ abstract class BaseActivity : AppCompatActivity() {
         val configuration = Configuration()
         configuration.setLocale(languageHelper.locale)
         resources.updateConfiguration(configuration, resources.displayMetrics)
+        delegate.localNightMode = when (sharedPreferences.getString("theme_mode", "system")) {
+            "light" -> AppCompatDelegate.MODE_NIGHT_NO
+            "dark" -> AppCompatDelegate.MODE_NIGHT_YES
+            else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        }
+        isNightMode = isUsingNightModeResources()
         loadTheme(sharedPreferences)
 
-        delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_NO
         super.onCreate(savedInstanceState)
         habiticaApplication
         injectActivity(HabiticaBaseApplication.userComponent)
@@ -99,31 +99,45 @@ abstract class BaseActivity : AppCompatActivity() {
         super.onStop()
     }
 
-    private fun loadTheme(sharedPreferences: SharedPreferences) {
-        val theme = if (forcedTheme != null) {
-            forcedTheme
-        } else {
-            sharedPreferences.getString("theme_name", "purple")
-        }
+    private fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean = false) {
+        val theme = forcedTheme ?: sharedPreferences.getString("theme_name", "purple")
         val modernHeaderStyle = overrideModernHeader ?: sharedPreferences.getBoolean("modern_header_style", true)
-        if (theme != currentTheme) {
-            setTheme(when (theme) {
-                "maroon" -> R.style.MainAppTheme_Maroon
-                "red" -> R.style.MainAppTheme_Red
-                "orange" -> R.style.MainAppTheme_Orange
-                "yellow" -> R.style.MainAppTheme_Yellow
-                "green" -> R.style.MainAppTheme_Green
-                "teal" -> R.style.MainAppTheme_Teal
-                "blue" -> R.style.MainAppTheme_Blue
-                else -> R.style.MainAppTheme
-            })
+        if (theme != currentTheme || forced) {
+            if (isNightMode) {
+                setTheme(when (theme) {
+                    "maroon" -> R.style.MainAppTheme_Maroon_Dark
+                    "red" -> R.style.MainAppTheme_Red_Dark
+                    "orange" -> R.style.MainAppTheme_Orange_Dark
+                    "yellow" -> R.style.MainAppTheme_Yellow_Dark
+                    "green" -> R.style.MainAppTheme_Green_Dark
+                    "teal" -> R.style.MainAppTheme_Teal_Dark
+                    "blue" -> R.style.MainAppTheme_Blue_Dark
+                    else -> R.style.MainAppTheme_Dark
+                })
+            } else {
+                setTheme(when (theme) {
+                    "maroon" -> R.style.MainAppTheme_Maroon
+                    "red" -> R.style.MainAppTheme_Red
+                    "orange" -> R.style.MainAppTheme_Orange
+                    "yellow" -> R.style.MainAppTheme_Yellow
+                    "green" -> R.style.MainAppTheme_Green
+                    "teal" -> R.style.MainAppTheme_Teal
+                    "blue" -> R.style.MainAppTheme_Blue
+                    else -> R.style.MainAppTheme
+                })
+            }
         }
-        window.navigationBarColor = getThemeColor(R.attr.colorPrimaryDark)
-        if (modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+
+        if (isNightMode) {
+            window.navigationBarColor = ContextCompat.getColor(this, R.color.system_bars)
+        } else {
+            window.navigationBarColor = getThemeColor(R.attr.colorPrimaryDark)
+        }
+        if (!isNightMode && modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             window.statusBarColor = getThemeColor(R.attr.headerBackgroundColor)
             window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
         } else {
-            window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
+            window.statusBarColor = getThemeColor(R.attr.statusBarBackground)
             window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
         }
 
@@ -161,6 +175,16 @@ abstract class BaseActivity : AppCompatActivity() {
         super.onDestroy()
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val newNightMode = isUsingNightModeResources()
+        if (newNightMode != isNightMode) {
+            isNightMode = newNightMode
+            val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+            loadTheme(sharedPreferences, true)
+        }
+    }
+
     @Subscribe
     open fun onEvent(event: ShowConnectionProblemEvent) {
         val alert = HabiticaAlertDialog(this)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index 985d968fe..ffdcc8934 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -234,7 +234,7 @@ class ChallengeFormActivity : BaseActivity() {
             fillControlsByChallenge()
         }
 
-        compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer { this.user = it }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.getUser(userId).subscribe({ this.user = it }, RxErrorHandler.handleEmptyError()))
         gemIconView.setImageBitmap(HabiticaIconsHelper.imageOfGem())
 
         challengeAddGemBtn.setOnClickListener { onAddGem() }
@@ -332,7 +332,7 @@ class ChallengeFormActivity : BaseActivity() {
                     }
                     socialRepository.retrieveGroup(it)
                 })
-                .subscribe(Consumer { groups ->
+                .subscribe({ groups ->
             val mutableGroups = groups.first.toMutableList()
             if (groups.first.firstOrNull { it.id == "00000000-0000-4000-A000-000000000000" } == null) {
                 val tavern = Group()
@@ -374,7 +374,7 @@ class ChallengeFormActivity : BaseActivity() {
         addReward?.let { taskList.add(it) }
 
         challengeTasks.setTasks(taskList)
-        compositeSubscription.add(challengeTasks.addItemObservable().subscribe(Consumer { t ->
+        compositeSubscription.add(challengeTasks.addItemObservable().subscribe({ t ->
             when (t) {
                 addHabit -> openNewTaskActivity(Task.TYPE_HABIT, null)
                 addDaily -> openNewTaskActivity(Task.TYPE_DAILY, null)
@@ -395,7 +395,7 @@ class ChallengeFormActivity : BaseActivity() {
 
     private fun fillControlsByChallenge() {
         challengeId?.let {
-            challengeRepository.getChallenge(it).subscribe(Consumer { challenge ->
+            challengeRepository.getChallenge(it).subscribe({ challenge ->
                 groupID = challenge.groupId
                 editMode = true
                 createChallengeTitle.setText(challenge.name)
@@ -414,7 +414,7 @@ class ChallengeFormActivity : BaseActivity() {
                 }
                 checkPrizeAndMinimumForTavern()
             }, RxErrorHandler.handleEmptyError())
-            challengeRepository.getChallengeTasks(it).subscribe(Consumer { tasks ->
+            challengeRepository.getChallengeTasks(it).subscribe({ tasks ->
                 tasks.forEach { task ->
                     addOrUpdateTaskInList(task, true)
                 }
@@ -498,7 +498,7 @@ class ChallengeFormActivity : BaseActivity() {
         return editText.text.toString()
     }
 
-    private inner class GroupArrayAdapter internal constructor(context: Context) : ArrayAdapter<Group>(context, android.R.layout.simple_spinner_item) {
+    private inner class GroupArrayAdapter(context: Context) : ArrayAdapter<Group>(context, android.R.layout.simple_spinner_item) {
 
         override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
             val checkedTextView = super.getView(position, convertView, parent) as? AppCompatTextView
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index 1ea1ea435..a814fdba5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -88,7 +88,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         isInitialSelection = args.isInitialSelection
         currentClass = args.className
 
-        compositeSubscription.add(userRepository.getUser().firstElement().subscribe(Consumer {
+        compositeSubscription.add(userRepository.getUser().firstElement().subscribe({
             it.preferences?.let {preferences ->
                 val unmanagedPrefs = userRepository.getUnmanagedCopy(preferences)
                 unmanagedPrefs.costume = false
@@ -98,7 +98,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
 
         if (!isInitialSelection) {
             compositeSubscription.add(userRepository.changeClass()
-                    .subscribe(Consumer { classWasUnset = true }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ classWasUnset = true }, RxErrorHandler.handleEmptyError()))
         }
 
         healerWrapper.setOnClickListener { newClass = "healer" }
@@ -120,7 +120,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item?.itemId) {
+        when (item.itemId) {
             R.id.opt_out -> optOutSelected()
         }
         return super.onOptionsItemSelected(item)
@@ -187,7 +187,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.dark_brown))
         selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.dark_brown))
         selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_yellow_10)
-        updateButtonBackgrounds(healerButton, getDrawable(R.drawable.layout_rounded_bg_brand_700_yellow_border))
+        updateButtonBackgrounds(healerButton, ContextCompat.getDrawable(this,R.drawable.layout_rounded_bg_window_yellow_border))
     }
 
     private fun mageSelected() {
@@ -197,7 +197,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
-        updateButtonBackgrounds(mageButton, getDrawable(R.drawable.layout_rounded_bg_brand_700_blue_border))
+        updateButtonBackgrounds(mageButton, ContextCompat.getDrawable(this,R.drawable.layout_rounded_bg_window_blue_border))
     }
 
     private fun rogueSelected() {
@@ -207,7 +207,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
-        updateButtonBackgrounds(rogueButton, getDrawable(R.drawable.layout_rounded_bg_brand_700_brand_border))
+        updateButtonBackgrounds(rogueButton, ContextCompat.getDrawable(this,R.drawable.layout_rounded_bg_window_brand_border))
     }
 
     private fun warriorSelected() {
@@ -217,11 +217,11 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
-        updateButtonBackgrounds(warriorButton, getDrawable(R.drawable.layout_rounded_bg_brand_700_red_border))
+        updateButtonBackgrounds(warriorButton, ContextCompat.getDrawable(this,R.drawable.layout_rounded_bg_window_red_border))
     }
 
     private fun updateButtonBackgrounds(selectedButton: TextView, background: Drawable?) {
-        val deselectedBackground = getDrawable(R.drawable.layout_rounded_bg_gray_700)
+        val deselectedBackground = ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window)
         healerButton.background = if (healerButton == selectedButton) background else deselectedBackground
         mageButton.background = if (mageButton == selectedButton) background else deselectedBackground
         rogueButton.background = if (rogueButton == selectedButton) background else deselectedBackground
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
index dbd66a8b1..7cea0f8c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
@@ -49,7 +49,7 @@ class FixCharacterValuesActivity: BaseActivity() {
         setTitle(R.string.fix_character_values)
         setupToolbar(binding.toolbar)
 
-        compositeSubscription.add(repository.getUser(userId).firstElement().subscribe(Consumer {
+        compositeSubscription.add(repository.getUser(userId).firstElement().subscribe({
             user = it
         }, RxErrorHandler.handleEmptyError()))
 
@@ -57,7 +57,7 @@ class FixCharacterValuesActivity: BaseActivity() {
         setIconBackground(binding.experienceIconBackgroundView, ContextCompat.getColor(this, R.color.yellow_500))
         setIconBackground(binding.manaIconBackgroundView, ContextCompat.getColor(this, R.color.blue_500))
         setIconBackground(binding.goldIconBackgroundView, ContextCompat.getColor(this, R.color.yellow_500))
-        setIconBackground(binding.streakIconBackgroundView, ContextCompat.getColor(this, R.color.gray_400))
+        setIconBackground(binding.streakIconBackgroundView, ContextCompat.getColor(this, R.color.separator))
 
         binding.healthIconView.setImageBitmap(HabiticaIconsHelper.imageOfHeartLightBg())
         binding.experienceIconView.setImageBitmap(HabiticaIconsHelper.imageOfExperience())
@@ -85,7 +85,7 @@ class FixCharacterValuesActivity: BaseActivity() {
             userInfo["stats.mp"] = binding.manaEditText.getDoubleValue()
             userInfo["stats.lvl"] = binding.levelEditText.getDoubleValue().toInt()
             userInfo["achievements.streak"] = binding.streakEditText.getDoubleValue().toInt()
-            compositeSubscription.add(repository.updateUser(user, userInfo).subscribe(Consumer {}, RxErrorHandler.handleEmptyError(), Action {
+            compositeSubscription.add(repository.updateUser(user, userInfo).subscribe({}, RxErrorHandler.handleEmptyError(), {
                 progressDialog.dismiss()
                 finish()
             }))
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 7e51053cf..89b9881ef 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
@@ -94,7 +94,7 @@ class FullProfileActivity : BaseActivity() {
     private val attributeRows = ArrayList<TableRow>()
     private val dateFormatter = SimpleDateFormat.getDateInstance()
     private var avatarWithBars: AvatarWithBarsViewModel? = null
-    lateinit private var binding: ActivityFullProfileBinding
+    private lateinit var binding: ActivityFullProfileBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -107,7 +107,7 @@ class FullProfileActivity : BaseActivity() {
 
         setTitle(R.string.profile_loading_data)
 
-        compositeSubscription.add(socialRepository.getMember(this.userID).subscribe(Consumer { this.updateView(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(socialRepository.getMember(this.userID).subscribe({ this.updateView(it) }, RxErrorHandler.handleEmptyError()))
         avatarWithBars = AvatarWithBarsViewModel(this, binding.avatarWithBars)
         avatarWithBars?.valueBarLabelsToBlack()
 
@@ -119,7 +119,7 @@ class FullProfileActivity : BaseActivity() {
         sendMessageButton.setOnClickListener { showSendMessageToUserDialog() }
         giftGemsButton.setOnClickListener { MainNavigationController.navigate(R.id.giftGemsActivity, bundleOf(Pair("userID", userID), Pair("username", null))) }
         giftSubscriptionButton.setOnClickListener { MainNavigationController.navigate(R.id.giftSubscriptionActivity, bundleOf(Pair("userID", userID), Pair("username", null))) }
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribe({
             blocks = it.inbox?.blocks ?: listOf()
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -179,7 +179,7 @@ class FullProfileActivity : BaseActivity() {
     private fun useBlock() {
         compositeSubscription.add(socialRepository.blockMember(userID).flatMap {
             userRepository.retrieveUser()
-        }.subscribe(Consumer {
+        }.subscribe({
             invalidateOptionsMenu()
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -207,7 +207,7 @@ class FullProfileActivity : BaseActivity() {
         val addMessageDialog = HabiticaAlertDialog(this)
         addMessageDialog.addButton(android.R.string.ok, true) { _, _ ->
                     socialRepository.postPrivateMessage(userID, emojiEditText.text.toString())
-                            .subscribe(Consumer {
+                            .subscribe({
                                 HabiticaSnackbar.showSnackbar(this@FullProfileActivity.scrollView.getChildAt(0) as ViewGroup,
                                         String.format(getString(R.string.profile_message_sent_to), userDisplayName), SnackbarDisplayType.NORMAL)
                             }, RxErrorHandler.handleEmptyError())
@@ -253,17 +253,17 @@ class FullProfileActivity : BaseActivity() {
 
         avatarWithBars?.updateData(user)
 
-        compositeSubscription.add(loadItemDataByOutfit(user.equipped).subscribe(Consumer { gear -> this.gotGear(gear, user) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(loadItemDataByOutfit(user.equipped).subscribe({ gear -> this.gotGear(gear, user) }, RxErrorHandler.handleEmptyError()))
 
         if (user.preferences?.costume == true) {
-            compositeSubscription.add(loadItemDataByOutfit(user.costume).subscribe(Consumer<RealmResults<Equipment>> { this.gotCostume(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(loadItemDataByOutfit(user.costume).subscribe({ this.gotCostume(it) }, RxErrorHandler.handleEmptyError()))
         } else {
             costumeCard.visibility = View.GONE
         }
 
 
         // Load the members achievements now
-        compositeSubscription.add(socialRepository.getMemberAchievements(this.userID).subscribe(Consumer { this.fillAchievements(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(socialRepository.getMemberAchievements(this.userID).subscribe({ this.fillAchievements(it) }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun updatePetsMountsView(user: Member) {
@@ -310,7 +310,7 @@ class FullProfileActivity : BaseActivity() {
     private fun fillAchievements(labelID: Int, achievements: List<Achievement>, targetList: MutableList<Any>) {
         // Order by ID first
         val achievementList = ArrayList(achievements)
-        achievementList.sortWith(Comparator { achievement, t1 -> achievement.index.toDouble().compareTo(t1.index.toDouble()) })
+        achievementList.sortWith({ achievement, t1 -> achievement.index.toDouble().compareTo(t1.index.toDouble()) })
 
         targetList.add(getString(labelID))
         targetList.addAll(achievementList)
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 fccf00917..d84d72c4f 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
@@ -116,7 +116,7 @@ class GemPurchaseActivity : BaseActivity() {
     fun onConsumablePurchased(event: ConsumablePurchasedEvent) {
         if (isActive) {
             purchaseHandler?.consumePurchase(event.purchase)
-            compositeSubscription.add(userRepository.retrieveUser(false).subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(userRepository.retrieveUser(false).subscribe({}, RxErrorHandler.handleEmptyError()))
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
index 36a6883ca..12eaf9e12 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
@@ -75,7 +75,7 @@ class GiftGemsActivity : BaseActivity() {
 
         setViewPagerAdapter()
 
-        compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).firstElement().subscribe(Consumer {
+        compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).firstElement().subscribe({
             giftedUserID = it.id
             giftedUsername = it.username
             purchaseFragment?.giftedMember = it
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
index bd0aeeb48..fd1f46b32 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
@@ -96,7 +96,7 @@ class GiftSubscriptionActivity : BaseActivity() {
 
         giftOneGetOneContainer?.isVisible = appConfigManager.enableGiftOneGetOne()
 
-        compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).subscribe(Consumer {
+        compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).subscribe({
             avatarView.setAvatar(it)
             displayNameTextView.username = it.profile?.name
             displayNameTextView.tier = it.contributor?.level ?: 0
@@ -122,10 +122,10 @@ class GiftSubscriptionActivity : BaseActivity() {
     override fun onResume() {
         super.onResume()
 
-        this.subscription1MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription1MonthNoRenew) })
-        this.subscription3MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription3MonthNoRenew) })
-        this.subscription6MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription6MonthNoRenew) })
-        this.subscription12MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription12MonthNoRenew) })
+        this.subscription1MonthView?.setOnPurchaseClickListener({ selectSubscription(PurchaseTypes.Subscription1MonthNoRenew) })
+        this.subscription3MonthView?.setOnPurchaseClickListener({ selectSubscription(PurchaseTypes.Subscription3MonthNoRenew) })
+        this.subscription6MonthView?.setOnPurchaseClickListener({ selectSubscription(PurchaseTypes.Subscription6MonthNoRenew) })
+        this.subscription12MonthView?.setOnPurchaseClickListener({ selectSubscription(PurchaseTypes.Subscription12MonthNoRenew) })
     }
 
     override fun onStop() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
index fdb58a72e..914994262 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
@@ -149,7 +149,7 @@ class GroupInviteActivity : BaseActivity() {
         inviteData["uuids"] = invites
 
         compositeSubscription.add(this.socialRepository.inviteToGroup(user.party?.id ?: "", inviteData)
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     companion object {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
index 61fba8159..8b1c5a302 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
@@ -64,12 +64,12 @@ class HabitButtonWidgetActivity : BaseActivity() {
         }
 
         adapter = SkillTasksRecyclerViewAdapter(null, true)
-        adapter?.getTaskSelectionEvents()?.subscribe(Consumer { task -> taskSelected(task.id) },
+        adapter?.getTaskSelectionEvents()?.subscribe({ task -> taskSelected(task.id) },
                 RxErrorHandler.handleEmptyError())
                 ?.let { compositeSubscription.add(it) }
         recyclerView.adapter = adapter
 
-        compositeSubscription.add(taskRepository.getTasks(Task.TYPE_HABIT, userId).firstElement().subscribe(Consumer { adapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(taskRepository.getTasks(Task.TYPE_HABIT, userId).firstElement().subscribe({ adapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun taskSelected(taskId: String?) {
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 ac0ad6d55..aa4cf0bd8 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
@@ -45,7 +45,7 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         binding.skipButton.setOnClickListener(this)
         binding.finishButton.setOnClickListener(this)
 
-        compositeSubscription.add(contentRepository.retrieveContent(this).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(contentRepository.retrieveContent(this).subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun injectActivity(component: UserComponent?) {
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 05ca41dd6..a83df34e8 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
@@ -119,7 +119,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
             }
             apiClient.registerUser(username, email, password, confirmPassword)
                     .subscribe(this@LoginActivity,
-                            Consumer {
+                            {
                                 hideProgress()
                                 RxErrorHandler.reportError(it)
                             })
@@ -131,7 +131,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
                 return@OnClickListener
             }
             apiClient.connectUser(username, password).subscribe(this@LoginActivity,
-                    Consumer {
+                    {
                         hideProgress()
                         RxErrorHandler.reportError(it)
                     })
@@ -307,7 +307,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
             val accessToken = AccessToken.getCurrentAccessToken()
             if (accessToken != null && accessToken.token != null) {
                 compositeSubscription.add(apiClient.connectSocial("facebook", accessToken.userId, accessToken.token)
-                        .subscribe(this@LoginActivity, Consumer { hideProgress() }))
+                        .subscribe(this@LoginActivity, { hideProgress() }))
             }
         }
     }
@@ -376,7 +376,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         }
 
         compositeSubscription.add(userRepository.retrieveUser(true)
-                .subscribe(Consumer {
+                .subscribe({
                     if (userAuthResponse.newUser) {
                         this.startSetupActivity()
                     } else {
@@ -424,7 +424,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         }
                 .subscribeOn(Schedulers.io())
                 .flatMap { token -> apiClient.connectSocial("google", googleEmail ?: "", token) }
-                .subscribe(this@LoginActivity, Consumer { throwable ->
+                .subscribe(this@LoginActivity, { throwable ->
                     throwable.printStackTrace()
                     hideProgress()
                     throwable.cause?.let {
@@ -588,7 +588,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         alertDialog.setMessage(R.string.forgot_password_description)
         alertDialog.setAdditionalContentView(input)
         alertDialog.addButton(R.string.send, true) { _, _ ->
-                    userRepository.sendPasswordResetEmail(input.text.toString()).subscribe(Consumer { showPasswordEmailConfirmation() }, RxErrorHandler.handleEmptyError())
+                    userRepository.sendPasswordResetEmail(input.text.toString()).subscribe({ showPasswordEmailConfirmation() }, RxErrorHandler.handleEmptyError())
                 }
         alertDialog.addCancelButton()
         alertDialog.show()
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 e7862fbcc..ecae48645 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
@@ -22,11 +22,9 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.core.content.FileProvider
 import androidx.core.content.edit
 import androidx.drawerlayout.widget.DrawerLayout
-import androidx.lifecycle.ViewModelProviders
-import androidx.navigation.NavController
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavDestination
 import androidx.navigation.findNavController
-import androidx.navigation.fragment.NavHostFragment
 import com.facebook.drawee.view.SimpleDraweeView
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.perf.FirebasePerformance
@@ -41,6 +39,7 @@ import com.habitrpg.android.habitica.events.*
 import com.habitrpg.android.habitica.events.commands.FeedCommand
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.*
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
@@ -79,14 +78,11 @@ import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider
 import com.habitrpg.android.habitica.widget.TodoListWidgetProvider
 import io.reactivex.Completable
 import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Action
 import io.reactivex.functions.Consumer
 import io.reactivex.schedulers.Schedulers
-import io.realm.Realm
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
@@ -184,16 +180,15 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         sideAvatarView = AvatarView(this, showBackground = true, showMount = false, showPet = false)
 
         compositeSubscription.add(userRepository.getUser()
-                .subscribe(Consumer { newUser ->
+                .subscribe({ newUser ->
                     this@MainActivity.user = newUser
                     this@MainActivity.setUserData()
                 }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(userRepository.getIsUserOnQuest().subscribeWithErrorHandler(Consumer {
+        compositeSubscription.add(userRepository.getIsUserOnQuest().subscribeWithErrorHandler {
             userIsOnQuest = it
-        }))
+        })
 
-        val viewModel = ViewModelProviders.of(this)
-                .get(NotificationsViewModel::class.java)
+        val viewModel = ViewModelProvider(this).get(NotificationsViewModel::class.java)
         notificationsViewModel = viewModel
 
         val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
@@ -204,7 +199,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
         drawerToggle = object : ActionBarDrawerToggle(
                 this, /* host Activity */
-                findViewById(R.id.drawer_layout), /* DrawerLayout object */
+                drawerLayout, /* DrawerLayout object */
                 R.string.navigation_drawer_open, /* "open drawer" description */
                 R.string.navigation_drawer_close  /* "close drawer" description */
         ) {}
@@ -216,7 +211,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
             override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
                 val modernHeaderStyle = sharedPreferences.getBoolean("modern_header_style", true)
-                if (modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (!isUsingNightModeResources() && modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     if (slideOffset < 0.5f && isOpeningDrawer == null) {
                         window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
                         window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
@@ -231,7 +226,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
             override fun onDrawerOpened(drawerView: View) {
                 val modernHeaderStyle = sharedPreferences.getBoolean("modern_header_style", true)
-                if (modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (!isUsingNightModeResources() && modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
                     window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
                 }
@@ -240,7 +235,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
             override fun onDrawerClosed(drawerView: View) {
                 val modernHeaderStyle = sharedPreferences.getBoolean("modern_header_style", true)
-                if (modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (!isUsingNightModeResources() && modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     window.statusBarColor = getThemeColor(R.attr.headerBackgroundColor)
                     window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
                 }
@@ -282,7 +277,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             ""
         }
         if (destination.id == R.id.petDetailRecyclerFragment || destination.id == R.id.mountDetailRecyclerFragment) {
-            compositeSubscription.add(inventoryRepository.getItem("egg", arguments?.getString("type") ?: "").firstElement().subscribe(Consumer {
+            compositeSubscription.add(inventoryRepository.getItem("egg", arguments?.getString("type") ?: "").firstElement().subscribe({
                 binding.toolbarTitle.text = if (destination.id == R.id.petDetailRecyclerFragment) {
                     (it as? Egg)?.text
                 } else {
@@ -429,15 +424,15 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
             val quest = user?.party?.quest
             if (quest?.completed?.isNotBlank() == true) {
-                compositeSubscription.add(inventoryRepository.getQuestContent(user?.party?.quest?.completed ?: "").firstElement().subscribe(Consumer {
+                compositeSubscription.add(inventoryRepository.getQuestContent(user?.party?.quest?.completed ?: "").firstElement().subscribe({
                     QuestCompletedDialog.showWithQuest(this, it)
 
-                    userRepository.updateUser(user, "party.quest.completed", "").subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+                    userRepository.updateUser(user, "party.quest.completed", "").subscribe({}, RxErrorHandler.handleEmptyError())
                 }, RxErrorHandler.handleEmptyError()))
             }
 
             if (user?.flags?.welcomed == false) {
-                compositeSubscription.add(userRepository.updateUser(user, "flags.welcomed", true).subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+                compositeSubscription.add(userRepository.updateUser(user, "flags.welcomed", true).subscribe({}, RxErrorHandler.handleEmptyError()))
             }
 
             if (appConfigManager.enableAdventureGuide()) {
@@ -506,7 +501,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         }
         val pet = event.usingPet
         compositeSubscription.add(this.inventoryRepository.feedPet(event.usingPet, event.usingFood)
-                .subscribe(Consumer { feedResponse ->
+                .subscribe({ feedResponse ->
                     HabiticaSnackbar.showSnackbar(snackbarContainer, feedResponse.message, SnackbarDisplayType.NORMAL)
                     if (feedResponse.value == -1) {
                         val mountWrapper = View.inflate(this, R.layout.pet_imageview, null) as? FrameLayout
@@ -540,11 +535,11 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         if (user != null && data != null) {
             compositeSubscription.add(notifyUserUseCase.observable(NotifyUserUseCase.RequestValues(this, snackbarContainer,
                     user, data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta, if (userIsOnQuest) data.questDamage else 0.0, data.hasLeveledUp))
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
 
         compositeSubscription.add(displayItemDropUseCase.observable(DisplayItemDropUseCase.RequestValues(data, this, snackbarContainer))
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
 
@@ -572,7 +567,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             faintDialog?.addButton(R.string.faint_button, true) { _, _ ->
                         faintDialog = null
                         user?.let {
-                            userRepository.revive(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                            userRepository.revive(it).subscribe({ }, RxErrorHandler.handleEmptyError())
                         }
                     }
             soundManager.loadAndPlayAudio(SoundManager.SoundDeath)
@@ -601,7 +596,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                     }
                     .flatMap { contentRepository.retrieveContent(this,false) }
                     .flatMap { contentRepository.retrieveWorldState() }
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
     }
 
@@ -642,7 +637,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         val updateData = HashMap<String, Any>()
         updateData[path] = true
         compositeSubscription.add(userRepository.updateUser(user, updateData)
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
         binding.overlayFrameLayout.removeView(this.activeTutorialView)
         this.removeActiveTutorialView()
 
@@ -654,7 +649,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     }
 
     override fun onTutorialDeferred(step: TutorialStep) {
-        taskRepository.executeTransaction(Realm.Transaction { step.displayedOn = Date() })
+        taskRepository.executeTransaction { step.displayedOn = Date() }
         this.removeActiveTutorialView()
     }
 
@@ -671,7 +666,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         sharingIntent.type = "*/*"
         sharingIntent.putExtra(Intent.EXTRA_TEXT, event.sharedMessage)
         BitmapUtils.clearDirectoryContent("$filesDir/shared_images")
-        val f = BitmapUtils.saveToShareableFile("$filesDir/shared_images", "${Date().toString()}.png", event.shareImage)
+        val f = BitmapUtils.saveToShareableFile("$filesDir/shared_images", "${Date()}.png", event.shareImage)
         val fileUri = f?.let { FileProvider.getUriForFile(this, getString(R.string.content_provider), it) }
         if (fileUri != null) {
             sharingIntent.putExtra(Intent.EXTRA_STREAM, fileUri)
@@ -757,13 +752,13 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
         compositeSubscription.add(Completable.complete()
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Action {
+                .subscribe({
                     val alert = HabiticaAlertDialog(this)
                     alert.setAdditionalContentView(view)
                     alert.setTitle(title)
                     alert.addButton(R.string.see_you_tomorrow, true) { _, _ ->
                         apiClient.readNotification(event.notification.id)
-                                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                                .subscribe({ }, RxErrorHandler.handleEmptyError())
                     }
                     alert.show()
                 }, RxErrorHandler.handleEmptyError()))
@@ -774,39 +769,39 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         if (User.ONBOARDING_ACHIEVEMENT_KEYS.contains(event.type) || event.type == Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type) {
             if (!appConfigManager.enableAdventureGuide()) {
                 apiClient.readNotification(event.id)
-                        .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, RxErrorHandler.handleEmptyError())
                 return
             }
         }
         compositeSubscription.add(Completable.complete()
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Action {
+                .subscribe({
                     retrieveUser(true)
                     val dialog = AchievementDialog(this)
                     dialog.isLastOnboardingAchievement = event.isLastOnboardingAchievement
                     dialog.setType(event.type)
                     dialog.enqueue()
                     apiClient.readNotification(event.id)
-                            .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                            .subscribe({ }, RxErrorHandler.handleEmptyError())
                 }, RxErrorHandler.handleEmptyError()))
     }
 
     @Subscribe
     fun showFirstDropDialog(event: ShowFirstDropDialog) {
         if (!appConfigManager.enableAdventureGuide()) {
-            apiClient.readNotification(event.id)
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            compositeSubscription.add(apiClient.readNotification(event.id)
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
             return
         }
         compositeSubscription.add(Completable.complete()
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Action {
+                .subscribe({
                     retrieveUser(true)
                     val dialog = FirstDropDialog(this)
                     dialog.configure(event.egg, event.hatchingPotion)
                     dialog.enqueue()
                     apiClient.readNotification(event.id)
-                            .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                            .subscribe({ }, RxErrorHandler.handleEmptyError())
                 }, RxErrorHandler.handleEmptyError()))
     }
 
@@ -837,7 +832,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             dialog.setAdditionalContentView(petWrapper)
             dialog.addButton(R.string.equip, true) { _, _ ->
                 inventoryRepository.equip(user, "pet", egg.key + "-" + potion.key)
-                        .subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+                        .subscribe({}, RxErrorHandler.handleEmptyError())
             }
             dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
                 val event1 = ShareEvent()
@@ -853,12 +848,12 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             }
             dialog.setExtraCloseButtonVisibility(View.VISIBLE)
             dialog.enqueue()
-        }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        }.subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     @Subscribe
     fun onConsumablePurchased(event: ConsumablePurchasedEvent) {
-        userRepository.retrieveUser(false, true).subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+        compositeSubscription.add(userRepository.retrieveUser(withTasks = false, forced = true).subscribe({}, RxErrorHandler.handleEmptyError()))
     }
 
     companion object {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
index 419b7fa23..50edcced0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
@@ -71,7 +71,7 @@ class MaintenanceActivity : BaseActivity() {
             compositeSubscription.add(this.maintenanceService.maintenanceStatus
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(Consumer { maintenanceResponse ->
+                    .subscribe({ maintenanceResponse ->
                         if (!maintenanceResponse.activeMaintenance) {
                             finish()
                         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index 158cdd770..59306cec5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -55,7 +55,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         viewModel = ViewModelProviders.of(this)
                 .get(NotificationsViewModel::class.java)
 
-        compositeSubscription.add(viewModel.getNotifications().subscribe(Consumer {
+        compositeSubscription.add(viewModel.getNotifications().subscribe({
             this.setNotifications(it)
             viewModel.markNotificationsAsSeen(it)
         }, RxErrorHandler.handleEmptyError()))
@@ -78,7 +78,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
     override fun onRefresh() {
         binding.notificationsRefreshLayout.isRefreshing = true
 
-        compositeSubscription.add(viewModel.refreshNotifications().subscribe(Consumer {
+        compositeSubscription.add(viewModel.refreshNotifications().subscribe({
             binding.notificationsRefreshLayout.isRefreshing = false
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -303,7 +303,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
 
         compositeSubscription.add(inventoryRepository.getQuestContent(data?.questKey ?: "")
                 .firstElement()
-                .subscribe(Consumer {
+                .subscribe({
                     updateQuestInvitationView(view, it)
                 }, RxErrorHandler.handleEmptyError()))
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
index 2757bfefc..5f766aa82 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
@@ -95,7 +95,7 @@ class ReportMessageActivity : BaseActivity() {
         messageTextView.text = args.text
 
         messageID?.let {messageID ->
-            compositeSubscription.add(socialRepository.getChatmessage(messageID).subscribe(Consumer {
+            compositeSubscription.add(socialRepository.getChatmessage(messageID).subscribe({
                 chatMessage = it
             }, RxErrorHandler.handleEmptyError()))
         }
@@ -117,7 +117,7 @@ class ReportMessageActivity : BaseActivity() {
             isReporting = true
             socialRepository.flagMessage(it, additionInfoEditText.text.toString())
                     .doOnError { isReporting = false }
-                    .subscribe(Consumer {
+                    .subscribe({
                 finish()
             }, RxErrorHandler.handleEmptyError())
         }
@@ -131,7 +131,7 @@ class ReportMessageActivity : BaseActivity() {
             toolbarTextView.setTypeface(null, Typeface.BOLD)
         } else {
             appBar.elevation = 8f
-            window.statusBarColor = ContextCompat.getColor(this, R.color.gray_600)
+            window.statusBarColor = ContextCompat.getColor(this, R.color.offset_background)
             closeButton.visibility = View.VISIBLE
             toolbarTextView.setTypeface(null, Typeface.NORMAL)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index 288c93de2..823febec8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -73,8 +73,8 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer { this.onUserReceived(it) }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(userRepository.retrieveUser().subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.getUser().subscribe({ this.onUserReceived(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.retrieveUser().subscribe({}, RxErrorHandler.handleEmptyError()))
         val additionalData = HashMap<String, Any>()
         additionalData["status"] = "displayed"
         AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
@@ -83,7 +83,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         for (language in resources.getStringArray(R.array.LanguageValues)) {
             if (language == currentDeviceLanguage) {
                 compositeSubscription.add(apiClient.registrationLanguage(currentDeviceLanguage)
-                        .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                        .subscribe({ }, RxErrorHandler.handleEmptyError()))
             }
         }
 
@@ -137,7 +137,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             this.completedSetup = true
             createdTasks = true
             newTasks?.let {
-                this.taskRepository.createTasks(it).subscribe(Consumer { onUserReceived(user) }, RxErrorHandler.handleEmptyError())
+                this.taskRepository.createTasks(it).subscribe({ onUserReceived(user) }, RxErrorHandler.handleEmptyError())
             }
         } else if (pager.currentItem == 0) {
 
@@ -205,7 +205,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             additionalData["status"] = "completed"
             AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
 
-            compositeSubscription.add(userRepository.updateUser(user, "flags.welcomed", true).subscribe(Consumer {
+            compositeSubscription.add(userRepository.updateUser(user, "flags.welcomed", true).subscribe({
                 if (!compositeSubscription.isDisposed) {
                     compositeSubscription.dispose()
                 }
@@ -231,7 +231,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     private fun confirmNames(displayName: String, username: String) {
         compositeSubscription.add(userRepository.updateUser(null, "profile.name", displayName)
                 .flatMap { userRepository.updateLoginName(username).toFlowable() }
-                .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+                .subscribe({  }, RxErrorHandler.handleEmptyError()))
     }
 
     private inner class ViewPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
index 09d6ce46f..e0c23655d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
@@ -42,7 +42,7 @@ class SkillMemberActivity : BaseActivity() {
     private fun loadMemberList() {
         recyclerView.layoutManager = LinearLayoutManager(this)
         viewAdapter = PartyMemberRecyclerViewAdapter(null, true)
-        viewAdapter?.getUserClickedEvents()?.subscribe(Consumer { userId ->
+        viewAdapter?.getUserClickedEvents()?.subscribe({ userId ->
             val resultIntent = Intent()
             resultIntent.putExtra("member_id", userId)
             setResult(Activity.RESULT_OK, resultIntent)
@@ -53,6 +53,6 @@ class SkillMemberActivity : BaseActivity() {
         compositeSubscription.add(userRepository.getUser()
                 .firstElement()
                 .flatMap { user -> socialRepository.getGroupMembers(user.party?.id ?: "").firstElement() }
-                .subscribe(Consumer { viewAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ viewAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
index 50b1f405c..ff1fb22da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
@@ -61,7 +61,7 @@ class SkillTasksActivity : BaseActivity() {
                     else -> Task.TYPE_TODO
                 }
 
-                compositeSubscription.add(fragment.getTaskSelectionEvents().subscribe(Consumer { task -> taskSelected(task) }, RxErrorHandler.handleEmptyError()))
+                compositeSubscription.add(fragment.getTaskSelectionEvents().subscribe({ task -> taskSelected(task) }, RxErrorHandler.handleEmptyError()))
 
                 viewFragmentsDictionary.put(position, fragment)
 
@@ -77,7 +77,7 @@ class SkillTasksActivity : BaseActivity() {
                         else -> Task.TYPE_TODO
                     }
 
-                    compositeSubscription.add(item.getTaskSelectionEvents().subscribe(Consumer { task -> taskSelected(task) }, RxErrorHandler.handleEmptyError()))
+                    compositeSubscription.add(item.getTaskSelectionEvents().subscribe({ task -> taskSelected(task) }, RxErrorHandler.handleEmptyError()))
                     viewFragmentsDictionary.put(position, item)
                 }
                 return item
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index ff8a20da7..4244365e0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -177,11 +177,11 @@ class TaskFormActivity : BaseActivity() {
 
         compositeSubscription.add(tagRepository.getTags()
                 .map { tagRepository.getUnmanagedCopy(it) }
-                .subscribe(Consumer {
+                .subscribe({
                     tags = it
                     setTagViews()
                 }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribe({
             usesTaskAttributeStats = it.preferences?.allocationMode == "taskbased" && it.preferences?.automaticAllocation == true
             configureForm()
         }, RxErrorHandler.handleEmptyError()))
@@ -215,13 +215,13 @@ class TaskFormActivity : BaseActivity() {
         when {
             taskId != null -> {
                 isCreating = false
-                compositeSubscription.add(taskRepository.getUnmanagedTask(taskId).firstElement().subscribe(Consumer {
+                compositeSubscription.add(taskRepository.getUnmanagedTask(taskId).firstElement().subscribe({
                     task = it
                     //tintColor = ContextCompat.getColor(this, it.mediumTaskColor)
                     fillForm(it)
                     task?.challengeID?.let { challengeID ->
                         compositeSubscription.add(challengeRepository.retrieveChallenge(challengeID)
-                                .subscribe(Consumer { challenge ->
+                                .subscribe({ challenge ->
                             this.challenge = challenge
                             challengeNameView.text = getString(R.string.challenge_task_name, challenge.name)
                             challengeNameView.visibility = View.VISIBLE
@@ -410,7 +410,7 @@ class TaskFormActivity : BaseActivity() {
 
     private fun configureStatsButton(button: TextView, isSelected: Boolean) {
         button.background.setTint(if (isSelected) tintColor else ContextCompat.getColor(this, R.color.taskform_gray))
-        val textColorID = if (isSelected) R.color.white else R.color.gray_100
+        val textColorID = if (isSelected) R.color.window_background else R.color.text_secondary
         button.setTextColor(ContextCompat.getColor(this, textColorID))
         if (isSelected) {
             button.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
@@ -426,7 +426,7 @@ class TaskFormActivity : BaseActivity() {
                     arrayOf(intArrayOf(-android.R.attr.state_checked), // unchecked
                             intArrayOf(android.R.attr.state_checked)  // checked
                     ),
-                    intArrayOf(ContextCompat.getColor(this, R.color.gray_400), tintColor)
+                    intArrayOf(ContextCompat.getColor(this, R.color.text_dimmed), tintColor)
             )
             tagView?.buttonTintList = colorStateList
         }
@@ -515,7 +515,7 @@ class TaskFormActivity : BaseActivity() {
         alert.setTitle(R.string.are_you_sure)
         alert.addButton(R.string.delete_task, true) { _, _ ->
             if (task?.isValid != true) return@addButton
-            task?.id?.let { taskRepository.deleteTask(it).subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()) }
+            task?.id?.let { taskRepository.deleteTask(it).subscribe({  }, RxErrorHandler.handleEmptyError()) }
             finish()
         }
         alert.addCancelButton()
@@ -523,7 +523,7 @@ class TaskFormActivity : BaseActivity() {
     }
 
     private fun showChallengeDeleteTask() {
-        compositeSubscription.add(taskRepository.getTasksForChallenge(task?.challengeID).firstElement().subscribe(Consumer { tasks ->
+        compositeSubscription.add(taskRepository.getTasksForChallenge(task?.challengeID).firstElement().subscribe({ tasks ->
             val taskCount = tasks.size
             val alert = HabiticaAlertDialog(this)
             alert.setTitle(getString(R.string.delete_challenge_task_title))
@@ -533,7 +533,7 @@ class TaskFormActivity : BaseActivity() {
                     compositeSubscription.add(challengeRepository.leaveChallenge(it, "keep-all")
                             .flatMap { taskRepository.deleteTask(task?.id ?: "") }
                             .flatMap { userRepository.retrieveUser(true) }
-                            .subscribe(Consumer {
+                            .subscribe({
                                 finish()
                             }, RxErrorHandler.handleEmptyError()))
                 }
@@ -542,7 +542,7 @@ class TaskFormActivity : BaseActivity() {
                 challenge?.let {
                     compositeSubscription.add(challengeRepository.leaveChallenge(it, "remove-all")
                             .flatMap { userRepository.retrieveUser(true) }
-                            .subscribe(Consumer {
+                            .subscribe({
                         finish()
                     }, RxErrorHandler.handleEmptyError()))
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
index f5da763a7..aaf05c3f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
@@ -98,8 +98,8 @@ class VerifyUsernameActivity: BaseActivity() {
                         issuesTextView.visibility = View.VISIBLE
                         issuesTextView.text = it.issues.joinToString("\n")
                     }
-                }, BiFunction<Boolean, VerifyUsernameResponse, Boolean> { displayNameUsable, usernameUsable -> displayNameUsable && usernameUsable.isUsable})
-                .subscribe(Consumer {
+                }, { displayNameUsable, usernameUsable -> displayNameUsable && usernameUsable.isUsable})
+                .subscribe({
                     confirmUsernameButton.isEnabled = it
                 }, RxErrorHandler.handleEmptyError()))
 
@@ -117,7 +117,7 @@ class VerifyUsernameActivity: BaseActivity() {
                 .flatMap { userRepository.updateLoginName(usernameEditText.text.toString()).toFlowable() }
                 .doOnComplete { showConfirmationAndFinish() }
                 .doOnEach { confirmUsernameButton.isClickable = true }
-                .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+                .subscribe({  }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun showConfirmationAndFinish() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
index 442c8fd26..64163e917 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
@@ -107,9 +108,9 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
             }
 
             if (activeEquipment == equipment.key || (activeEquipment?.contains("base_0") == true && equipment.key?.isNotBlank() != true)) {
-                binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700_brand_border)
+                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window_tint_border)
             } else {
-                binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
+                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window)
             }
         }
 
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 b700afcf5..240c229a2 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
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
@@ -165,9 +166,9 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
             }
 
             if (activeCustomization == customization.identifier) {
-                binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700_brand_border)
+                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window_tint_border)
             } else {
-                binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
+                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window)
             }
         }
 
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 c3fc73de5..d5d2ddaed 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,11 +163,11 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
             titleTextView?.text = drawerItem.text
 
             if (isSelected) {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.gray_600))
+                itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.offset_background))
                 titleTextView?.setTextColor(tintColor)
             } else {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.white))
-                titleTextView?.setTextColor(ContextCompat.getColor(itemView.context, R.color.gray_10))
+                itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.content_background))
+                titleTextView?.setTextColor(ContextCompat.getColor(itemView.context, R.color.text_primary))
             }
 
             if (drawerItem.pillText != null) {
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 7f3334777..3b806bc77 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
@@ -78,7 +78,7 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
         init {
             buttonWrapper.setOnClickListener(this)
             magicDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfMagic())
-            lockDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.gray_400)))
+            lockDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.text_dimmed)))
         }
 
         fun bind(skill: Skill) {
@@ -86,8 +86,8 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
             skillNameTextView.text = skill.text
             skillNotesTextView.text = skill.notes
 
-            skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_50))
-            skillNotesTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_200))
+            skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+            skillNotesTextView.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
             skillNotesTextView.visibility = View.VISIBLE
             priceLabel.visibility = View.VISIBLE
 
@@ -95,9 +95,9 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
                 countLabel.visibility = View.VISIBLE
                 countLabel.text = getOwnedCount(skill.key).toString()
                 priceLabel.setText(R.string.skill_transformation_use)
-                priceLabel.setTextColor(ContextCompat.getColor(context, R.color.brand_400))
+                priceLabel.setTextColor(ContextCompat.getColor(context, R.color.color_accent))
                 buttonIconView.setImageDrawable(null)
-                buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600))
+                buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
                 buttonIconView.alpha = 1.0f
                 priceLabel.alpha = 1.0f
             } else {
@@ -107,7 +107,7 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
                 buttonIconView.setImageDrawable(magicDrawable)
 
                 if (skill.mana ?: 0 > mana) {
-                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600))
+                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
                     buttonIconView.alpha = 0.3f
                     priceLabel.alpha = 0.3f
                 } else {
@@ -116,8 +116,8 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
                     priceLabel.alpha = 1.0f
                 }
                 if ((skill.lvl ?: 0) > level) {
-                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600))
-                    skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.task_gray))
+                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
+                    skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.text_dimmed))
                     skillNameTextView.text = context.getString(R.string.skill_unlocks_at, skill.lvl)
                     skillNotesTextView.visibility = View.GONE
                     buttonIconView.setImageDrawable(lockDrawable)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
index 20047708a..07a3d305b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
@@ -84,11 +84,11 @@ class EquipmentRecyclerViewAdapter(data: OrderedRealmCollection<Equipment>?, aut
             if (gear.key == equippedGear) {
                 this.equippedIndicator.visibility = View.VISIBLE
                 this.gearContainer.setBackgroundColor(ContextCompat.getColor(context, R.color.brand_700))
-                imageViewWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_white)
+                imageViewWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
             } else {
                 this.equippedIndicator.visibility = View.GONE
                 this.gearContainer.setBackgroundResource(R.drawable.selection_highlight)
-                imageViewWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_700)
+                imageViewWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
             }
             twoHandedView.visibility = if (gear.twoHanded) View.VISIBLE else View.GONE
             DataBindingUtils.loadImage(imageView, "shop_"+gear.key)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
index f2351c895..c75ba4cdd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
@@ -63,7 +63,7 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
     val hatchPetEvents = hatchPetSubject.toFlowable(BackpressureStrategy.DROP)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
-        return ItemViewHolder(ItemItemBinding.inflate(context?.layoutInflater, parent, false))
+        return ItemViewHolder(ItemItemBinding.inflate(context.layoutInflater, parent, false))
     }
 
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
@@ -143,7 +143,7 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
         }
 
         override fun onClick(v: View) {
-            val context = context ?: return
+            val context = context
             if (!isHatching && !isFeeding) {
                 val menu = BottomSheetMenu(context)
                 if (item !is QuestContent && item !is SpecialItem) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
index 8ca33104d..ae5f8d4ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
@@ -101,9 +101,4 @@ class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapt
         ownsSaddles = ownedItems.containsKey("Saddle-food")
         notifyDataSetChanged()
     }
-
-    fun setOwnsSaddles(ownsSaddles: Boolean) {
-        this.ownsSaddles = ownsSaddles
-        notifyDataSetChanged()
-    }
 }
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 915adbf6d..9917a7d78 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
@@ -25,7 +25,7 @@ import io.reactivex.subjects.PublishSubject
 import io.realm.RealmResults
 
 
-class StableRecyclerAdapter() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     var shopSpriteSuffix: String? = null
     private var eggs: Map<String, Egg> = mapOf()
@@ -160,9 +160,9 @@ class StableRecyclerAdapter() : RecyclerView.Adapter<RecyclerView.ViewHolder>()
             }
 
             this.ownedTextView.text = context.getString(R.string.pet_ownership_fraction, item.numberOwned, item.totalNumber)
-            this.ownedTextView.background = context.getDrawable(R.drawable.layout_rounded_bg_shopitem_price)
+            this.ownedTextView.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_shopitem_price)
 
-            this.ownedTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_200))
+            this.ownedTextView.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
 
             ownedTextView.visibility = View.VISIBLE
             imageView.loadImage(imageName)
@@ -173,7 +173,7 @@ class StableRecyclerAdapter() : RecyclerView.Adapter<RecyclerView.ViewHolder>()
             this.ownedTextView.alpha = alpha
 
             if (item.numberOwned == item.totalNumber) {
-                this.ownedTextView.background = context.getDrawable(R.drawable.layout_rounded_bg_animalitem_complete)
+                this.ownedTextView.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_animalitem_complete)
                 this.ownedTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
index afb4dad1e..4fd611895 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
@@ -40,7 +40,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
         return if (viewType == 0) {
             SystemChatMessageViewHolder(parent.inflate(R.layout.system_chat_message))
         } else {
-            ChatRecyclerViewHolder(parent.inflate(R.layout.tavern_chat_item), uuid, isTavern)
+            ChatRecyclerViewHolder(parent.inflate(R.layout.chat_item), uuid, isTavern)
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
index c14967dad..bceae1740 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
@@ -23,7 +23,7 @@ class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, Chat
     private val copyMessageEvents = PublishSubject.create<ChatMessage>()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatRecyclerViewHolder {
-        return ChatRecyclerViewHolder(parent.inflate(R.layout.tavern_chat_item), user?.id ?: "", false)
+        return ChatRecyclerViewHolder(parent.inflate(R.layout.chat_item), user?.id ?: "", false)
     }
 
     override fun onBindViewHolder(holder: ChatRecyclerViewHolder, position: Int) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
index b6f927827..3f00748e2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
@@ -43,7 +43,7 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
             val isMember = this.memberGuildIDs.contains(guild.id)
             if (isMember) {
                 this@PublicGuildsRecyclerViewAdapter.socialRepository?.leaveGroup(guild.id, true)
-                        ?.subscribe(Consumer {
+                        ?.subscribe({
                             if (data != null) {
                                 val indexOfGroup = data?.indexOf(guild)
                                 notifyItemChanged(indexOfGroup ?: 0)
@@ -51,7 +51,7 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
                         }, RxErrorHandler.handleEmptyError())
             } else {
                 this@PublicGuildsRecyclerViewAdapter.socialRepository?.joinGroup(guild.id)
-                        ?.subscribe(Consumer { group ->
+                        ?.subscribe({ group ->
                             if (data != null) {
                                 val indexOfGroup = data?.indexOf(group)
                                 notifyItemChanged(indexOfGroup ?: 0)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
index 07bb34cb9..ac194745e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
@@ -122,7 +122,7 @@ class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, lay
         }
     }
 
-    private inner class DividerViewHolder internal constructor(itemView: View) : BindableViewHolder<Task>(itemView) {
+    private inner class DividerViewHolder(itemView: View) : BindableViewHolder<Task>(itemView) {
 
         private val dividerName: TextView = itemView.findViewById(R.id.divider_name)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
index e471cfe80..8a20de7ef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
@@ -106,7 +106,7 @@ abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(var t
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .toList()
-                    .subscribe(Consumer { this.setTasks(it) }, RxErrorHandler.handleEmptyError())
+                    .subscribe({ this.setTasks(it) }, RxErrorHandler.handleEmptyError())
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
index aff7299b1..8868ef8f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
@@ -74,7 +74,7 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
         recyclerView.layoutManager = layoutManager
         recyclerView.adapter = adapter
         adapter.useGridLayout = useGridLayout
-        context?.let { recyclerView.background = ColorDrawable(ContextCompat.getColor(it, R.color.white)) }
+        context?.let { recyclerView.background = ColorDrawable(ContextCompat.getColor(it, R.color.content_background)) }
 
         layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
@@ -96,7 +96,7 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
                     (it.category?.first()?.toInt() ?: 2) * it.index
                 }
             }
-        }.subscribe(Consumer {
+        }.subscribe({
             val entries = mutableListOf<Any>()
             var lastCategory = ""
             it.forEach { achievement ->
@@ -117,7 +117,7 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
                 .combineLatest(userRepository.getQuestAchievements()
                         .map { it.mapNotNull { achievement -> achievement.questKey } }
                         .flatMap { inventoryRepository.getQuestContent(it) })
-                .subscribeWithErrorHandler(Consumer { result ->
+                .subscribeWithErrorHandler({ result ->
                     val achievements = result.first.map {achievement ->
                         val questContent = result.second.firstOrNull { achievement.questKey == it.key }
                         achievement.title = questContent?.text
@@ -158,7 +158,7 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(userRepository.retrieveAchievements().subscribe(Consumer {
-        }, RxErrorHandler.handleEmptyError(), Action { refreshLayout.isRefreshing = false }))
+        compositeSubscription.add(userRepository.retrieveAchievements().subscribe({
+        }, RxErrorHandler.handleEmptyError(), { refreshLayout.isRefreshing = false }))
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
index 5941a48c2..dad2aa26b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
@@ -54,7 +54,7 @@ abstract class BaseMainFragment : BaseFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer { user = it }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.getUser().subscribe({ user = it }, RxErrorHandler.handleEmptyError()))
 
         if (this.usesBottomNavigation) {
             bottomNavigation?.visibility = View.VISIBLE
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 0aace769d..ad3cabc33 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
@@ -19,14 +19,15 @@ import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.getRemainingString
 import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
-import com.habitrpg.android.habitica.models.promotions.PromoType
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
+import com.habitrpg.android.habitica.models.promotions.PromoType
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
@@ -38,7 +39,6 @@ import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.drawer_main.*
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -46,11 +46,6 @@ import javax.inject.Inject
 import kotlin.collections.ArrayList
 
 
-/**
- * Fragment used for managing interactions for and presentation of a navigation drawer.
- * See the [
- * design guidelines](https://developer.android.com/design/patterns/navigation-drawer.html#Interaction) for a complete explanation of the behaviors implemented here.
- */
 class NavigationDrawerFragment : DialogFragment() {
 
     @Inject
@@ -62,7 +57,7 @@ class NavigationDrawerFragment : DialogFragment() {
     @Inject
     lateinit var configManager: AppConfigManager
 
-    var activePromo: HabiticaPromotion? = null
+    private var activePromo: HabiticaPromotion? = null
 
     private var drawerLayout: androidx.drawerlayout.widget.DrawerLayout? = null
     private var fragmentContainerView: View? = null
@@ -95,7 +90,11 @@ class NavigationDrawerFragment : DialogFragment() {
             questMenuView.visibility = View.GONE
             context?.let {
                 adapter.tintColor = it.getThemeColor(R.attr.colorPrimary)
-                adapter.backgroundTintColor = it.getThemeColor(R.attr.colorPrimary)
+                if (context?.isUsingNightModeResources() == true) {
+                    adapter.backgroundTintColor = ContextCompat.getColor(it, R.color.gray_50)
+                } else {
+                    adapter.backgroundTintColor = it.getThemeColor(R.attr.colorPrimary)
+                }
             }
             adapter.items.filter { it.identifier == SIDEBAR_TAVERN }.forEach {
                 it.subtitle = null
@@ -171,7 +170,7 @@ class NavigationDrawerFragment : DialogFragment() {
         recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
         initializeMenuItems()
 
-        subscriptions?.add(adapter.getItemSelectionEvents().subscribe(Consumer {
+        subscriptions?.add(adapter.getItemSelectionEvents().subscribe({
             setSelection(it.transitionId, it.bundle, true)
         }, RxErrorHandler.handleEmptyError()))
 
@@ -179,11 +178,11 @@ class NavigationDrawerFragment : DialogFragment() {
                 .doOnNext {  quest = it.quest }
                 .filter { it.hasActiveQuest }
                 .flatMapMaybe { inventoryRepository.getQuestContent(it.quest?.key ?: "").firstElement() }
-                .subscribe(Consumer {
+                .subscribe({
                    questContent = it
                 }, RxErrorHandler.handleEmptyError()))
 
-        subscriptions?.add(userRepository.getUser().subscribe(Consumer {
+        subscriptions?.add(userRepository.getUser().subscribe({
             updateUser(it)
         }, RxErrorHandler.handleEmptyError()))
 
@@ -268,15 +267,15 @@ class NavigationDrawerFragment : DialogFragment() {
             context?.let { subscriptionItem?.pillBackground = ContextCompat.getDrawable(it, R.drawable.pill_bg_teal) }
         }
         if (activePromo != null) {
-            var item: HabiticaDrawerItem? = null
+            var promotedItem: HabiticaDrawerItem? = null
             if (activePromo?.promoType == PromoType.GEMS_AMOUNT || activePromo?.promoType == PromoType.GEMS_PRICE) {
-                item = getItemWithIdentifier(SIDEBAR_GEMS)
+                promotedItem = getItemWithIdentifier(SIDEBAR_GEMS)
             }
             if (activePromo?.promoType == PromoType.SUBSCRIPTION) {
-                item = getItemWithIdentifier(SIDEBAR_GEMS)
+                promotedItem = getItemWithIdentifier(SIDEBAR_GEMS)
             }
-            item?.pillText = context?.getString(R.string.sale)
-            item?.pillBackground = context?.let { activePromo?.pillBackgroundDrawable(it) }
+            promotedItem?.pillText = context?.getString(R.string.sale)
+            promotedItem?.pillBackground = context?.let { activePromo?.pillBackgroundDrawable(it) }
         }
         subscriptionItem?.let { updateItem(it) }
 
@@ -426,16 +425,16 @@ class NavigationDrawerFragment : DialogFragment() {
         this.drawerLayout?.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START)
         // set UP the drawer's list view with items and click listener
 
-        subscriptions?.add(viewModel.getNotificationCount().subscribeWithErrorHandler(Consumer {
+        subscriptions?.add(viewModel.getNotificationCount().subscribeWithErrorHandler {
             setNotificationsCount(it)
-        }))
-        subscriptions?.add(viewModel.allNotificationsSeen().subscribeWithErrorHandler(Consumer {
+        })
+        subscriptions?.add(viewModel.allNotificationsSeen().subscribeWithErrorHandler {
             setNotificationsSeen(it)
-        }))
-        subscriptions?.add(viewModel.getHasPartyNotification().subscribeWithErrorHandler(Consumer {
+        })
+        subscriptions?.add(viewModel.getHasPartyNotification().subscribeWithErrorHandler {
             val partyMenuItem = getItemWithIdentifier(SIDEBAR_PARTY)
             partyMenuItem?.showBubble = it
-        }))
+        })
     }
 
     fun openDrawer() {
@@ -490,7 +489,7 @@ class NavigationDrawerFragment : DialogFragment() {
     private fun setNotificationsSeen(allSeen: Boolean) {
         context?.let {
             val color = if (allSeen) {
-                ContextCompat.getColor(it, R.color.gray_200)
+                ContextCompat.getColor(it, R.color.text_ternary)
             } else {
                 it.getThemeColor(R.attr.colorAccent)
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
index 0cf5b635a..6e1f207fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
@@ -41,6 +41,6 @@ class NewsFragment : BaseMainFragment() {
 
     override fun onResume() {
         super.onResume()
-        compositeSubscription.add(userRepository.updateUser(user, "flags.newStuff", false).subscribeWithErrorHandler(Consumer {}))
+        compositeSubscription.add(userRepository.updateUser(user, "flags.newStuff", false).subscribeWithErrorHandler({}))
     }
 }
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 130b7debf..bbac8aa24 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
@@ -85,7 +85,7 @@ class StatsFragment: BaseMainFragment() {
             binding.distributeTaskHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
         }
 
-        compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer {
+        compositeSubscription.add(userRepository.getUser(userId).subscribe({
             canAllocatePoints = user?.stats?.lvl ?: 0 >= 10 && user?.stats?.points ?: 0 > 0
             binding.unlockAtLevel.visibility = if (it?.stats?.lvl ?: 0 < 10) View.VISIBLE else View.GONE
             updateStats(it)
@@ -109,7 +109,7 @@ class StatsFragment: BaseMainFragment() {
         }
 
         binding.automaticAllocationSwitch.setOnCheckedChangeListener{ _, isChecked ->
-            userRepository.updateUser(user, "preferences.automaticAllocation", isChecked).subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+            userRepository.updateUser(user, "preferences.automaticAllocation", isChecked).subscribe({}, RxErrorHandler.handleEmptyError())
         }
 
         binding.strengthStatsView.allocateAction = { allocatePoint(Stats.STRENGTH) }
@@ -136,7 +136,7 @@ class StatsFragment: BaseMainFragment() {
     }
 
     private fun changeAutoAllocationMode(allocationMode: String) {
-        compositeSubscription.add(userRepository.updateUser(user, "preferences.allocationMode", allocationMode).subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.updateUser(user, "preferences.allocationMode", allocationMode).subscribe({}, RxErrorHandler.handleEmptyError()))
         binding.distributeEvenlyButton.isChecked = allocationMode == Stats.AUTO_ALLOCATE_FLAT
         binding.distributeClassButton.isChecked = allocationMode == Stats.AUTO_ALLOCATE_CLASSBASED
         binding.distributeTaskButton.isChecked = allocationMode == Stats.AUTO_ALLOCATE_TASKBASED
@@ -151,7 +151,7 @@ class StatsFragment: BaseMainFragment() {
     }
 
     private fun allocatePoint(stat: String) {
-        compositeSubscription.add(userRepository.allocatePoint(user, stat).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.allocatePoint(user, stat).subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun updateAttributePoints(user: User) {
@@ -186,7 +186,7 @@ class StatsFragment: BaseMainFragment() {
                 binding.rightSparklesView.visibility = View.VISIBLE
             } else {
                 binding.numberOfPointsTextView.text = getString(R.string.no_points_to_allocate)
-                binding.numberOfPointsTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_300))
+                binding.numberOfPointsTextView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
                 binding.numberOfPointsTextView.setBackgroundColor(ContextCompat.getColor(context, R.color.transparent))
                 binding.leftSparklesView.visibility = View.GONE
                 binding.rightSparklesView.visibility = View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index 5605a2f5d..ba89471c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -47,7 +47,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
                 .flatMap { customization ->
                     userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
                 }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(adapter.getUnlockCustomizationEvents()
                 .flatMap { customization ->
                     val user = this.user
@@ -59,7 +59,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
                 }
                 .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
                 .flatMap { inventoryRepository.retrieveInAppRewards() }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(adapter.getUnlockSetEvents()
                 .flatMap { set ->
                     val user = this.user
@@ -71,7 +71,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
                  }
                 .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
                 .flatMap { inventoryRepository.retrieveInAppRewards() }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
 
 
         return view
@@ -106,7 +106,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
         recyclerView.itemAnimator = SafeDefaultItemAnimator()
         this.loadCustomizations()
 
-        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler({
             updateUser(it)
         }))
     }
@@ -122,10 +122,10 @@ class AvatarCustomizationFragment : BaseMainFragment() {
 
     private fun loadCustomizations() {
         val type = this.type ?: return
-        compositeSubscription.add(customizationRepository.getCustomizations(type, category, false).subscribe(Consumer<RealmResults<Customization>> { adapter.setCustomizations(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(customizationRepository.getCustomizations(type, category, false).subscribe({ adapter.setCustomizations(it) }, RxErrorHandler.handleEmptyError()))
         if (type == "hair" && (category == "beard" || category == "mustache")) {
             val otherCategory = if (category == "mustache") "beard" else "mustache"
-            compositeSubscription.add(customizationRepository.getCustomizations(type, otherCategory, true).subscribe(Consumer<RealmResults<Customization>> { adapter.additionalSetItems = it }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(customizationRepository.getCustomizations(type, otherCategory, true).subscribe({ adapter.additionalSetItems = it }, RxErrorHandler.handleEmptyError()))
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
index f840da8e6..73686d6df 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
@@ -43,12 +43,12 @@ class AvatarEquipmentFragment : BaseMainFragment() {
                     val key = (if (equipment.key?.isNotBlank() != true) activeEquipment else equipment.key) ?: ""
                     inventoryRepository.equip(user, if (user?.preferences?.costume == true) "costume" else "equipped", key)
                 }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(adapter.getUnlockCustomizationEvents()
                 .flatMap<UnlockResponse> {
                     Flowable.empty()
                 }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(adapter.getUnlockSetEvents()
                 .flatMap<UnlockResponse> { set ->
                     val user = this.user
@@ -58,7 +58,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
                         Flowable.empty()
                     }
                 }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
         return view
     }
 
@@ -91,7 +91,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
         recyclerView.itemAnimator = SafeDefaultItemAnimator()
         this.loadEquipment()
 
-        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler({
             updateUser(it)
         }))
     }
@@ -102,7 +102,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
 
     private fun loadEquipment() {
         val type = this.type ?: return
-        inventoryRepository.getEquipmentType(type, category ?: "").subscribe(Consumer {
+        inventoryRepository.getEquipmentType(type, category ?: "").subscribe({
             adapter.setEquipment(it)
         }, RxErrorHandler.handleEmptyError())
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index 1ef9d578c..a8a3bf262 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -45,7 +45,7 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
         binding.avatarHairMustacheView.setOnClickListener { displayCustomizationFragment("hair", "mustache") }
         binding.avatarBackgroundView.setOnClickListener { displayCustomizationFragment("background", null) }
 
-        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler({
             updateUser(it)
         }))
     }
@@ -101,7 +101,7 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
 
         if (this.user?.isValid == true && this.user?.preferences?.size != newSize) {
             compositeSubscription.add(userRepository.updateUser(user, "preferences.size", newSize)
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
index a2bb3eb0e..d3b5ac00c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
@@ -41,7 +41,7 @@ class EquipmentDetailFragment : BaseMainFragment() {
         this.adapter.isCostume = this.isCostume
         this.adapter.type = this.type
         compositeSubscription.add(this.adapter.equipEvents.flatMapMaybe { key -> inventoryRepository.equipGear(user, key, isCostume ?: false).firstElement() }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
         return v
     }
 
@@ -61,7 +61,7 @@ class EquipmentDetailFragment : BaseMainFragment() {
         recyclerView.addItemDecoration(DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL))
         recyclerView.itemAnimator = SafeDefaultItemAnimator()
 
-        type?.let { type -> inventoryRepository.getOwnedEquipment(type).firstElement().subscribe(Consumer<RealmResults<Equipment>> { this.adapter.updateData(it) }, RxErrorHandler.handleEmptyError()) }
+        type?.let { type -> inventoryRepository.getOwnedEquipment(type).firstElement().subscribe({ this.adapter.updateData(it) }, RxErrorHandler.handleEmptyError()) }
     }
 
     override fun onDestroy() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
index 8bfaaad52..3ebc3ab58 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
@@ -52,8 +52,8 @@ class EquipmentOverviewFragment : BaseMainFragment() {
         binding.autoEquipSwitch.isChecked = user?.preferences?.autoEquip ?: false
         binding.costumeSwitch.isChecked = user?.preferences?.costume ?: false
 
-        binding.autoEquipSwitch.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser(user, "preferences.autoEquip", isChecked).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
-        binding.costumeSwitch.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser(user, "preferences.costume", isChecked).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
+        binding.autoEquipSwitch.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser(user, "preferences.autoEquip", isChecked).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+        binding.costumeSwitch.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser(user, "preferences.costume", isChecked).subscribe({ }, RxErrorHandler.handleEmptyError()) }
 
         user?.items?.gear?.let {
             updateGearData(it)
@@ -76,7 +76,7 @@ class EquipmentOverviewFragment : BaseMainFragment() {
     private fun updateGearData(gear: Gear) {
         if (gear.equipped?.weapon?.isNotEmpty() == true) {
             compositeSubscription.add(inventoryRepository.getEquipment(gear.equipped?.weapon ?: "").firstElement()
-                    .subscribe(Consumer {
+                    .subscribe({
                         binding.battlegearView.updateData(gear.equipped, it.twoHanded)
                     }, RxErrorHandler.handleEmptyError()))
         } else {
@@ -84,7 +84,7 @@ class EquipmentOverviewFragment : BaseMainFragment() {
         }
         if (gear.costume?.weapon?.isNotEmpty() == true) {
             compositeSubscription.add(inventoryRepository.getEquipment(gear.costume?.weapon ?: "").firstElement()
-                    .subscribe(Consumer {
+                    .subscribe({
                         binding.costumeView.updateData(gear.costume, it.twoHanded)
                     }, RxErrorHandler.handleEmptyError()))
         } else {
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 389253f8f..0216e8783 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
@@ -100,11 +100,11 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
             adapter?.let { adapter ->
                 compositeSubscription.add(adapter.getSellItemFlowable()
                         .flatMap { item -> inventoryRepository.sellItem(user, item) }
-                        .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                        .subscribe({ }, RxErrorHandler.handleEmptyError()))
 
                 compositeSubscription.add(adapter.getQuestInvitationFlowable()
                         .flatMap { quest -> inventoryRepository.inviteToQuest(quest) }
-                        .subscribe(Consumer { MainNavigationController.navigate(R.id.partyFragment) }, RxErrorHandler.handleEmptyError()))
+                        .subscribe({ MainNavigationController.navigate(R.id.partyFragment) }, RxErrorHandler.handleEmptyError()))
                 compositeSubscription.add(adapter.getOpenMysteryItemFlowable()
                         .flatMap { inventoryRepository.openMysteryItem(user) }
                         .doOnNext {
@@ -116,9 +116,9 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
                             }
                         }
                         .flatMap { userRepository.retrieveUser(false) }
-                        .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
-                compositeSubscription.add(adapter.startHatchingEvents.subscribeWithErrorHandler(Consumer { showHatchingDialog(it) }))
-                compositeSubscription.add(adapter.hatchPetEvents.subscribeWithErrorHandler(Consumer { hatchPet(it.first, it.second) }))
+                        .subscribe({ }, RxErrorHandler.handleEmptyError()))
+                compositeSubscription.add(adapter.startHatchingEvents.subscribeWithErrorHandler({ showHatchingDialog(it) }))
+                compositeSubscription.add(adapter.hatchPetEvents.subscribeWithErrorHandler({ hatchPet(it.first, it.second) }))
             }
         }
         activity?.let {
@@ -199,7 +199,7 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
         compositeSubscription.add(userRepository.retrieveUser(true, true)
                 .doOnTerminate {
                     refreshLayout?.isRefreshing = false
-                }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                }.subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun hatchPet(potion: HatchingPotion, egg: Egg) {
@@ -237,19 +237,19 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
                         }
                         itemMap
                     }
-                    .subscribe(Consumer { items ->
+                    .subscribe({ items ->
                     adapter?.items = items
             }, RxErrorHandler.handleEmptyError()))
         }
 
-        compositeSubscription.add(inventoryRepository.getPets().subscribe(Consumer { adapter?.setExistingPets(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(inventoryRepository.getPets().subscribe({ adapter?.setExistingPets(it) }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(inventoryRepository.getOwnedPets().firstElement()
                 .map { ownedMounts ->
                     val mountMap = mutableMapOf<String, OwnedPet>()
                     ownedMounts.forEach { mountMap[it.key ?: ""] = it }
                     return@map mountMap
                 }
-                .subscribe(Consumer { adapter?.setOwnedPets(it) }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ adapter?.setOwnedPets(it) }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun openMarket() {
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 6729460b5..360a3c56d 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
@@ -59,7 +59,7 @@ class ShopFragment : BaseFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        recyclerView.setBackgroundResource(R.color.white)
+        recyclerView.setBackgroundResource(R.color.content_background)
 
         adapter = recyclerView.adapter as? ShopRecyclerAdapter
         if (adapter == null) {
@@ -109,7 +109,7 @@ class ShopFragment : BaseFragment() {
                 .filter { it.hasActiveQuest }
                 .filter { group -> group.quest?.rageStrikes?.any { it.key == shopIdentifier } ?: false }
                 .filter { group -> group.quest?.rageStrikes?.filter { it.key == shopIdentifier }?.get(0)?.wasHit == true }
-                .subscribe(Consumer {
+                .subscribe({
                     adapter?.shopSpriteSuffix = "_"+it.quest?.key
                 }, RxErrorHandler.handleEmptyError()))
 
@@ -148,7 +148,7 @@ class ShopFragment : BaseFragment() {
                         shop1
                     }
                 }
-                .subscribe(Consumer {
+                .subscribe({
                     this.shop = it
                     this.adapter?.setShop(it)
                 }, RxErrorHandler.handleEmptyError()))
@@ -156,10 +156,10 @@ class ShopFragment : BaseFragment() {
 
 
         compositeSubscription.add(this.inventoryRepository.getOwnedItems()
-                .subscribe(Consumer { adapter?.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ adapter?.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(this.inventoryRepository.getInAppRewards()
                 .map { rewards -> rewards.map { it.key } }
-                .subscribe(Consumer { adapter?.setPinnedItemKeys(it) }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ adapter?.setPinnedItemKeys(it) }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun formatTimeTravelersShop(shop: Shop): Shop {
@@ -187,7 +187,7 @@ class ShopFragment : BaseFragment() {
 
     private fun loadMarketGear() {
         compositeSubscription.add(inventoryRepository.retrieveMarketGear()
-                .zipWith(inventoryRepository.getOwnedEquipment().map { equipment -> equipment.map { it.key } }, BiFunction<Shop, List<String?>, Shop> { shop, equipment ->
+                .zipWith(inventoryRepository.getOwnedEquipment().map { equipment -> equipment.map { it.key } }, { shop, equipment ->
                     for (category in shop.categories) {
                         val items = category.items.asSequence().filter {
                             !equipment.contains(it.key)
@@ -197,7 +197,7 @@ class ShopFragment : BaseFragment() {
                     }
                     shop
                 })
-                .subscribe(Consumer<Shop> {
+                .subscribe({
                     this.gearCategories = it.categories
                     adapter?.gearCategories = it.categories
                 }, RxErrorHandler.handleEmptyError()))
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
index 5d2cc6be7..aacf63269 100644
--- 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
@@ -28,7 +28,6 @@ open class ShopsFragment : BaseMainFragment() {
 
     private val currencyView: CurrencyViews by lazy {
         val view = CurrencyViews(context)
-        view.lightBackground = true
         view
     }
 
@@ -60,7 +59,7 @@ open class ShopsFragment : BaseMainFragment() {
 
         context?.let { FirebaseAnalytics.getInstance(it).logEvent("open_shop", bundleOf(Pair("shopIndex", lockTab))) }
 
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer { updateCurrencyView(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.getUser().subscribe({ updateCurrencyView(it) }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onDestroyView() {
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 2551b98b1..bc0b15713 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
@@ -88,7 +88,7 @@ class MountDetailRecyclerFragment : BaseMainFragment() {
             this.loadItems()
 
             adapter?.getEquipFlowable()?.flatMap { key -> inventoryRepository.equip(user, "mount", key) }
-                    ?.subscribe(Consumer { }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
+                    ?.subscribe({ }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
         }
 
         if (savedInstanceState != null) {
@@ -128,7 +128,7 @@ class MountDetailRecyclerFragment : BaseMainFragment() {
                         return@map mountMap
                     }.doOnNext {
                         adapter?.setOwnedMounts(it)
-                    }, BiFunction<RealmResults<out Mount>, Map<String, OwnedObject>, List<Any>> { unsortedAnimals, ownedAnimals ->
+                    }, { unsortedAnimals, ownedAnimals ->
                         val items = mutableListOf<Any>()
                         var lastMount: Mount? = null
                         var currentSection: StableSection? = null
@@ -149,7 +149,7 @@ class MountDetailRecyclerFragment : BaseMainFragment() {
                         }
                         items
                     })
-                    .subscribe(Consumer { adapter?.setItemList(it) }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ adapter?.setItemList(it) }, RxErrorHandler.handleEmptyError()))
         }
     }
 
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 e41e5fdd2..b0065f4e9 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
@@ -101,7 +101,7 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
 
         compositeSubscription.add(adapter.getEquipFlowable()
                 .flatMap<Items> { key -> inventoryRepository.equip(user, "pet", key) }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
 
 
         view.post { setGridSpanCount(view.width) }
@@ -139,8 +139,8 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
                         ownedMounts.forEach { mountMap[it.key ?: ""] = it }
                         return@map mountMap
                     }
-                    .subscribe(Consumer { adapter.setOwnedMounts(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(inventoryRepository.getOwnedItems(true).subscribe(Consumer { adapter.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ adapter.setOwnedMounts(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(inventoryRepository.getOwnedItems(true).subscribe({ adapter.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
             compositeSubscription.add(inventoryRepository.getPets(animalType, animalGroup, animalColor).combineLatest(inventoryRepository.getOwnedPets()
                     .map { ownedPets ->
                         val petMap = mutableMapOf<String, OwnedPet>()
@@ -168,8 +168,8 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
                             lastPet = pet
                         }
                         items
-                    }.subscribe(Consumer { adapter.setItemList(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(inventoryRepository.getMounts(animalType, animalGroup, animalColor).subscribe(Consumer<RealmResults<Mount>> { adapter.setExistingMounts(it) }, RxErrorHandler.handleEmptyError()))
+                    }.subscribe({ adapter.setItemList(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(inventoryRepository.getMounts(animalType, animalGroup, animalColor).subscribe({ adapter.setExistingMounts(it) }, RxErrorHandler.handleEmptyError()))
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
index 938944572..f375f84a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
@@ -101,7 +101,7 @@ class StableRecyclerFragment : BaseFragment() {
             adapter?.let {
                 compositeSubscription.add(it.getEquipFlowable()
                         .flatMap<Items> { key -> inventoryRepository.equip(user, if (itemType == "pets") "pet" else "mount", key) }
-                        .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                        .subscribe({ }, RxErrorHandler.handleEmptyError()))
             }
         }
         
@@ -156,12 +156,12 @@ class StableRecyclerFragment : BaseFragment() {
                     }
                     eggMap
                 }
-                .subscribe(Consumer {
+                .subscribe({
             adapter?.setEggs(it)
         }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(observable.zipWith(ownedObservable, BiFunction<RealmResults<out Animal>, Map<String, OwnedObject>, ArrayList<Any>> { unsortedAnimals, ownedAnimals ->
+        compositeSubscription.add(observable.zipWith(ownedObservable, { unsortedAnimals, ownedAnimals ->
             mapAnimals(unsortedAnimals, ownedAnimals)
-        }).subscribe(Consumer { items -> adapter?.setItemList(items) }, RxErrorHandler.handleEmptyError()))
+        }).subscribe({ items -> adapter?.setItemList(items) }, RxErrorHandler.handleEmptyError()))
 
         compositeSubscription.add(inventoryRepository.getOwnedItems("eggs")
                 .map {
@@ -171,7 +171,7 @@ class StableRecyclerFragment : BaseFragment() {
                     }
                     map
                 }
-                .subscribe(Consumer {
+                .subscribe({
             adapter?.ownedEggs = it
         }, RxErrorHandler.handleEmptyError()))
     }
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 ec01980f0..2029e3f7b 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
@@ -115,7 +115,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
             dialog.setTitle(R.string.change_password)
             dialog.addButton(R.string.change, true) { _, _ ->
                 userRepository.updatePassword(oldPasswordEditText?.text.toString(), passwordEditText?.text.toString(), passwordRepeatEditText?.text.toString())
-                        .subscribe(Consumer {
+                        .subscribe({
                             Toast.makeText(activity, R.string.password_changed, Toast.LENGTH_SHORT).show()
                         }, RxErrorHandler.handleEmptyError())
             }
@@ -138,7 +138,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
             dialog.setTitle(R.string.change_email)
             dialog.addButton(R.string.change, true) { _, _ ->
                 userRepository.updateEmail(emailEditText?.text.toString(), passwordEditText?.text.toString())
-                        .subscribe(Consumer {
+                        .subscribe({
                             configurePreference(findPreference("email"), emailEditText?.text.toString(), true)
                         }, RxErrorHandler.handleEmptyError())
             }
@@ -160,7 +160,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
             dialog.setTitle(R.string.change_username)
             dialog.addButton(R.string.save, true) { _, _ ->
                 userRepository.updateLoginName(loginNameEditText?.text.toString())
-                        .subscribe(Consumer {
+                        .subscribe({
                             configurePreference(findPreference("login_name"), loginNameEditText?.text.toString(), true)
                         }, RxErrorHandler.handleEmptyError())
             }
@@ -212,7 +212,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
                 thisDialog.dismiss()
                 apiClient.registerUser(user?.username ?: "", emailEditText?.text.toString(), passwordEditText?.text.toString(), passwordRepeatEditText?.text.toString())
                         .flatMap { userRepository.retrieveUser(false) }
-                        .subscribe(Consumer {
+                        .subscribe({
                             configurePreference(findPreference("email"), emailEditText?.text.toString(), true)
                         }, RxErrorHandler.handleEmptyError())
             }
@@ -256,7 +256,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
         dialog.setMessage(R.string.confirm_username_description)
         dialog.addButton(R.string.confirm, true) { _, _ ->
             userRepository.updateLoginName(user?.authentication?.localAuthentication?.username ?: "")
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    .subscribe({ }, RxErrorHandler.handleEmptyError())
         }
         dialog.addCancelButton()
         dialog.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
index 114c57997..caa251488 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
@@ -28,7 +28,7 @@ abstract class BasePreferencesFragment : PreferenceFragmentCompat() {
 
         val userID = preferenceManager.sharedPreferences.getString(context?.getString(R.string.SP_userID), null)
         if (userID != null) {
-            compositeSubscription.add(userRepository.getUser(userID).subscribe(Consumer { this.setUser(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(userRepository.getUser(userID).subscribe({ this.setUser(it) }, RxErrorHandler.handleEmptyError()))
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
index 41048a0a0..ce561ce75 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
@@ -74,7 +74,7 @@ class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedP
             else -> null
         }
         if (pathKey != null) {
-            compositeSubscription.add(userRepository.updateUser(user, "preferences.emailNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(userRepository.updateUser(user, "preferences.emailNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({  }, RxErrorHandler.handleEmptyError()))
         }
     }
 }
\ No newline at end of file
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 42b2f3c52..6d2836ffd 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
@@ -77,8 +77,10 @@ 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 || BuildConfig.DEBUG
-        themePreference?.summary = themePreference?.entry
+        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"
 
 
         val taskDisplayPreference = findPreference("task_display") as? ListPreference
@@ -92,7 +94,6 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
     override fun onResume() {
         super.onResume()
         preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-
     }
 
     override fun onPause() {
@@ -184,7 +185,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 val pieces = timeval?.split(":".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
                 if (pieces != null) {
                     val hour = Integer.parseInt(pieces[0])
-                    userRepository.changeCustomDayStart(hour).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    userRepository.changeCustomDayStart(hour).subscribe({ }, RxErrorHandler.handleEmptyError())
                 }
             }
             "language" -> {
@@ -202,7 +203,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 activity?.resources?.updateConfiguration(configuration, activity?.resources?.displayMetrics)
                 userRepository.updateLanguage(user, languageHelper.languageCode ?: "en")
                         .flatMap<ContentResult> { contentRepository.retrieveContent(context,true) }
-                        .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, RxErrorHandler.handleEmptyError())
 
                 if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
                     val intent = Intent(activity, MainActivity::class.java)
@@ -218,7 +219,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 val newAudioTheme = sharedPreferences.getString(key, "off")
                 if (newAudioTheme != null) {
                     compositeSubscription.add(userRepository.updateUser(user, "preferences.sound", newAudioTheme)
-                            .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                            .subscribe({ }, RxErrorHandler.handleEmptyError()))
                     soundManager.soundTheme = newAudioTheme
                     soundManager.preloadAllFiles()
                 }
@@ -228,7 +229,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 activity.reload()
             }
             "dailyDueDefaultView" -> userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    .subscribe({ }, RxErrorHandler.handleEmptyError())
             "server_url" -> {
                 apiClient.updateServerUrl(sharedPreferences.getString(key, ""))
                 findPreference(key).summary = sharedPreferences.getString(key, "")
@@ -241,7 +242,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 val isDisabled = sharedPreferences.getBoolean("disablePMs", false)
                 if (user?.inbox?.optOut != isDisabled) {
                     compositeSubscription.add(userRepository.updateUser(user, "inbox.optOut", isDisabled)
-                            .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                            .subscribe({ }, RxErrorHandler.handleEmptyError()))
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
index 95a5da80d..a321cb5ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
@@ -80,7 +80,7 @@ class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.O
                 }
                 else -> null
             }
-            observable?.subscribe(Consumer {}, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
+            observable?.subscribe({}, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
         }
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
index 16f48f6ae..037f1a589 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
@@ -76,7 +76,7 @@ class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPr
             else -> null
         }
         if (pathKey != null) {
-            compositeSubscription.add(userRepository.updateUser(user, "preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(userRepository.updateUser(user, "preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({  }, RxErrorHandler.handleEmptyError()))
         }
     }
 }
\ No newline at end of file
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 9e16cb86e..44c46892b 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
@@ -52,15 +52,15 @@ class GemsPurchaseFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.gems4View.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase4Gems) })
-        binding.gems21View.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase21Gems) })
-        binding.gems42View.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase42Gems) })
-        binding.gems84View.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase84Gems) })
+        binding.gems4View.setOnPurchaseClickListener({ purchaseGems(PurchaseTypes.Purchase4Gems) })
+        binding.gems21View.setOnPurchaseClickListener({ purchaseGems(PurchaseTypes.Purchase21Gems) })
+        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(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribe({
             binding.subscriptionPromo.visibility = if (it.isSubscribed) View.GONE else View.VISIBLE
         }, RxErrorHandler.handleEmptyError()))
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
index 60ff0ed88..5ca3c3684 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
@@ -62,7 +62,7 @@ class GiftBalanceGemsFragment : BaseFragment() {
         try {
             val amount = giftEditText.text.toString().toInt()
             giftedMember?.id?.let {
-                compositeSubscription.add(socialRepository.transferGems(it, amount).subscribe(Consumer {
+                compositeSubscription.add(socialRepository.transferGems(it, amount).subscribe({
                     onCompleted?.invoke()
                 }, RxErrorHandler.handleEmptyError()))
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
index cca1eacd4..831eb0b8f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
@@ -66,10 +66,10 @@ class GiftPurchaseGemsFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        gems4View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase4Gems) })
-        gems21View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase21Gems) })
-        gems42View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase42Gems) })
-        gems84View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase84Gems) })
+        gems4View?.setOnPurchaseClickListener({ purchaseGems(PurchaseTypes.Purchase4Gems) })
+        gems21View?.setOnPurchaseClickListener({ purchaseGems(PurchaseTypes.Purchase21Gems) })
+        gems42View?.setOnPurchaseClickListener({ purchaseGems(PurchaseTypes.Purchase42Gems) })
+        gems84View?.setOnPurchaseClickListener({ purchaseGems(PurchaseTypes.Purchase84Gems) })
     }
 
     fun setupCheckout() {
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 9b62e3135..17942719d 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
@@ -82,10 +82,10 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         binding.giftSubscriptionContainer.setOnClickListener { showGiftSubscriptionDialog() }
         binding.giftSubscriptionButton.setOnClickListener { showGiftSubscriptionDialog() }
 
-        binding.subscription1month.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription1Month) })
-        binding.subscription3month.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription3Month) })
-        binding.subscription6month.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription6Month) })
-        binding.subscription12month.setOnPurchaseClickListener(View.OnClickListener { 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() }
 
@@ -93,7 +93,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
 
         binding.refreshLayout.setOnRefreshListener { refresh() }
 
-        compositeSubscription.add(inventoryRepository.getLatestMysteryItem().subscribe(Consumer {
+        compositeSubscription.add(inventoryRepository.getLatestMysteryItem().subscribe({
             DataBindingUtils.loadImage(binding.subBenefitsMysteryItemIcon, "shop_set_mystery_${it.key?.split("_")?.last()}")
             binding.subBenefitsMysteryItemText.text = context?.getString(R.string.subscribe_listitem3_description_new, it.text)
         }, RxErrorHandler.handleEmptyError()))
@@ -105,7 +105,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     }
 
     private fun refresh() {
-        compositeSubscription.add(userRepository.retrieveUser(withTasks = false, forced = true).subscribe(Consumer {
+        compositeSubscription.add(userRepository.retrieveUser(withTasks = false, forced = true).subscribe({
             this.setUser(it)
             binding.refreshLayout.isRefreshing = false
         }, RxErrorHandler.handleEmptyError()))
@@ -154,7 +154,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         val subscriptionOptionButton = buttonForSku(this.selectedSubscriptionSku)
         subscriptionOptionButton?.setIsPurchased(true)
         if (binding.subscribeButton != null) {
-            binding.subscribeButton?.isEnabled = true
+            binding.subscribeButton.isEnabled = true
         }
     }
 
@@ -208,7 +208,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
             }
 
             if (isSubscribed) {
-                binding.headerImageView?.setImageResource(R.drawable.subscriber_header)
+                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) }
@@ -231,7 +231,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         if (user?.purchased?.plan?.paymentMethod == "Google" &&
                 user?.purchased?.plan?.isActive == true &&
                 (purchasedSubscription?.autoRenewing == false ||purchasedSubscription == null)) {
-            compositeSubscription.add(apiClient.cancelSubscription().subscribe(Consumer {
+            compositeSubscription.add(apiClient.cancelSubscription().subscribe({
                 refresh()
             }, RxErrorHandler.handleEmptyError()))
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
index eceacea2f..13a546c8f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
@@ -75,8 +75,8 @@ class AvatarSetupFragment : BaseFragment() {
 
         this.adapter = CustomizationSetupAdapter()
         this.adapter?.userSize = this.user?.preferences?.size ?: "slim"
-        adapter?.updateUserEvents?.flatMap { userRepository.updateUser(user, it) }?.subscribeWithErrorHandler(Consumer {})?.let { compositeSubscription.add(it) }
-        adapter?.equipGearEvents?.flatMap { inventoryRepository.equip(user, "equipped", it) }?.subscribeWithErrorHandler(Consumer {})?.let { compositeSubscription.add(it) }
+        adapter?.updateUserEvents?.flatMap { userRepository.updateUser(user, it) }?.subscribeWithErrorHandler({})?.let { compositeSubscription.add(it) }
+        adapter?.equipGearEvents?.flatMap { inventoryRepository.equip(user, "equipped", it) }?.subscribeWithErrorHandler({})?.let { compositeSubscription.add(it) }
 
         this.adapter?.user = this.user
         val layoutManager = LinearLayoutManager(activity)
@@ -208,7 +208,7 @@ class AvatarSetupFragment : BaseFragment() {
         updateData["preferences.hair.bangs"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_HAIR, SetupCustomizationRepository.SUBCATEGORY_BANGS, user), false)
         updateData["preferences.hair.flower"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_EXTRAS, SetupCustomizationRepository.SUBCATEGORY_FLOWER, user), true)
         updateData["preferences.chair"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_EXTRAS, SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR, user), true)
-        compositeSubscription.add(userRepository.updateUser(user, updateData).subscribeWithErrorHandler(Consumer {}))
+        compositeSubscription.add(userRepository.updateUser(user, updateData).subscribeWithErrorHandler({}))
     }
 
     @Suppress("ReturnCount")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
index 53f0e96e3..4edc9860a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
@@ -77,7 +77,7 @@ class WelcomeFragment : BaseFragment() {
 
         compositeSubscription.add(displayNameVerificationEvents.toFlowable(BackpressureStrategy.DROP)
                 .map { it.length in 1..30 }
-                .subscribeWithErrorHandler(Consumer {
+                .subscribeWithErrorHandler({
                     if (it) {
                         displayNameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
                         issuesTextView.visibility = View.GONE
@@ -91,7 +91,7 @@ class WelcomeFragment : BaseFragment() {
                 .filter { it.length in 1..30 }
                 .throttleLast(1, TimeUnit.SECONDS)
                 .flatMap { userRepository.verifyUsername(it) }
-                .subscribeWithErrorHandler(Consumer {
+                .subscribeWithErrorHandler({
                     if (it.isUsable) {
                         usernameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
                         issuesTextView.visibility = View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
index 30b74268a..978ed6c2c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
@@ -24,7 +24,7 @@ import io.reactivex.subjects.PublishSubject
 import javax.inject.Inject
 import javax.inject.Named
 
-class SkillTasksRecyclerViewFragment() : BaseFragment() {
+class SkillTasksRecyclerViewFragment : BaseFragment() {
     @Inject
     lateinit var taskRepository: TaskRepository
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
@@ -60,7 +60,7 @@ class SkillTasksRecyclerViewFragment() : BaseFragment() {
         recyclerView?.layoutManager = layoutManager
 
         adapter = SkillTasksRecyclerViewAdapter(null, true)
-        compositeSubscription.add(adapter.getTaskSelectionEvents().subscribe(Consumer {
+        compositeSubscription.add(adapter.getTaskSelectionEvents().subscribe({
             taskSelectionEvents.onNext(it)
         }, RxErrorHandler.handleEmptyError()))
         recyclerView?.adapter = adapter
@@ -73,7 +73,7 @@ class SkillTasksRecyclerViewFragment() : BaseFragment() {
         if (taskType == Task.TYPE_TODO) {
             tasks = tasks.map { it.where().equalTo("completed", false).findAll() }
         }
-        compositeSubscription.add(tasks.subscribe(Consumer {
+        compositeSubscription.add(tasks.subscribe({
             adapter.updateData(it)
         }, RxErrorHandler.handleEmptyError()))
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
index 9e881f079..0eae725bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
@@ -49,7 +49,7 @@ class SkillsFragment : BaseMainFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         adapter = SkillsRecyclerViewAdapter()
-        adapter?.useSkillEvents?.subscribeWithErrorHandler(Consumer { onSkillSelected(it) })?.let { compositeSubscription.add(it) }
+        adapter?.useSkillEvents?.subscribeWithErrorHandler({ onSkillSelected(it) })?.let { compositeSubscription.add(it) }
         checkUserLoadSkills()
 
         this.tutorialStepIdentifier = "skills"
@@ -83,7 +83,7 @@ class SkillsFragment : BaseMainFragment() {
             Observable.concat(userRepository.getSkills(user).firstElement().toObservable().flatMap { Observable.fromIterable(it) },
                     userRepository.getSpecialItems(user).firstElement().toObservable().flatMap { Observable.fromIterable(it) })
                     .toList()
-                    .subscribe(Consumer { skills -> adapter?.setSkillList(skills) }, RxErrorHandler.handleEmptyError())
+                    .subscribe({ skills -> adapter?.setSkillList(skills) }, RxErrorHandler.handleEmptyError())
         }
     }
 
@@ -117,7 +117,7 @@ class SkillsFragment : BaseMainFragment() {
                         HabiticaSnackbar.SnackbarDisplayType.BLUE)
             }
         }
-        compositeSubscription.add(userRepository.retrieveUser(false).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.retrieveUser(false).subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
 
@@ -148,7 +148,7 @@ class SkillsFragment : BaseMainFragment() {
         } else {
             userRepository.useSkill(user, skill.key, skill.target)
         }
-        compositeSubscription.add(observable.subscribe(Consumer { skillResponse -> this.displaySkillResult(skill, skillResponse) },
+        compositeSubscription.add(observable.subscribe({ skillResponse -> this.displaySkillResult(skill, skillResponse) },
                 RxErrorHandler.handleEmptyError()))
     }
 }
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 30799ee45..ba18df8fb 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
@@ -7,13 +7,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentChatBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -29,15 +28,13 @@ import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayTy
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Consumer
 import io.realm.RealmResults
-import kotlinx.android.synthetic.main.fragment_chat.*
-import kotlinx.android.synthetic.main.tavern_chat_new_entry_item.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class ChatFragment : BaseFragment() {
 
+    private lateinit var binding: FragmentChatBinding
     var viewModel: GroupViewModel? = null
 
     @Inject
@@ -55,7 +52,8 @@ class ChatFragment : BaseFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_chat, container, false)
+        binding = FragmentChatBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -64,52 +62,45 @@ class ChatFragment : BaseFragment() {
         val layoutManager = LinearLayoutManager(context)
         layoutManager.reverseLayout = true
         layoutManager.stackFromEnd = false
-        recyclerView.layoutManager = layoutManager
+        binding.recyclerView.layoutManager = layoutManager
 
         chatAdapter = ChatRecyclerViewAdapter(null, true, null, true)
         chatAdapter?.let {adapter ->
-            compositeSubscription.add(adapter.getUserLabelClickFlowable().subscribe(Consumer { userId ->
+            compositeSubscription.add(adapter.getUserLabelClickFlowable().subscribe({ userId ->
                 FullProfileActivity.open(userId)
             }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe(Consumer { this.showDeleteConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe(Consumer { this.showFlagConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getReplyMessageEvents().subscribe(Consumer{ setReplyTo(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe(Consumer { this.copyMessageToClipboard(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getLikeMessageFlowable().subscribe(Consumer { viewModel?.likeMessage(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe({ this.showDeleteConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe({ this.showFlagConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getReplyMessageEvents().subscribe({ setReplyTo(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe({ this.copyMessageToClipboard(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getLikeMessageFlowable().subscribe({ viewModel?.likeMessage(it) }, RxErrorHandler.handleEmptyError()))
         }
 
-        chatBarView.sendAction = { sendChatMessage(it) }
-        chatBarView.maxChatLength = configManager.maxChatLength()
-        chatBarView.autocompleteContext = "party"
-        chatBarView.groupID = viewModel?.getGroupData()?.value?.id
+        binding.chatBarView.sendAction = { sendChatMessage(it) }
+        binding.chatBarView.maxChatLength = configManager.maxChatLength()
+        binding.chatBarView.autocompleteContext = "party"
+        binding.chatBarView.groupID = viewModel?.getGroupData()?.value?.id
 
-        recyclerView.adapter = chatAdapter
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        binding.recyclerView.adapter = chatAdapter
+        binding.recyclerView.itemAnimator = SafeDefaultItemAnimator()
 
-        recyclerView.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
+        binding.recyclerView.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
                 isScrolledToBottom = layoutManager.findFirstVisibleItemPosition() == 0
             }
         })
 
-        viewModel?.getChatMessages()?.subscribe(Consumer<RealmResults<ChatMessage>> { this.setChatMessages(it) }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
+        viewModel?.getChatMessages()?.subscribe({ this.setChatMessages(it) }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
 
-        communityGuidelinesReviewView.setOnClickListener {
-            MainNavigationController.navigate(R.id.guidelinesActivity)
-        }
-        communityGuidelinesAcceptButton.setOnClickListener {
+
+        binding.chatBarView.onCommunityGuidelinesAccepted =  {
             viewModel?.updateUser("flags.communityGuidelinesAccepted", true)
         }
 
-        viewModel?.getUserData()?.observe(viewLifecycleOwner, Observer {
+        viewModel?.getUserData()?.observe(viewLifecycleOwner, {
             chatAdapter?.user = it
-            if (it?.flags?.isCommunityGuidelinesAccepted == true) {
-                communityGuidelinesView.visibility = View.GONE
-                chatBarContent.visibility = View.VISIBLE
-            } else {
-                chatBarContent.visibility = View.GONE
-            }
+            binding.chatBarView.hasAcceptedGuidelines = it?.flags?.isCommunityGuidelinesAccepted == true
         })
     }
 
@@ -133,7 +124,7 @@ class ChatFragment : BaseFragment() {
         }
         refreshDisposable = Observable.interval(30, TimeUnit.SECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer {
+                .subscribe({
             refresh()
         }, RxErrorHandler.handleEmptyError())
     }
@@ -146,17 +137,17 @@ class ChatFragment : BaseFragment() {
     }
 
     private fun setReplyTo(username: String?) {
-        val previousText = chatEditText.text.toString()
-        if (previousText.contains("@$username")) {
+        val previousMessage = binding.chatBarView.message
+        if (previousMessage.contains("@$username")) {
             return
         }
-        chatEditText.setText("@$username $previousText", TextView.BufferType.EDITABLE)
+        binding.chatBarView.message = "@$username $previousMessage"
     }
 
     private fun refresh() {
         viewModel?.retrieveGroupChat {
-            if (isScrolledToBottom && recyclerView != null) {
-                recyclerView.scrollToPosition(0)
+            if (isScrolledToBottom) {
+                binding.recyclerView.scrollToPosition(0)
             }
         }
     }
@@ -194,14 +185,14 @@ class ChatFragment : BaseFragment() {
                     .setTitle(R.string.confirm_delete_tag_title)
                     .setMessage(R.string.confirm_delete_tag_message)
                     .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setPositiveButton(android.R.string.yes) { _, _ -> viewModel?.deleteMessage(chatMessage) }
-                    .setNegativeButton(android.R.string.no, null).show()
+                    .setPositiveButton(R.string.yes) { _, _ -> viewModel?.deleteMessage(chatMessage) }
+                    .setNegativeButton(R.string.no, null).show()
         }
     }
 
     private fun setChatMessages(chatMessages: RealmResults<ChatMessage>) {
         chatAdapter?.updateData(chatMessages)
-        viewModel?.socialRepository?.getUnmanagedCopy(chatMessages)?.let { chatBarView.chatMessages = it }
+        viewModel?.socialRepository?.getUnmanagedCopy(chatMessages)?.let { binding.chatBarView.chatMessages = it }
 
         viewModel?.gotNewMessages = true
 
@@ -210,9 +201,9 @@ class ChatFragment : BaseFragment() {
 
     private fun sendChatMessage(chatText: String) {
         viewModel?.postGroupChat(chatText, {
-            recyclerView?.scrollToPosition(0)
+            binding.recyclerView.scrollToPosition(0)
         }) {
-            chatBarView.message = chatText
+            binding.chatBarView.message = chatText
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt
deleted file mode 100644
index 0cededb3f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt
+++ /dev/null
@@ -1,286 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.social
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.habitrpg.android.habitica.MainNavDirections
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Consumer
-import io.realm.RealmResults
-import kotlinx.android.synthetic.main.fragment_chat.*
-import kotlinx.android.synthetic.main.tavern_chat_new_entry_item.*
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class ChatListFragment : BaseFragment() {
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-    @Inject
-    lateinit var userRepository: UserRepository
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    private var isTavern: Boolean = false
-    internal var autocompleteContext: String = ""
-    set(value) {
-        field = value
-        if (chatBarView != null) {
-            chatBarView.autocompleteContext = value
-        }
-    }
-    internal var groupId: String? = null
-    private var user: User? = null
-    private var userId: String? = null
-    private var chatAdapter: ChatRecyclerViewAdapter? = null
-    private var navigatedOnceToFragment = false
-    private var gotNewMessages = false
-    private var isScrolledToTop = true
-    private var refreshDisposable: Disposable? = null
-
-    fun configure(groupId: String, user: User?, isTavern: Boolean, autocompleteContext: String) {
-        this.groupId = groupId
-        this.user = user
-        if (this.user != null) {
-            this.userId = this.user?.id
-        }
-        this.isTavern = isTavern
-        this.autocompleteContext = autocompleteContext
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        if (savedInstanceState != null) {
-            if (savedInstanceState.containsKey("groupId")) {
-                this.groupId = savedInstanceState.getString("groupId")
-            }
-
-            if (savedInstanceState.containsKey("isTavern")) {
-                this.isTavern = savedInstanceState.getBoolean("isTavern")
-            }
-
-            if (savedInstanceState.containsKey("userId")) {
-                this.userId = savedInstanceState.getString("userId")
-                if (this.userId != null) {
-                    compositeSubscription.add(userRepository.getUser().subscribe(Consumer { habitRPGUser -> this.user = habitRPGUser }, RxErrorHandler.handleEmptyError()))
-                }
-            }
-
-        }
-        return inflater.inflate(R.layout.fragment_chat, container, false)
-    }
-
-    override fun onDestroy() {
-        socialRepository.close()
-        userRepository.close()
-        super.onDestroy()
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val layoutManager = LinearLayoutManager(context)
-        layoutManager.reverseLayout = true
-        layoutManager.stackFromEnd = false
-        recyclerView.layoutManager = layoutManager
-
-        chatAdapter = ChatRecyclerViewAdapter(null, true, user, true)
-        chatAdapter?.let {adapter ->
-            compositeSubscription.add(adapter.getUserLabelClickFlowable().subscribe(Consumer { userId ->
-                FullProfileActivity.open(userId)
-            }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe(Consumer { this.showDeleteConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe(Consumer { this.showFlagConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getReplyMessageEvents().subscribe(Consumer{ setReplyTo(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe(Consumer { this.copyMessageToClipboard(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getLikeMessageFlowable().flatMap<ChatMessage> { socialRepository.likeMessage(it) }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
-        }
-
-        chatBarView.sendAction = { sendChatMessage(it) }
-        chatBarView.maxChatLength = configManager.maxChatLength()
-        chatBarView.autocompleteContext = autocompleteContext
-        chatBarView.groupID = groupId
-
-        recyclerView.adapter = chatAdapter
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
-
-        groupId?.let { id ->
-            socialRepository.getGroupChat(id).firstElement()
-                    .subscribe(Consumer<RealmResults<ChatMessage>> { this.setChatMessages(it) }, RxErrorHandler.handleEmptyError())
-        }
-
-        communityGuidelinesReviewView.setOnClickListener {
-            MainNavigationController.navigate(R.id.guidelinesActivity)
-        }
-        communityGuidelinesAcceptButton.setOnClickListener {
-            userRepository.updateUser(user, "flags.communityGuidelinesAccepted", true).subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
-        }
-
-        compositeSubscription.add(userRepository.getUser().subscribe {user ->
-            if (user?.flags?.isCommunityGuidelinesAccepted == true) {
-                communityGuidelinesView.visibility = View.GONE
-                chatBarContent.visibility = View.VISIBLE
-            } else {
-                chatBarContent.visibility = View.GONE
-                communityGuidelinesView.visibility = View.VISIBLE
-            }
-        })
-
-
-        recyclerView.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) {
-                super.onScrolled(recyclerView, dx, dy)
-                isScrolledToTop = layoutManager.findFirstVisibleItemPosition() == 0
-            }
-        })
-
-        refresh()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        stopAutoRefreshing()
-    }
-
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        if (isVisibleToUser) {
-            startAutoRefreshing()
-        } else {
-            stopAutoRefreshing()
-        }
-    }
-
-    private fun startAutoRefreshing() {
-        if (refreshDisposable != null && refreshDisposable?.isDisposed != true) {
-            refreshDisposable?.dispose()
-        }
-        refreshDisposable = Observable.interval(30, TimeUnit.SECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer {
-            refresh()
-        }, RxErrorHandler.handleEmptyError())
-    }
-
-    private fun stopAutoRefreshing() {
-        if (refreshDisposable?.isDisposed != true) {
-            refreshDisposable?.dispose()
-            refreshDisposable = null
-        }
-    }
-
-    private fun setReplyTo(username: String?) {
-        val previousText = chatEditText.text.toString()
-        if (previousText.contains("@$username")) {
-            return
-        }
-        chatEditText.setText("@$username $previousText", TextView.BufferType.EDITABLE)
-    }
-
-    fun refresh() {
-        groupId?.let {id ->
-            socialRepository.retrieveGroupChat(id).subscribe(Consumer {
-                        if (isScrolledToTop && recyclerView != null) {
-                            recyclerView.scrollToPosition(0)
-                        }
-                    }, RxErrorHandler.handleEmptyError())
-        }
-    }
-
-    fun setNavigatedToFragment() {
-        navigatedOnceToFragment = true
-        markMessagesAsSeen()
-    }
-
-    private fun markMessagesAsSeen() {
-        if (!isTavern && groupId?.isNotEmpty() == true && gotNewMessages && navigatedOnceToFragment) {
-            gotNewMessages = false
-            groupId?.let {id ->
-                socialRepository.markMessagesSeen(id)
-            }
-        }
-    }
-
-    private fun copyMessageToClipboard(chatMessage: ChatMessage) {
-        val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-        val messageText = ClipData.newPlainText("Chat message", chatMessage.text)
-        clipMan?.setPrimaryClip(messageText)
-        val activity = activity as? MainActivity
-        if (activity != null) {
-            showSnackbar(activity.snackbarContainer, getString(R.string.chat_message_copied), SnackbarDisplayType.NORMAL)
-        }
-    }
-
-    private fun showFlagConfirmationDialog(chatMessage: ChatMessage) {
-        val directions = MainNavDirections.actionGlobalReportMessageActivity(chatMessage.text ?: "", chatMessage.user ?: "", chatMessage.id)
-        MainNavigationController.navigate(directions)
-    }
-
-    private fun showDeleteConfirmationDialog(chatMessage: ChatMessage) {
-        val context = context
-        if (context != null) {
-            AlertDialog.Builder(context)
-                    .setTitle(R.string.confirm_delete_tag_title)
-                    .setMessage(R.string.confirm_delete_tag_message)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setPositiveButton(android.R.string.yes) { _, _ -> socialRepository.deleteMessage(chatMessage).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
-                    .setNegativeButton(android.R.string.no, null).show()
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putString("userId", this.userId)
-        outState.putString("groupId", this.groupId)
-        outState.putBoolean("isTavern", this.isTavern)
-        super.onSaveInstanceState(outState)
-    }
-
-    private fun setChatMessages(chatMessages: RealmResults<ChatMessage>) {
-        chatAdapter?.updateData(chatMessages)
-        chatBarView.chatMessages = socialRepository.getUnmanagedCopy(chatMessages)
-        recyclerView.scrollToPosition(0)
-
-        gotNewMessages = true
-
-        markMessagesAsSeen()
-    }
-
-    private fun sendChatMessage(chatText: String) {
-        groupId?.let {id ->
-            socialRepository.postGroupChat(id, chatText).subscribe({
-                recyclerView?.scrollToPosition(0)
-            }, { throwable ->
-                chatEditText.setText(chatText)
-            RxErrorHandler.reportError(throwable)})
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt
index 95f23a55d..aaf8c3648 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt
@@ -70,9 +70,9 @@ class GuildDetailFragment : BaseFragment() {
 
         refreshLayout.setOnRefreshListener { this.refresh() }
 
-        viewModel?.getGroupData()?.observe(viewLifecycleOwner, Observer { updateGuild(it) })
-        viewModel?.getLeaderData()?.observe(viewLifecycleOwner, Observer { setLeader(it) })
-        viewModel?.getIsMemberData()?.observe(viewLifecycleOwner, Observer { updateMembership(it) })
+        viewModel?.getGroupData()?.observe(viewLifecycleOwner, { updateGuild(it) })
+        viewModel?.getLeaderData()?.observe(viewLifecycleOwner, { setLeader(it) })
+        viewModel?.getIsMemberData()?.observe(viewLifecycleOwner, { updateMembership(it) })
 
         guildDescriptionView.movementMethod = LinkMovementMethod.getInstance()
         guildBankIconView.setImageBitmap(HabiticaIconsHelper.imageOfGem())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
index 2e064e759..a809cd151 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
@@ -7,6 +7,7 @@ import android.view.*
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
@@ -43,10 +44,10 @@ class GuildFragment : BaseMainFragment() {
         super.onViewCreated(view, savedInstanceState)
         resetViews()
 
-        viewModel = ViewModelProviders.of(this).get(GroupViewModel::class.java)
+        viewModel = ViewModelProvider(this).get(GroupViewModel::class.java)
         viewModel.groupViewType = GroupViewType.GUILD
-        viewModel.getGroupData().observe(viewLifecycleOwner, Observer { setGroup(it) })
-        viewModel.getIsMemberData().observe(viewLifecycleOwner, Observer { activity?.invalidateOptionsMenu() })
+        viewModel.getGroupData().observe(viewLifecycleOwner, { setGroup(it) })
+        viewModel.getIsMemberData().observe(viewLifecycleOwner, { activity?.invalidateOptionsMenu() })
 
         arguments?.let {
             val args = GuildFragmentArgs.fromBundle(it)
@@ -133,7 +134,6 @@ class GuildFragment : BaseMainFragment() {
         viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): Fragment {
-
                 val fragment: Fragment?
 
                 when (position) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
index bf8a3304a..e5f168a9d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
@@ -54,7 +54,7 @@ class GuildsOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.w
         binding?.publicGuildsButton?.setOnClickListener {
             MainNavigationController.navigate(GuildsOverviewFragmentDirections.openPublicGuilds())
         }
-        compositeSubscription.add(socialRepository.getUserGroups("guild").subscribe(Consumer { this.setGuilds(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(socialRepository.getUserGroups("guild").subscribe({ this.setGuilds(it) }, RxErrorHandler.handleEmptyError()))
     }
     override fun onDestroy() {
         socialRepository.close()
@@ -73,7 +73,7 @@ class GuildsOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.w
 
     private fun fetchGuilds() {
         compositeSubscription.add(this.socialRepository.retrieveGroups("guilds")
-                .subscribe(Consumer {
+                .subscribe({
                     binding?.refreshLayout?.isRefreshing = false
                 }, RxErrorHandler.handleEmptyError()))
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
index fb6578946..6c69ade0b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
@@ -6,12 +6,12 @@ import android.content.Context
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.FragmentInboxMessageListBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -27,15 +27,13 @@ import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModelFactory
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
 import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_inbox_message_list.*
-import kotlinx.android.synthetic.main.tavern_chat_new_entry_item.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
+    private lateinit var binding: FragmentInboxMessageListBinding
+
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
@@ -51,48 +49,48 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
                               savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
         super.onCreateView(inflater, container, savedInstanceState)
-
-        return inflater.inflate(R.layout.fragment_inbox_message_list, container, false)
+        binding = FragmentInboxMessageListBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        swipeRefreshLayout?.setOnRefreshListener(this)
+        binding.swipeRefreshLayout.setOnRefreshListener(this)
 
         arguments?.let {
             val args = InboxMessageListFragmentArgs.fromBundle(it)
             setReceivingUser(args.username, args.userID)
         }
-        viewModel = ViewModelProviders.of(this, InboxViewModelFactory(replyToUserUUID, chatRoomUser)).get(InboxViewModel::class.java)
+        viewModel = ViewModelProvider(this, InboxViewModelFactory(replyToUserUUID, chatRoomUser)).get(InboxViewModel::class.java)
 
         val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this.getActivity())
-        recyclerView.layoutManager = layoutManager
+        binding.recyclerView.layoutManager = layoutManager
 
         chatAdapter = InboxAdapter(user)
-        viewModel?.messages?.observe(this.viewLifecycleOwner, Observer { chatAdapter?.submitList(it) })
-        viewModel?.getMemberData()?.observe(this.viewLifecycleOwner, Observer {
+        viewModel?.messages?.observe(this.viewLifecycleOwner, { chatAdapter?.submitList(it) })
+        viewModel?.getMemberData()?.observe(this.viewLifecycleOwner, {
             activity?.binding?.toolbarTitle?.text = it?.profile?.name
         })
-        recyclerView.adapter = chatAdapter
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        binding.recyclerView.adapter = chatAdapter
+        binding.recyclerView.itemAnimator = SafeDefaultItemAnimator()
         chatAdapter?.let { adapter ->
-            compositeSubscription.add(adapter.getUserLabelClickFlowable().subscribe(Consumer<String> {
+            compositeSubscription.add(adapter.getUserLabelClickFlowable().subscribe({
                 FullProfileActivity.open(it)
             }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe(Consumer { this.showDeleteConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe(Consumer { this.showFlagConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe(Consumer { this.copyMessageToClipboard(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe({ this.showDeleteConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe({ this.showFlagConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe({ this.copyMessageToClipboard(it) }, RxErrorHandler.handleEmptyError()))
         }
 
-        chatBarView.sendAction = { sendMessage(it) }
-        chatBarView.maxChatLength = configManager.maxChatLength()
+        binding.chatBarView.sendAction = { sendMessage(it) }
+        binding.chatBarView.maxChatLength = configManager.maxChatLength()
 
-        communityGuidelinesView.visibility = View.GONE
+        binding.chatBarView.hasAcceptedGuidelines = true
     }
 
     override fun onResume() {
         if (replyToUserUUID?.isNotBlank() != true && chatRoomUser?.isNotBlank() != true) {
-            fragmentManager?.popBackStack()
+            parentFragmentManager.popBackStack()
         }
         super.onResume()
     }
@@ -111,7 +109,6 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         this.activity?.menuInflater?.inflate(R.menu.inbox_chat, menu)
-        val item = menu.findItem(R.id.open_profile)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
@@ -132,14 +129,14 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
     private fun refreshConversation() {
         if (viewModel?.memberID?.isNotBlank() != true) { return }
         compositeSubscription.add(this.socialRepository.retrieveInboxMessages(replyToUserUUID ?: "", 0)
-                .subscribe(Consumer {}, RxErrorHandler.handleEmptyError(), Action {
-                    swipeRefreshLayout?.isRefreshing = false
+                .subscribe({}, RxErrorHandler.handleEmptyError(), {
+                    binding.swipeRefreshLayout.isRefreshing = false
                     viewModel?.invalidateDataSource()
                 }))
     }
 
     override fun onRefresh() {
-        this.swipeRefreshLayout?.isRefreshing = true
+        binding.swipeRefreshLayout.isRefreshing = true
         this.refreshConversation()
     }
 
@@ -149,11 +146,11 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
                     .delay(200, TimeUnit.MILLISECONDS)
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe({
-                recyclerView?.scrollToPosition(0)
+                        binding.recyclerView.scrollToPosition(0)
                         viewModel?.invalidateDataSource()
             }, { error ->
                         RxErrorHandler.reportError(error)
-                        chatBarView.message = chatText
+                        binding.chatBarView.message = chatText
                     })
             KeyboardUtil.dismissKeyboard(getActivity())
         }
@@ -187,8 +184,8 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
                     .setTitle(R.string.confirm_delete_tag_title)
                     .setMessage(R.string.confirm_delete_tag_message)
                     .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setPositiveButton(android.R.string.yes) { _, _ -> socialRepository.deleteMessage(chatMessage).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
-                    .setNegativeButton(android.R.string.no, null).show()
+                    .setPositiveButton(R.string.yes) { _, _ -> socialRepository.deleteMessage(chatMessage).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+                    .setNegativeButton(R.string.no, null).show()
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
index 8a356865c..3a3fc78cc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
@@ -39,7 +39,7 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
         this.hidesToolbar = true
         super.onCreateView(inflater, container, savedInstanceState)
 
-        compositeSubscription.add(this.socialRepository.markPrivateMessagesRead(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(this.socialRepository.markPrivateMessagesRead(user).subscribe({ }, RxErrorHandler.handleEmptyError()))
 
 
         return inflater.inflate(R.layout.fragment_inbox, container, false)
@@ -59,7 +59,7 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
     }
 
     private fun loadMessages() {
-        compositeSubscription.add(socialRepository.getInboxConversations().subscribe(Consumer<RealmResults<InboxConversation>> {
+        compositeSubscription.add(socialRepository.getInboxConversations().subscribe({
             setInboxMessages(it)
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -128,7 +128,7 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
 
     private fun retrieveMessages() {
         compositeSubscription.add(this.socialRepository.retrieveInboxConversations()
-                .subscribe(Consumer<List<InboxConversation>> {
+                .subscribe({
                     inbox_refresh_layout.isRefreshing = false
                 }, RxErrorHandler.handleEmptyError()))
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
index 72d4d190a..1438e7924 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
@@ -56,7 +56,7 @@ class NoPartyFragmentFragment : BaseMainFragment() {
         invitations_view.acceptCall = {
             socialRepository.joinGroup(it)
                     .flatMap { userRepository.retrieveUser(false) }
-                    .subscribe(Consumer {
+                    .subscribe({
                         fragmentManager?.popBackStack()
                         MainNavigationController.navigate(R.id.partyFragment,
                                 bundleOf(Pair("partyID", user?.party?.id)))
@@ -64,14 +64,14 @@ class NoPartyFragmentFragment : BaseMainFragment() {
         }
 
         invitations_view.rejectCall = {
-            socialRepository.rejectGroupInvite(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            socialRepository.rejectGroupInvite(it).subscribe({ }, RxErrorHandler.handleEmptyError())
             invitationWrapper.visibility = View.GONE
         }
 
         invitations_view.setLeader = { leader ->
             compositeSubscription.add(
                     socialRepository.getMember(leader)
-                            .subscribe(Consumer {
+                            .subscribe({
                                 invitations_view.avatarView.setAvatar(it)
                                 invitations_view.textView.text = getString(R.string.invitation_title,it.displayName,invitations_view.groupName)
                             }, RxErrorHandler.handleEmptyError())
@@ -107,7 +107,7 @@ class NoPartyFragmentFragment : BaseMainFragment() {
                 drawable.tileModeX = Shader.TileMode.REPEAT
                 Observable.just(drawable)
                         .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(Consumer {
+                        .subscribe({
                             if (no_party_background != null) {
                                 no_party_background.background = it
                             }
@@ -149,7 +149,7 @@ class NoPartyFragmentFragment : BaseMainFragment() {
                                 .flatMap {
                                     userRepository.retrieveUser(false)
                                 }
-                                .subscribe(Consumer {
+                                .subscribe({
                                     fragmentManager?.popBackStack()
                                     MainNavigationController.navigate(R.id.partyFragment,
                                             bundleOf(Pair("partyID", user?.party?.id)))
@@ -166,7 +166,7 @@ class NoPartyFragmentFragment : BaseMainFragment() {
                 .flatMap { socialRepository.retrieveGroup("party") }
                 .flatMap<List<Member>> { group1 -> socialRepository.retrieveGroupMembers(group1.id, true) }
                 .doOnComplete { refreshLayout.isRefreshing = false }
-                .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+                .subscribe({  }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onDestroy() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt
index ae71c6ac3..77470ede3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt
@@ -47,7 +47,7 @@ class PublicGuildsFragment : BaseMainFragment(), SearchView.OnQueryTextListener
         viewAdapter = PublicGuildsRecyclerViewAdapter(null, true)
         compositeSubscription.add(socialRepository.getGroupMemberships()
                 .map { it.map { membership -> membership.groupID } }
-                .subscribeWithErrorHandler(Consumer { viewAdapter.setMemberGuildIDs(it) }))
+                .subscribeWithErrorHandler({ viewAdapter.setMemberGuildIDs(it) }))
         viewAdapter.socialRepository = socialRepository
         recyclerView?.adapter = viewAdapter
         recyclerView?.itemAnimator = SafeDefaultItemAnimator()
@@ -62,10 +62,10 @@ class PublicGuildsFragment : BaseMainFragment(), SearchView.OnQueryTextListener
     private fun fetchGuilds() {
         compositeSubscription.add(this.socialRepository.getPublicGuilds()
                 .firstElement()
-                .subscribe(Consumer { groups ->
+                .subscribe({ groups ->
                     this@PublicGuildsFragment.viewAdapter.setUnfilteredData(groups)
                 }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(this.socialRepository.retrieveGroups("publicGuilds").subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(this.socialRepository.retrieveGroups("publicGuilds").subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
index 277575df3..7f652c557 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
@@ -90,10 +90,10 @@ class QuestDetailFragment : BaseMainFragment() {
     override fun onResume() {
         super.onResume()
         compositeSubscription.add(socialRepository.getGroup(partyId)
-                .subscribe(Consumer { this.updateParty(it) }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ this.updateParty(it) }, RxErrorHandler.handleEmptyError()))
         if (questKey != null) {
             compositeSubscription.add(inventoryRepository.getQuestContent(questKey ?: "")
-                    .subscribe(Consumer { this.updateQuestContent(it) }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ this.updateQuestContent(it) }, RxErrorHandler.handleEmptyError()))
         }
     }
 
@@ -104,7 +104,7 @@ class QuestDetailFragment : BaseMainFragment() {
         party = group
         quest = group.quest
         setQuestParticipants(group.quest?.participants)
-        compositeSubscription.add(socialRepository.getMember(quest?.leader).firstElement().subscribe(Consumer { member ->
+        compositeSubscription.add(socialRepository.getMember(quest?.leader).firstElement().subscribe({ member ->
             if (context != null && questLeaderView != null && member != null) {
                 questLeaderView?.text = context?.getString(R.string.quest_leader_header, member.displayName)
             }
@@ -173,15 +173,15 @@ class QuestDetailFragment : BaseMainFragment() {
                     when {
                         participant.participatesInQuest == null -> {
                             statusTextView?.setText(R.string.pending)
-                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.gray_200))
+                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.text_ternary))
                         }
                         participant.participatesInQuest == true -> {
                             statusTextView?.setText(R.string.accepted)
-                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.green_100))
+                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.text_green))
                         }
                         else -> {
                             statusTextView?.setText(R.string.declined)
-                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.red_100))
+                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.text_red))
                         }
                     }
                 }
@@ -215,14 +215,14 @@ class QuestDetailFragment : BaseMainFragment() {
 
     private fun onQuestAccept() {
         partyId?.let { partyID ->
-        socialRepository.acceptQuest(user, partyID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+        socialRepository.acceptQuest(user, partyID).subscribe({ }, RxErrorHandler.handleEmptyError())
         }
     }
 
 
     private fun onQuestReject() {
         partyId?.let { partyID ->
-            socialRepository.rejectQuest(user, partyID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            socialRepository.rejectQuest(user, partyID).subscribe({ }, RxErrorHandler.handleEmptyError())
         }
     }
 
@@ -235,7 +235,7 @@ class QuestDetailFragment : BaseMainFragment() {
                 val party = party
                 if (party != null) {
                     socialRepository.forceStartQuest(party)
-                            .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                            .subscribe({ }, RxErrorHandler.handleEmptyError())
                 }
             }
             alert.addButton(R.string.no, false)
@@ -251,7 +251,7 @@ class QuestDetailFragment : BaseMainFragment() {
                 partyId?.let { partyID ->
                     @Suppress("DEPRECATION")
                     socialRepository.cancelQuest(partyID)
-                            .subscribe(Consumer { getActivity()?.fragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                            .subscribe({ getActivity()?.fragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
                 }
             }
             alert.addButton(R.string.no, false)
@@ -266,7 +266,7 @@ class QuestDetailFragment : BaseMainFragment() {
                     partyId?.let { partyID ->
                         @Suppress("DEPRECATION")
                         socialRepository.abortQuest(partyID)
-                                .subscribe(Consumer { getActivity()?.fragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                                .subscribe({ getActivity()?.fragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
                     }
                 }.setNegativeButton(R.string.no) { _, _ -> }
         builder.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
index d70d88d88..7501f070d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
@@ -61,7 +61,7 @@ class TavernDetailFragment : BaseFragment() {
 
         shopSpriteSuffix = configManager.shopSpriteSuffix()
 
-        compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer {
+        compositeSubscription.add(userRepository.getUser(userId).subscribe({
             this.user = it
             this.updatePausedState()
         }, RxErrorHandler.handleEmptyError()))
@@ -90,12 +90,12 @@ class TavernDetailFragment : BaseFragment() {
                     }
                 }
                 .flatMapMaybe { inventoryRepository.getQuestContent(it.quest?.key ?: "").firstElement() }
-                .subscribe(Consumer {
+                .subscribe({
                     questProgressView.quest = it
                     worldBossSection.visibility = View.VISIBLE
                 }, RxErrorHandler.handleEmptyError()))
 
-        compositeSubscription.add(socialRepository.retrieveGroup(Group.TAVERN_ID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(socialRepository.retrieveGroup(Group.TAVERN_ID).subscribe({ }, RxErrorHandler.handleEmptyError()))
 
         user?.let { questProgressView.configure(it) }
     }
@@ -109,7 +109,7 @@ class TavernDetailFragment : BaseFragment() {
 
     private fun bindButtons() {
         innButton.setOnClickListener {
-            user?.let { user -> userRepository.sleep(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
+            user?.let { user -> userRepository.sleep(user).subscribe({ }, RxErrorHandler.handleEmptyError()) }
         }
         guidelinesButton.setOnClickListener {
             MainNavigationController.navigate(R.id.guidelinesActivity)
@@ -146,7 +146,7 @@ class TavernDetailFragment : BaseFragment() {
         for (tier in PlayerTier.getTiers()) {
             context?.let {
                 val container = FrameLayout(it)
-                container.background = ContextCompat.getDrawable(it, R.drawable.layout_rounded_bg_gray_700)
+                container.background = ContextCompat.getDrawable(it, R.drawable.layout_rounded_bg_window)
                 val label = UsernameLabel(context, null)
                 label.tier = tier.id
                 label.username = tier.title
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
index 99acd5f1e..4e6bf6b96 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
@@ -4,11 +4,13 @@ import android.os.Bundle
 import android.view.*
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
+import androidx.lifecycle.ViewModelProvider
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
+import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
 import kotlinx.android.synthetic.main.fragment_viewpager.*
 import javax.inject.Inject
 
@@ -17,10 +19,10 @@ class TavernFragment : BaseMainFragment() {
     @Inject
     lateinit var socialRepository: SocialRepository
 
-    internal var tavern: Group? = null
+    internal lateinit var viewModel: GroupViewModel
 
     internal var tavernDetailFragment = TavernDetailFragment()
-    internal var chatListFragment = ChatListFragment()
+    private var chatFragment: ChatFragment? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -36,6 +38,11 @@ class TavernFragment : BaseMainFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(GroupViewModel::class.java)
+        viewModel.groupViewType = GroupViewType.TAVERN
+        viewModel.getIsMemberData().observe(viewLifecycleOwner, { activity?.invalidateOptionsMenu() })
+
         setViewPagerAdapter()
         viewPager.currentItem = 0
     }
@@ -58,7 +65,7 @@ class TavernFragment : BaseMainFragment() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_guild_refresh -> {
-                chatListFragment.refresh()
+                viewModel.retrieveGroup {  }
                 return true
             }
         }
@@ -71,22 +78,23 @@ class TavernFragment : BaseMainFragment() {
             return
         }
 
-        viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        viewPager.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
             override fun getItem(position: Int): Fragment {
                 return when (position) {
                     0 -> {
                         tavernDetailFragment
                     }
                     1 -> {
-                        chatListFragment.configure(Group.TAVERN_ID, user, true, "tavern")
-                        chatListFragment
+                        chatFragment = ChatFragment()
+                        chatFragment?.viewModel = viewModel
+                        chatFragment ?: Fragment()
                     }
                     else -> Fragment()
                 }
             }
 
             override fun getCount(): Int {
-                return if (tavern != null && tavern?.quest != null && tavern?.quest?.key != null) {
+                return if (viewModel.getGroupData().value?.quest?.active == true) {
                     3
                 } else 2
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
index d728f4efe..4220b4d5e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
@@ -25,15 +25,12 @@ import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
 import net.pherth.android.emoji_library.EmojiParser
 import java.util.*
 import javax.inject.Inject
@@ -105,8 +102,8 @@ class ChallengeDetailFragment: BaseMainFragment() {
                     .flatMap { creatorID ->
                         return@flatMap socialRepository.getMember(creatorID)
                     }
-                    .subscribe(Consumer { set(it)}, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(challengeRepository.getChallengeTasks(id).subscribe(Consumer { taskList ->
+                    .subscribe({ set(it)}, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(challengeRepository.getChallengeTasks(id).subscribe({ taskList ->
                 taskGrouplayout?.removeAllViewsInLayout()
 
                 val todos = ArrayList<Task>()
@@ -140,14 +137,14 @@ class ChallengeDetailFragment: BaseMainFragment() {
                 }
             }, RxErrorHandler.handleEmptyError()))
 
-            compositeSubscription.add(challengeRepository.isChallengeMember(id).subscribe(Consumer { isMember ->
+            compositeSubscription.add(challengeRepository.isChallengeMember(id).subscribe({ isMember ->
                 setJoined(isMember)
             }, RxErrorHandler.handleEmptyError()))
         }
 
         joinButton?.setOnClickListener { challenge?.let { challenge -> challengeRepository.joinChallenge(challenge)
                 .flatMap { userRepository.retrieveUser(true) }
-                .subscribe(Consumer {}, RxErrorHandler.handleEmptyError()) } }
+                .subscribe({}, RxErrorHandler.handleEmptyError()) } }
         leaveButton?.setOnClickListener { showChallengeLeaveDialog() }
 
         refresh()
@@ -184,7 +181,7 @@ class ChallengeDetailFragment: BaseMainFragment() {
         challengeID?.let {id ->
             challengeRepository.retrieveChallenge(id)
                     .flatMap { challengeRepository.retrieveChallengeTasks(id) }
-                    .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError(), Action {  })
+                    .subscribe({ }, RxErrorHandler.handleEmptyError(), { })
         }
     }
 
@@ -357,13 +354,13 @@ class ChallengeDetailFragment: BaseMainFragment() {
         val alert = HabiticaAlertDialog(context)
         alert.setTitle(this.getString(R.string.challenge_leave_title))
         alert.setMessage(this.getString(R.string.challenge_leave_description))
-        alert.addButton(R.string.leave_keep_tasks, true) { dialog, _ ->
+        alert.addButton(R.string.leave_keep_tasks, true) { _, _ ->
             val challenge = challenge ?: return@addButton
-            challengeRepository.leaveChallenge(challenge, "keep-all").subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+            challengeRepository.leaveChallenge(challenge, "keep-all").subscribe({}, RxErrorHandler.handleEmptyError())
         }
-        alert.addButton(R.string.leave_delte_tasks, false, true) { dialog, _ ->
+        alert.addButton(R.string.leave_delte_tasks, isPrimary = false, isDestructive = true) { _, _ ->
             val challenge = challenge ?: return@addButton
-            challengeRepository.leaveChallenge(challenge, "remove-all").subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+            challengeRepository.leaveChallenge(challenge, "remove-all").subscribe({}, RxErrorHandler.handleEmptyError())
         }
         alert.setExtraCloseButtonVisibility(View.VISIBLE)
         alert.show()
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 24b40f378..e6596a14e 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
@@ -78,7 +78,7 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
         resetViews()
 
         challengeAdapter = ChallengesListViewAdapter(null, true, viewUserChallengesOnly, userId)
-        challengeAdapter?.getOpenDetailFragmentFlowable()?.subscribe(Consumer { openDetailFragment(it) }, RxErrorHandler.handleEmptyError())
+        challengeAdapter?.getOpenDetailFragmentFlowable()?.subscribe({ openDetailFragment(it) }, RxErrorHandler.handleEmptyError())
                 ?.let { compositeSubscription.add(it) }
 
         swipeRefreshLayout?.setOnRefreshListener(this)
@@ -89,7 +89,7 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
             this.recyclerView?.setBackgroundResource(R.color.white)
         }
 
-        compositeSubscription.add(socialRepository.getGroup(Group.TAVERN_ID).combineLatest(socialRepository.getUserGroups("guild")).subscribe(Consumer {
+        compositeSubscription.add(socialRepository.getGroup(Group.TAVERN_ID).combineLatest(socialRepository.getUserGroups("guild")).subscribe({
             this.filterGroups = mutableListOf()
             filterGroups?.add(it.first)
             filterGroups?.addAll(it.second)
@@ -137,7 +137,7 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
             challengeRepository.getChallenges()
         }
 
-        compositeSubscription.add(observable.firstElement().subscribe(Consumer { challenges ->
+        compositeSubscription.add(observable.firstElement().subscribe({ challenges ->
             if (challenges.size == 0) {
                 retrieveChallengesPage()
             }
@@ -153,7 +153,7 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
         setRefreshing(true)
         compositeSubscription.add(challengeRepository.retrieveChallenges(nextPageToLoad, viewUserChallengesOnly).doOnComplete {
             setRefreshing(false)
-        } .subscribe(Consumer {
+        } .subscribe({
             if (it.size < 10) {
                 loadedAllData = true
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 9a3e076f5..bf1c01f50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -113,7 +113,7 @@ class PartyDetailFragment : BaseFragment() {
         invitationsView?.acceptCall = {
             viewModel?.joinGroup(it) {
                 compositeSubscription.add(userRepository.retrieveUser(false)
-                        .subscribe(Consumer { user ->
+                        .subscribe({ user ->
                             fragmentManager?.popBackStack()
                             MainNavigationController.navigate(R.id.partyFragment,
                                     bundleOf(Pair("partyID", user.party?.id)))
@@ -125,12 +125,12 @@ class PartyDetailFragment : BaseFragment() {
         invitationsView?.rejectCall = {
             socialRepository.rejectGroupInvite(it)
                     .flatMap { userRepository.retrieveUser(false, true) }
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    .subscribe({ }, RxErrorHandler.handleEmptyError())
         }
 
-        viewModel?.getGroupData()?.observe(viewLifecycleOwner, Observer { updateParty(it) })
-        viewModel?.getUserData()?.observe(viewLifecycleOwner, Observer { updateUser(it) })
-        viewModel?.getMembersData()?.observe(viewLifecycleOwner, Observer { updateMembersList(it) })
+        viewModel?.getGroupData()?.observe(viewLifecycleOwner, { updateParty(it) })
+        viewModel?.getUserData()?.observe(viewLifecycleOwner, { updateUser(it) })
+        viewModel?.getMembersData()?.observe(viewLifecycleOwner, { updateMembersList(it) })
     }
 
     private fun refreshParty() {
@@ -157,7 +157,7 @@ class PartyDetailFragment : BaseFragment() {
                 delay(500)
                 inventoryRepository.getQuestContent(party.quest?.key ?: "")
                         .firstElement()
-                        .subscribe(Consumer<QuestContent> { this@PartyDetailFragment.updateQuestContent(it) }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ this@PartyDetailFragment.updateQuestContent(it) }, RxErrorHandler.handleEmptyError())
             }
         } else {
             newQuestButton?.visibility = View.VISIBLE
@@ -201,7 +201,7 @@ class PartyDetailFragment : BaseFragment() {
                     leaderID.let {
                         compositeSubscription.add(
                             socialRepository.getMember(it)
-                                    .subscribe(Consumer {
+                                    .subscribe({
                                         inviteLeaderAvatarView?.setAvatar(it)
                                         inviteLeaderTextView?.text = getString(R.string.invitation_title,it.displayName,groupName)
                                     }, RxErrorHandler.handleEmptyError())
@@ -239,7 +239,7 @@ class PartyDetailFragment : BaseFragment() {
         }
         questImageWrapper?.alpha = 1.0f
         questProgressView?.alpha = 1.0f
-        context?.let { questParticipationView?.setTextColor(ContextCompat.getColor(it, R.color.gray_300)) }
+        context?.let { questParticipationView?.setTextColor(ContextCompat.getColor(it, R.color.text_quad)) }
         if (viewModel?.isQuestActive == true) {
             questProgressView?.visibility = View.VISIBLE
             questProgressView?.setData(questContent, viewModel?.getGroupData()?.value?.quest?.progress)
@@ -300,7 +300,7 @@ class PartyDetailFragment : BaseFragment() {
         val addMessageDialog = context?.let { HabiticaAlertDialog(it) }
         addMessageDialog?.addButton(android.R.string.ok, true) { _, _ ->
             socialRepository.postPrivateMessage(userID, emojiEditText.text.toString())
-                    .subscribe(Consumer {
+                    .subscribe({
                         (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
                             HabiticaSnackbar.showSnackbar(it1,
                                     String.format(getString(R.string.profile_message_sent_to), username), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
@@ -317,7 +317,7 @@ class PartyDetailFragment : BaseFragment() {
         val dialog = context?.let { HabiticaAlertDialog(it) }
         dialog?.addButton(R.string.transfer, true) { _, _ ->
             socialRepository.transferGroupOwnership(viewModel?.groupID ?: "", userID)
-                    .subscribe(Consumer {
+                    .subscribe({
                         (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
                             HabiticaSnackbar.showSnackbar(it1,
                                     String.format(getString(R.string.transferred_ownership), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
@@ -335,7 +335,7 @@ class PartyDetailFragment : BaseFragment() {
         val dialog = context?.let { HabiticaAlertDialog(it) }
         dialog?.addButton(R.string.remove, true) { _, _ ->
             socialRepository.removeMemberFromGroup(viewModel?.groupID ?: "", userID)
-                    .subscribe(Consumer {
+                    .subscribe({
                         (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
                             HabiticaSnackbar.showSnackbar(it1,
                                     String.format(getString(R.string.removed_member), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
index 169367302..fe0416438 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
@@ -49,7 +49,7 @@ class PartyFragment : BaseMainFragment() {
         viewModel.groupViewType = GroupViewType.PARTY
 
         viewModel.getGroupData().observe(viewLifecycleOwner,
-                Observer {
+                {
                     updateGroupUI(it)
                 })
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
index e73f034d9..17edc05ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
@@ -38,7 +38,7 @@ class FAQDetailFragment : BaseMainFragment() {
 
         arguments?.let {
             val args = FAQDetailFragmentArgs.fromBundle(it)
-            compositeSubscription.add(faqRepository.getArticle(args.position).subscribe(Consumer { faq ->
+            compositeSubscription.add(faqRepository.getArticle(args.position).subscribe({ faq ->
                 this.questionTextView?.text = faq.question
                 this.answerTextView?.text = MarkdownParser.parseMarkdown(faq.answer)
             }, RxErrorHandler.handleEmptyError()))
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 f8c0aa044..109b2ebb0 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
@@ -29,7 +29,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
     private var selectedCard: ShopItem? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        compositeSubscription.add(inventoryRepository.retrieveInAppRewards().subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(inventoryRepository.retrieveInAppRewards().subscribe({ }, RxErrorHandler.handleEmptyError()))
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
@@ -52,16 +52,16 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
         }
         recyclerView.itemAnimator = SafeDefaultItemAnimator()
 
-        compositeSubscription.add(inventoryRepository.getInAppRewards().subscribe(Consumer {
+        compositeSubscription.add(inventoryRepository.getInAppRewards().subscribe({
             (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
         }, RxErrorHandler.handleEmptyError()))
 
-        (recyclerAdapter as? RewardsRecyclerViewAdapter)?.purchaseCardEvents?.subscribe(Consumer {
+        (recyclerAdapter as? RewardsRecyclerViewAdapter)?.purchaseCardEvents?.subscribe({
             selectedCard = it
             val intent = Intent(activity, SkillMemberActivity::class.java)
             startActivityForResult(intent, 11)
         }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
-        recyclerAdapter?.brokenTaskEvents?.subscribeWithErrorHandler(Consumer { showBrokenChallengeDialog(it) })?.let { compositeSubscription.add(it) }
+        recyclerAdapter?.brokenTaskEvents?.subscribeWithErrorHandler({ showBrokenChallengeDialog(it) })?.let { compositeSubscription.add(it) }
     }
 
     override fun getLayoutManager(context: Context?): LinearLayoutManager {
@@ -74,7 +74,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
                 .flatMap<List<ShopItem>> { inventoryRepository.retrieveInAppRewards() }
                 .doOnTerminate {
                     refreshLayout?.isRefreshing = false
-                }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                }.subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun setGridSpanCount(width: Int) {
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 5e9e0c175..4aa8f2ce3 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
@@ -98,7 +98,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         binding.recyclerView.adapter = adapter
 
         if (this.classType != null) {
-            compositeSubscription.add(taskRepository.getTasks(this.classType ?: "", userID).firstElement().subscribe(Consumer {
+            compositeSubscription.add(taskRepository.getTasks(this.classType ?: "", userID).firstElement().subscribe({
                 this.recyclerAdapter?.updateUnfilteredData(it)
                 this.recyclerAdapter?.filter()
             }, RxErrorHandler.handleEmptyError()))
@@ -201,7 +201,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
                     )
                             .delay(1, TimeUnit.SECONDS)
                             .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(Consumer {
+                            .subscribe({
                                 recyclerAdapter?.ignoreUpdates = false
                             }, RxErrorHandler.handleEmptyError()))
                 }
@@ -251,19 +251,19 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         allowReordering()
 
         if (this.classType != null) {
-            recyclerAdapter?.errorButtonEvents?.subscribe(Consumer {
-                taskRepository.syncErroredTasks().subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+            recyclerAdapter?.errorButtonEvents?.subscribe({
+                taskRepository.syncErroredTasks().subscribe({}, RxErrorHandler.handleEmptyError())
             }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
-            recyclerAdapter?.taskOpenEvents?.subscribeWithErrorHandler(Consumer {
+            recyclerAdapter?.taskOpenEvents?.subscribeWithErrorHandler({
                 openTaskForm(it)
             })?.let { compositeSubscription.add(it) }
             recyclerAdapter?.taskScoreEvents
                     ?.doOnNext { playSound(it.second) }
-                    ?.subscribeWithErrorHandler(Consumer { scoreTask(it.first, it.second) })?.let { compositeSubscription.add(it) }
+                    ?.subscribeWithErrorHandler({ scoreTask(it.first, it.second) })?.let { compositeSubscription.add(it) }
             recyclerAdapter?.checklistItemScoreEvents
                     ?.flatMap { taskRepository.scoreChecklistItem(it.first.id ?: "", it.second.id ?: "")
-                    }?.subscribeWithErrorHandler(Consumer {})?.let { compositeSubscription.add(it) }
-            recyclerAdapter?.brokenTaskEvents?.subscribeWithErrorHandler(Consumer { showBrokenChallengeDialog(it) })?.let { compositeSubscription.add(it) }
+                    }?.subscribeWithErrorHandler({})?.let { compositeSubscription.add(it) }
+            recyclerAdapter?.brokenTaskEvents?.subscribeWithErrorHandler({ showBrokenChallengeDialog(it) })?.let { compositeSubscription.add(it) }
         }
 
         val bottomPadding = (binding.recyclerView.paddingBottom + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 60f, resources.displayMetrics)).toInt()
@@ -285,7 +285,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
 
         if (Task.TYPE_REWARD == className) {
             compositeSubscription.add(taskRepository.getTasks(this.className, userID)
-                    .subscribe(Consumer { recyclerAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ recyclerAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
         }
     }
 
@@ -294,16 +294,16 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
             if (!task.isValid) {
                 return
             }
-            taskRepository.getTasksForChallenge(task.challengeID).subscribe(Consumer { tasks ->
+            taskRepository.getTasksForChallenge(task.challengeID).subscribe({ tasks ->
                 val taskCount = tasks.size
                 val dialog = HabiticaAlertDialog(it)
                 dialog.setTitle(R.string.broken_challenge)
                 dialog.setMessage(it.getString(R.string.broken_challenge_description, taskCount))
                 dialog.addButton(it.getString(R.string.keep_x_tasks, taskCount), true) { _, _ ->
-                    taskRepository.unlinkAllTasks(task.challengeID, "keep-all").subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+                    taskRepository.unlinkAllTasks(task.challengeID, "keep-all").subscribe({}, RxErrorHandler.handleEmptyError())
                 }
                 dialog.addButton(it.getString(R.string.delete_x_tasks, taskCount), false, true) { _, _ ->
-                    taskRepository.unlinkAllTasks(task.challengeID, "remove-all").subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+                    taskRepository.unlinkAllTasks(task.challengeID, "remove-all").subscribe({}, RxErrorHandler.handleEmptyError())
                 }
                 dialog.setExtraCloseButtonVisibility(View.VISIBLE)
                 dialog.show()
@@ -314,7 +314,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
     private fun setEmptyLabels() {
         if (this.classType != null) {
             binding.recyclerView.setEmptyView(binding.emptyView)
-            context?.let { binding.emptyIconView.setColorFilter(ContextCompat.getColor(it, R.color.gray_400), android.graphics.PorterDuff.Mode.MULTIPLY) }
+            context?.let { binding.emptyIconView.setColorFilter(ContextCompat.getColor(it, R.color.text_dimmed), android.graphics.PorterDuff.Mode.MULTIPLY) }
             if (taskFilterHelper.howMany(classType) > 0) {
                 when (this.classType) {
                     Task.TYPE_HABIT -> {
@@ -366,7 +366,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
     private fun scoreTask(task: Task, direction: TaskDirection) {
         compositeSubscription.add(taskRepository.taskChecked(user, task, direction == TaskDirection.UP, false) { result ->
             handleTaskResult(result, task.value.toInt())
-        }.subscribeWithErrorHandler(Consumer {}))
+        }.subscribeWithErrorHandler({}))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -382,7 +382,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         compositeSubscription.add(userRepository.retrieveUser(true, true)
                 .doOnTerminate {
                     binding.refreshLayout.isRefreshing = false
-                }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                }.subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onResume() {
@@ -397,7 +397,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         setEmptyLabels()
 
         if (activeFilter == Task.FILTER_COMPLETED) {
-            compositeSubscription.add(taskRepository.retrieveCompletedTodos(userID).subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(taskRepository.retrieveCompletedTodos(userID).subscribe({}, RxErrorHandler.handleEmptyError()))
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index 3ecedab9e..9135a937f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -171,7 +171,7 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
             val dialog = TaskFilterDialog(it, HabiticaBaseApplication.userComponent)
             if (user != null) {
                 dialog.setTags(user?.tags?.createSnapshot() ?: emptyList())
-                disposable = tagRepository.getTags(user?.id ?: "").subscribe(Consumer {tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
+                disposable = tagRepository.getTags(user?.id ?: "").subscribe({ tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
             }
             dialog.setActiveTags(taskFilterHelper.tags)
             if (activeFragment != null) {
@@ -195,7 +195,7 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
             })
             dialog.setOnDismissListener {
                 if (disposable?.isDisposed == false) {
-                    disposable?.dispose()
+                    disposable.dispose()
                 }
             }
             dialog.show()
@@ -275,7 +275,7 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
         if (bottomNavigation == null) {
             return
         }
-        compositeSubscription.add(tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards")).subscribe(Consumer { tutorialSteps ->
+        compositeSubscription.add(tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards")).subscribe({ tutorialSteps ->
             val activeTutorialFragments = ArrayList<String>()
             for (step in tutorialSteps) {
                 var id = -1
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
index 57408da6a..ea972706a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
@@ -14,9 +14,9 @@ class MarginDecoration(context: Context?, noMarginViewTypes: Set<Int> = setOf())
         val position = parent.getChildAdapterPosition(view)
         val viewType: Int? = parent.adapter?.getItemViewType(position)
         if (noMarginViewTypes.contains(viewType)) {
-            outRect.setEmpty();
+            outRect.setEmpty()
         } else {
-            outRect.set(margin, margin, margin, margin);
+            outRect.set(margin, margin, margin, margin)
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt
index 8495528fa..39dfcc69a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt
@@ -33,15 +33,15 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
 
     var skipAnimations: Boolean = false
 
-    private class MoveInfo internal constructor(var holder: RecyclerView.ViewHolder?, internal var fromX: Int, internal var fromY: Int, internal var toX: Int, internal var toY: Int)
+    private class MoveInfo(var holder: RecyclerView.ViewHolder?, var fromX: Int, var fromY: Int, var toX: Int, var toY: Int)
 
-    private class ChangeInfo private constructor(internal var oldHolder: RecyclerView.ViewHolder?, internal var newHolder: RecyclerView.ViewHolder?) {
-        internal var fromX: Int = 0
-        internal var fromY: Int = 0
-        internal var toX: Int = 0
-        internal var toY: Int = 0
+    private class ChangeInfo private constructor(var oldHolder: RecyclerView.ViewHolder?, var newHolder: RecyclerView.ViewHolder?) {
+        var fromX: Int = 0
+        var fromY: Int = 0
+        var toX: Int = 0
+        var toY: Int = 0
 
-        internal constructor(oldHolder: RecyclerView.ViewHolder, newHolder: RecyclerView.ViewHolder,
+        constructor(oldHolder: RecyclerView.ViewHolder, newHolder: RecyclerView.ViewHolder,
                              fromX: Int, fromY: Int, toX: Int, toY: Int) : this(oldHolder, newHolder) {
             this.fromX = fromX
             this.fromY = fromY
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 0400c5f15..9dac2464a 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
@@ -43,7 +43,7 @@ class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject
             val drawable = BitmapDrawable(itemView.context.resources, if (owned) it else it.extractAlpha())
             Observable.just(drawable)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(Consumer {
+                    .subscribe({
                         binding.imageView.background = drawable
                     }, RxErrorHandler.handleEmptyError())
         }
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 aa50fbd51..0a9f1430f 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
@@ -68,7 +68,7 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<S
         binding.titleTextView.visibility = View.GONE
 
         val imageName = "stable_Pet-${item.animal}-${item.color}"
-        itemView.setBackgroundResource(R.drawable.layout_rounded_bg_gray_700)
+        itemView.setBackgroundResource(R.drawable.layout_rounded_bg_window)
         if (trained > 0) {
             if (this.canRaiseToMount) {
                 binding.trainedProgressBar.visibility = View.VISIBLE
@@ -83,7 +83,7 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<S
                 binding.imageView.visibility = View.GONE
                 binding.itemWrapper.visibility = View.VISIBLE
                 binding.checkmarkView.visibility = View.VISIBLE
-                itemView.setBackgroundResource(R.drawable.layout_rounded_bg_gray_700_brand_border)
+                itemView.setBackgroundResource(R.drawable.layout_rounded_bg_window_tint_border)
                 DataBindingUtils.loadImage(binding.eggView, "Pet_Egg_${item.animal}")
                 DataBindingUtils.loadImage(binding.hatchingPotionView, "Pet_HatchingPotion_${item.color}")
             }
@@ -98,7 +98,7 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<S
             val drawable = BitmapDrawable(resources, if (trained  == 0) it.extractAlpha() else it)
             Observable.just(drawable)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(Consumer {
+                    .subscribe({
                         binding.imageView.background = drawable
                     }, RxErrorHandler.handleEmptyError())
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index 3484348c4..7808e640e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.bindView
@@ -30,10 +31,6 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
 
     private var context: Context = itemView.context
 
-    private var lockedDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLocked())
-    private var limitedDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLimited())
-    private var countDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorNumber())
-
     var purchaseCardAction: ((ShopItem) -> Unit)? = null
 
     var itemCount = 0
@@ -41,7 +38,11 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
         field = value
         if (value > 0) {
             itemDetailIndicator.text = value.toString()
-            itemDetailIndicator.background = countDrawable
+            itemDetailIndicator.background = if (context.isUsingNightModeResources()) {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorNumberDark())
+            } else {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorNumber())
+            }
             itemDetailIndicator.visibility = View.VISIBLE
         }
     }
@@ -76,20 +77,20 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
             }
             priceLabel.visibility = View.VISIBLE
             unlockLabel.visibility = View.GONE
-            if (item.locked) {
-                itemDetailIndicator.background = lockedDrawable
-                itemDetailIndicator.visibility = View.VISIBLE
-            }
         } else {
             unlockLabel.text = lockedReason
             priceLabel.visibility = View.GONE
             unlockLabel.visibility = View.VISIBLE
-            itemDetailIndicator.background = lockedDrawable
-            itemDetailIndicator.visibility = View.VISIBLE
         }
-
-        if (item.isLimited) {
-            itemDetailIndicator.background = limitedDrawable
+        if (item.locked) {
+            itemDetailIndicator.background = if (context.isUsingNightModeResources()) {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLockedDark())
+            } else {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLocked())
+            }
+            itemDetailIndicator.visibility = View.VISIBLE
+        } else if (item.isLimited) {
+            itemDetailIndicator.background = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLimited())
             itemDetailIndicator.visibility = View.VISIBLE
         }
 
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 22913a83d..a9d83eef5 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
@@ -5,6 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -40,7 +41,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
     private val expandNotesButton: Button? by bindOptionalView(R.id.expand_notes_button)
     private val syncingView: ProgressBar? by bindOptionalView(R.id.syncing_view)
     private val errorIconView: ImageButton? by bindOptionalView(R.id.error_icon)
-    protected val taskGray: Int by bindColor(itemView.context, R.color.gray_600)
+    protected val taskGray: Int by bindColor(itemView.context, R.color.offset_background)
     protected val streakTextView: TextView by bindView(itemView, R.id.streakTextView)
     protected val reminderTextView: TextView by bindView(itemView, R.id.reminder_textview)
 
@@ -115,7 +116,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
 
     override fun bind(data: Task, position: Int, displayMode: String) {
         task = data
-        itemView.setBackgroundResource(R.color.white)
+        itemView.setBackgroundColor(context.getThemeColor(R.attr.colorContentBackground))
 
         expandNotesButton?.visibility = View.GONE
         notesExpanded = false
@@ -138,7 +139,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
                             .map { MarkdownParser.parseMarkdown(it) }
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(Consumer{ parsedText ->
+                            .subscribe({ parsedText ->
                                 data.parsedText = parsedText
                                 titleTextView.setParsedMarkdown(parsedText)
                             }, RxErrorHandler.handleEmptyError())
@@ -157,7 +158,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
                                     .map { MarkdownParser.parseMarkdown(it) }
                                     .subscribeOn(Schedulers.io())
                                     .observeOn(AndroidSchedulers.mainThread())
-                                    .subscribe(Consumer { parsedNotes ->
+                                    .subscribe({ parsedNotes ->
                                         notesTextView?.text = parsedNotes
                                         notesTextView?.setParsedMarkdown(parsedNotes)
                                     }, RxErrorHandler.handleEmptyError())
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 31e708a93..b9c1e4a53 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
@@ -12,6 +12,8 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
@@ -51,7 +53,7 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
             this.checkboxHolder.setBackgroundResource(newTask.lightTaskColor)
         } else {
             if (newTask.completed) {
-                this.checkboxHolder.setBackgroundResource(R.color.gray_700)
+                this.checkboxHolder.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
             } else {
                 this.checkboxHolder.setBackgroundColor(this.taskGray)
             }
@@ -88,7 +90,7 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
                                 .map { MarkdownParser.parseMarkdown(it) }
                                 .subscribeOn(Schedulers.io())
                                 .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe(Consumer<CharSequence> { textView?.text = it }, RxErrorHandler.handleEmptyError())
+                                .subscribe({ textView?.text = it }, RxErrorHandler.handleEmptyError())
                     }
                     val checkmark = itemView?.findViewById<ImageView>(R.id.checkmark)
                     checkmark?.drawable?.setTintMode(PorterDuff.Mode.SRC_ATOP)
@@ -98,11 +100,11 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
                         task?.let { scoreChecklistItemFunc(it, item) }
                     }
                     val color = ContextCompat.getColor(context, if (task?.completed == true || (task?.type == Task.TYPE_DAILY && task?.isDue == false)) {
-                        checkmark?.drawable?.setTint(ContextCompat.getColor(context, R.color.gray_400))
-                        R.color.gray_600
+                        checkmark?.drawable?.setTint(ContextCompat.getColor(context, R.color.text_dimmed))
+                        R.color.offset_background
                     } else {
-                        checkmark?.drawable?.setTint(ContextCompat.getColor(context, task?.darkTaskColor ?: R.color.gray_400))
-                        task?.extraLightTaskColor ?: R.color.gray_600
+                        checkmark?.drawable?.setTint(ContextCompat.getColor(context, task?.darkTaskColor ?: R.color.text_dimmed))
+                        task?.extraLightTaskColor ?: R.color.offset_background
                     })
                     color.let { checkboxHolder?.setBackgroundColor(it) }
                     this.checklistView.addView(itemView)
@@ -118,14 +120,22 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
     protected fun setChecklistIndicatorBackgroundActive(isActive: Boolean) {
         val drawable = ContextCompat.getDrawable(context, R.drawable.checklist_indicator_background)
         if (isActive) {
-            drawable?.setTint(ContextCompat.getColor(context, R.color.gray_200))
-            val textColor = ContextCompat.getColor(context, R.color.gray_500)
+            if (context.isUsingNightModeResources()) {
+                drawable?.setTint(ContextCompat.getColor(context, R.color.gray_100))
+            } else {
+                drawable?.setTint(ContextCompat.getColor(context, R.color.gray_200))
+            }
+            val textColor = if (context.isUsingNightModeResources()) {
+                ContextCompat.getColor(context, R.color.gray_10)
+            } else {
+                ContextCompat.getColor(context, R.color.gray_500)
+            }
             checklistCompletedTextView.setTextColor(textColor)
             checklistAllTextView.setTextColor(textColor)
             checklistDivider.setBackgroundColor(textColor)
         } else {
-            drawable?.setTint(ContextCompat.getColor(context, R.color.gray_600))
-            val textColor = ContextCompat.getColor(context, R.color.gray_300)
+            drawable?.setTint(ContextCompat.getColor(context, R.color.offset_background))
+            val textColor = ContextCompat.getColor(context, R.color.text_ternary)
             checklistCompletedTextView.setTextColor(textColor)
             checklistAllTextView.setTextColor(textColor)
             checklistDivider.setBackgroundColor(textColor)
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 ad9f08f4c..0fab12af0 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
@@ -8,6 +8,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.bindView
@@ -29,13 +30,18 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
     override fun bind(data: Task, position: Int, displayMode: String) {
         this.task = data
         if (data.up == true) {
-            this.btnPlusWrapper.setBackgroundResource(data.lightTaskColor)
             val plusIcon = ContextCompat.getDrawable(context, R.drawable.habit_plus)
             plusIcon?.setTint(ContextCompat.getColor(context, R.color.white))
             plusIcon?.setTintMode(PorterDuff.Mode.MULTIPLY)
             this.btnPlusIconView.setImageDrawable(plusIcon)
             val drawable = ContextCompat.getDrawable(context, R.drawable.habit_circle)
-            drawable?.setTint(ContextCompat.getColor(context, data.mediumTaskColor))
+            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))
+            }
             drawable?.setTintMode(PorterDuff.Mode.MULTIPLY)
             btnPlusIconView.background = drawable
             this.btnPlus.visibility = View.VISIBLE
@@ -43,7 +49,7 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         } 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.gray_500))
+            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)
@@ -58,7 +64,13 @@ 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)
-            drawable?.setTint(ContextCompat.getColor(context, data.mediumTaskColor))
+            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))
+            }
             drawable?.setTintMode(PorterDuff.Mode.MULTIPLY)
             btnMinusIconView.background = drawable
             this.btnMinus.visibility = View.VISIBLE
@@ -66,7 +78,7 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         } 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.gray_500))
+            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)
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 db10a658d..c709c3f1d 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
@@ -51,7 +51,7 @@ class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) ->
             dialog.setImage("shop_" + this.task?.id)
             dialog.setCurrency("gold")
             dialog.setValue(task?.value)
-            dialog.setBuyListener( DialogInterface.OnClickListener { _, _ -> this.buyReward() })
+            dialog.setBuyListener({ _, _ -> this.buyReward() })
             dialog.show()
         } else {
             super.onClick(v)
@@ -75,8 +75,8 @@ class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) ->
             buyButton.setBackgroundColor(ContextCompat.getColor(context, R.color.yellow_500))
         } else {
             goldIconView.alpha = 0.6f
-            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_300))
-            buyButton.setBackgroundColor(ColorUtils.setAlphaComponent(ContextCompat.getColor(context, R.color.gray_600), 127))
+            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
+            buyButton.setBackgroundColor(ColorUtils.setAlphaComponent(ContextCompat.getColor(context, R.color.offset_background), 127))
         }
         streakTextView.visibility = View.GONE
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
index cc54f41e8..d0e9d4385 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
@@ -40,10 +40,10 @@ abstract class BaseViewModel: ViewModel() {
     fun getUserData(): LiveData<User?> = user
 
     private fun loadUserFromLocal() {
-        disposable.add(userRepository.getUser().observeOn(AndroidSchedulers.mainThread()).subscribe(Consumer { user.value = it }, RxErrorHandler.handleEmptyError()))
+        disposable.add(userRepository.getUser().observeOn(AndroidSchedulers.mainThread()).subscribe({ user.value = it }, RxErrorHandler.handleEmptyError()))
     }
 
     fun updateUser(path: String, value: Any) {
-        disposable.add(userRepository.updateUser(getUserData().value, path, value).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        disposable.add(userRepository.updateUser(getUserData().value, path, value).subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
index 61e07998b..5ecefc734 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
@@ -80,7 +80,7 @@ open class GroupViewModel : BaseViewModel() {
         } }
                 .filter { it.isNotEmpty() }
                 .flatMapPublisher { userRepository.readNotification(it.first().id) }
-                .subscribe(Consumer {
+                .subscribe({
                 }, RxErrorHandler.handleEmptyError()))
     }
 
@@ -101,7 +101,7 @@ open class GroupViewModel : BaseViewModel() {
                 .flatMap { socialRepository.getGroup(it) }
                 .map { socialRepository.getUnmanagedCopy(it) }
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer { group.value = it }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ group.value = it }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun loadLeaderFromLocal() {
@@ -111,7 +111,7 @@ open class GroupViewModel : BaseViewModel() {
                 .distinctUntilChanged { group1, group2 -> group1.id == group2.id }
                 .flatMap { socialRepository.getMember(it.leaderID) }
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer { leader.value = it }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ leader.value = it }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun loadMembershipFromLocal() {
@@ -119,7 +119,7 @@ open class GroupViewModel : BaseViewModel() {
                 .filterOptionalDoOnEmpty { isMemberData.value = null }
                 .flatMap { socialRepository.getGroupMemberships() }
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer {
+                .subscribe({
                     isMemberData.value = it.firstOrNull { membership -> membership.groupID == groupID } != null
                 }, RxErrorHandler.handleEmptyError()))
     }
@@ -138,13 +138,13 @@ open class GroupViewModel : BaseViewModel() {
                         socialRepository.retrieveGroupMembers(group1.id, true)
                     }
                     .doOnComplete { function?.invoke() }
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
     }
 
     fun inviteToGroup(inviteData: HashMap<String, Any>) {
         disposable.add(socialRepository.inviteToGroup(group.value?.id ?: "", inviteData)
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     fun updateOrCreateGroup(bundle: Bundle?) {
@@ -160,27 +160,27 @@ open class GroupViewModel : BaseViewModel() {
                     bundle?.getString("description"),
                     bundle?.getString("leader"),
                     bundle?.getBoolean("leaderCreateChallenge"))
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
     }
 
     fun leaveGroup(keepChallenges: Boolean = true, function: (() -> Unit)? = null) {
         disposable.add(socialRepository.leaveGroup(this.group.value?.id ?: "", keepChallenges)
                 .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
-                .subscribe(Consumer {
+                .subscribe({
                     function?.invoke()
                 }, RxErrorHandler.handleEmptyError()))
     }
 
     fun joinGroup(id: String? = null, function: (() -> Unit)? = null) {
-        disposable.add(socialRepository.joinGroup(id ?: groupID).subscribe(Consumer {
+        disposable.add(socialRepository.joinGroup(id ?: groupID).subscribe({
             function?.invoke()
         }, RxErrorHandler.handleEmptyError()))
     }
 
     fun rejectGroupInvite(id: String? = null) {
         groupID?.let {
-            disposable.add(socialRepository.rejectGroupInvite(id ?: it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+            disposable.add(socialRepository.rejectGroupInvite(id ?: it).subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
     }
 
@@ -193,11 +193,11 @@ open class GroupViewModel : BaseViewModel() {
     }
 
     fun likeMessage(message: ChatMessage) {
-        disposable.add(socialRepository.likeMessage(message).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        disposable.add(socialRepository.likeMessage(message).subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     fun deleteMessage(chatMessage: ChatMessage) {
-        disposable.add(socialRepository.deleteMessage(chatMessage).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        disposable.add(socialRepository.deleteMessage(chatMessage).subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     fun postGroupChat(chatText: String, onComplete: () -> Unit, onError: () -> Unit) {
@@ -217,7 +217,7 @@ open class GroupViewModel : BaseViewModel() {
             onComplete()
             return
         }
-        disposable.add(socialRepository.retrieveGroupChat(groupID).subscribe(Consumer {
+        disposable.add(socialRepository.retrieveGroupChat(groupID).subscribe({
             onComplete()
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -228,6 +228,6 @@ open class GroupViewModel : BaseViewModel() {
                 bundle?.getString("description"),
                 bundle?.getString("leader"),
                 bundle?.getBoolean("leaderOnlyChallenges"))
-                .subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+                .subscribe({}, RxErrorHandler.handleEmptyError()))
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
index bb1f81a9b..0ce1eaae8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
@@ -49,7 +49,7 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
                 .filterOptionalDoOnEmpty { member.value = null }
                 .flatMap { socialRepository.getMember(it) }
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer { member.value = it }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ member.value = it }, RxErrorHandler.handleEmptyError()))
     }
 
     protected var memberIDSubject = BehaviorSubject.create<Optional<String>>()
@@ -76,7 +76,7 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
             setMemberID(recipientID)
             loadMemberFromLocal()
         } else if (recipientUsername?.isNotBlank() == true) {
-            socialRepository.getMemberWithUsername(recipientUsername).subscribe(Consumer {
+            socialRepository.getMemberWithUsername(recipientUsername).subscribe({
                 setMemberID(it.id ?: "")
                 member.value = it
                 dataSourceFactory.updateRecipientID(memberIDSubject.value?.value)
@@ -98,7 +98,7 @@ private class MessagesDataSource(val socialRepository: SocialRepository, var rec
             if (recipientID?.isNotBlank() != true) { return@launch }
             val page = ceil(params.startPosition.toFloat() / params.loadSize.toFloat()).toInt()
             socialRepository.retrieveInboxMessages(recipientID ?: "", page)
-                    .subscribe(Consumer {
+                    .subscribe({
                         if (it.size != 10) lastFetchWasEnd = true
                         callback.onResult(it)
                     }, RxErrorHandler.handleEmptyError())
@@ -122,7 +122,7 @@ private class MessagesDataSource(val socialRepository: SocialRepository, var rec
                             Flowable.just(it)
                         }
                     }
-                    .subscribe(Consumer {
+                    .subscribe({
                         callback.onResult(it, 0)
                     }, RxErrorHandler.handleEmptyError())
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
index c426e2f04..8154ee00d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
@@ -55,7 +55,7 @@ open class NotificationsViewModel : BaseViewModel() {
         customNotifications.onNext(emptyList())
 
         disposable.add(userRepository.getUser()
-                .subscribe(Consumer {
+                .subscribe({
                     party = it.party
                     var notifications = convertInvitationsToNotifications(it)
                     if (it.flags?.newStuff == true) {
@@ -181,7 +181,7 @@ open class NotificationsViewModel : BaseViewModel() {
         }
 
         disposable.add(userRepository.readNotification(notification.id)
-                .subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+                .subscribe({}, RxErrorHandler.handleEmptyError()))
     }
 
     fun dismissAllNotifications(notifications: List<Notification>) {
@@ -198,7 +198,7 @@ open class NotificationsViewModel : BaseViewModel() {
         notificationIds["notificationIds"] = dismissableIds
 
         disposable.add(userRepository.readNotifications(notificationIds)
-                .subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+                .subscribe({}, RxErrorHandler.handleEmptyError()))
     }
 
     fun markNotificationsAsSeen(notifications: List<Notification>) {
@@ -215,7 +215,7 @@ open class NotificationsViewModel : BaseViewModel() {
         notificationIds["notificationIds"] = unseenIds
 
         disposable.add(userRepository.seeNotifications(notificationIds)
-                .subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
+                .subscribe({}, RxErrorHandler.handleEmptyError()))
     }
 
     private fun findNotification(id: String): Notification? {
@@ -315,7 +315,7 @@ open class NotificationsViewModel : BaseViewModel() {
         groupId?.let {
             disposable.add(socialRepository.joinGroup(it)
                     .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(Consumer {
+                    .subscribe({
                         refreshNotifications()
                     }, RxErrorHandler.handleEmptyError()))
         }
@@ -325,7 +325,7 @@ open class NotificationsViewModel : BaseViewModel() {
         groupId?.let {
             disposable.add(socialRepository.rejectGroupInvite(it)
                     .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(Consumer {
+                    .subscribe({
                         refreshNotifications()
                     }, RxErrorHandler.handleEmptyError()))
         }
@@ -335,7 +335,7 @@ open class NotificationsViewModel : BaseViewModel() {
         party?.id?.let {
             disposable.add(socialRepository.acceptQuest(null, it)
                     .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(Consumer {
+                    .subscribe({
                         refreshNotifications()
                     }, RxErrorHandler.handleEmptyError()))
         }
@@ -345,7 +345,7 @@ open class NotificationsViewModel : BaseViewModel() {
         party?.id?.let {
             disposable.add(socialRepository.rejectQuest(null, it)
                     .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(Consumer {
+                    .subscribe({
                         refreshNotifications()
                     }, RxErrorHandler.handleEmptyError()))
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
index f916b9318..69e19c054 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
@@ -42,14 +42,14 @@ class PartyViewModel: GroupViewModel() {
                 .filterOptionalDoOnEmpty { members.value = null }
                 .flatMap { socialRepository.getGroupMembers(it) }
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer { members.value = it }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ members.value = it }, RxErrorHandler.handleEmptyError()))
     }
 
     fun acceptQuest() {
         groupIDSubject.value?.value?.let {
             disposable.add(socialRepository.acceptQuest(null, it)
                     .flatMap { userRepository.retrieveUser() }
-                    .subscribe(Consumer {
+                    .subscribe({
                         val event = ShowSnackbarEvent()
                         event.type = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
                         event.text = "Quest invitation accepted"
@@ -62,7 +62,7 @@ class PartyViewModel: GroupViewModel() {
         groupIDSubject.value?.value?.let {
             disposable.add(socialRepository.rejectQuest(null, it)
                     .flatMap { userRepository.retrieveUser() }
-                    .subscribe(Consumer {
+                    .subscribe({
                         val event = ShowSnackbarEvent()
                         event.type = HabiticaSnackbar.SnackbarDisplayType.FAILURE
                         event.text = "Quest invitation rejected"
@@ -80,7 +80,7 @@ class PartyViewModel: GroupViewModel() {
         disposable.add(userRepository.getUser()
                 .map { it.party?.id ?: "" }
                 .distinctUntilChanged()
-                .subscribe(Consumer { groupID ->
+                .subscribe({ groupID ->
                     setGroupID(groupID)
                 }, RxErrorHandler.handleEmptyError()))
     }
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 792c224f3..4ffa6fb0e 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
@@ -9,6 +9,7 @@ import android.view.Gravity
 import android.view.View
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.NumberAbbreviator
 
 class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
@@ -34,7 +35,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
         lightBackground = try {
             attributes?.getBoolean(R.styleable.CurrencyView_hasLightBackground, true) ?: true
         } catch (_: ArrayIndexOutOfBoundsException) {
-            true
+            !context.isUsingNightModeResources()
         }
         visibility = GONE
     }
@@ -110,7 +111,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
         if (field != value) {
             field = value
             if (isLocked) {
-                this.setTextColor(ContextCompat.getColor(context, R.color.gray_300))
+                this.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
                 drawable?.alpha = 127
             } else {
                 drawable?.alpha = 255
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 cdd4bd92c..32f0a7a10 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
@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.util.TypedValue
 import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 
 class CurrencyViews : LinearLayout {
     var lightBackground: Boolean = false
@@ -35,7 +36,8 @@ class CurrencyViews : LinearLayout {
                 R.styleable.CurrencyViews,
                 0, 0)
         setupViews()
-        lightBackground = attributes?.getBoolean(R.styleable.CurrencyViews_hasLightBackground, true) ?: true
+        val fallBackLight = !(context?.isUsingNightModeResources() == true)
+        lightBackground = attributes?.getBoolean(R.styleable.CurrencyViews_hasLightBackground, fallBackLight) ?: fallBackLight
     }
 
     constructor(context: Context?) : super(context) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
index 6106117fe..5b73c9e26 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
@@ -81,7 +81,7 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
         /**
          * If non-null, a reference to an on-going position animation.
          */
-        internal var swapAnimation: ValueAnimator? = null
+        var swapAnimation: ValueAnimator? = null
 
         fun endExistingAnimation() {
             swapAnimation?.end()
@@ -103,18 +103,18 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
      *  * if gesture ends without drag, or settling finishes, #stopDetecting - #detecting == false
      */
     private inner class DragItem {
-        internal var view: View? = null
+        var view: View? = null
         private var startVisibility: Int = 0
-        internal var viewDrawable: BitmapDrawable? = null
-        internal var position: Int = 0
-        internal var startTop: Int = 0
-        internal var height: Int = 0
-        internal var totalDragOffset: Int = 0
-        internal var targetTopOffset: Int = 0
-        internal var settleAnimation: ValueAnimator? = null
+        var viewDrawable: BitmapDrawable? = null
+        var position: Int = 0
+        var startTop: Int = 0
+        var height: Int = 0
+        var totalDragOffset: Int = 0
+        var targetTopOffset: Int = 0
+        var settleAnimation: ValueAnimator? = null
 
-        internal var detecting: Boolean = false
-        internal var dragging: Boolean = false
+        var detecting: Boolean = false
+        var dragging: Boolean = false
 
         init {
             stopDetecting()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
index 2c1f85505..68f03e979 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
@@ -27,7 +27,7 @@ import android.content.res.AssetManager;
 
 
 /**
- * Created by Phillip Thelen on 1. Sep 2020.
+ * Created by Phillip Thelen on 4. Sep 2020.
  * Copyright © 2020 HabitRPG Inc.. All rights reserved.
  *
  * Generated by PaintCode
@@ -96,13 +96,13 @@ public class HabiticaIcons {
         Paint paint = CacheForHeart.paint;
         
         // Local Colors
-        int fillColor3 = Color.argb(128, 255, 255, 255);
         int heartLightBackground = Color.argb(255, 247, 78, 82);
-        int heartDarkBackground = Color.argb(178, 255, 255, 255);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor2 = Color.argb(255, 255, 97, 101);
         int fillColor6 = Color.argb(128, 181, 36, 40);
         int fillColor4 = Color.argb(89, 181, 36, 40);
-        int fillColor2 = Color.argb(255, 255, 97, 101);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
+        int heartDarkBackground = Color.argb(178, 255, 255, 255);
         
         // Local Variables
         int expression = darkBackground ? heartDarkBackground : heartLightBackground;
@@ -378,8 +378,8 @@ public class HabiticaIcons {
         // Local Colors
         int fillColor11 = Color.argb(64, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
-        int fillColor10 = Color.argb(255, 255, 166, 35);
         int fillColor12 = Color.argb(128, 191, 125, 26);
+        int fillColor10 = Color.argb(255, 255, 166, 35);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
@@ -607,10 +607,10 @@ public class HabiticaIcons {
         Paint paint = CacheForMagic.paint;
         
         // Local Colors
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor9 = Color.argb(64, 31, 112, 154);
         int fillColor8 = Color.argb(255, 80, 181, 233);
         int fillColor7 = Color.argb(255, 41, 149, 205);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
@@ -758,11 +758,11 @@ public class HabiticaIcons {
         Paint paint = CacheForGold.paint;
         
         // Local Colors
-        int fillColor5 = Color.argb(64, 255, 255, 255);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor10 = Color.argb(255, 255, 166, 35);
-        int fillColor12 = Color.argb(128, 191, 125, 26);
         int fillColor13 = Color.argb(191, 191, 125, 26);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor12 = Color.argb(128, 191, 125, 26);
+        int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -913,9 +913,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor15 = Color.argb(89, 27, 153, 107);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor14 = Color.argb(255, 36, 204, 143);
         int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -1121,10 +1121,10 @@ public class HabiticaIcons {
         Paint paint = CacheForHourglass.paint;
         
         // Local Colors
-        int fillColor17 = Color.argb(230, 255, 255, 255);
-        int fillColor16 = Color.argb(204, 169, 220, 246);
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor19 = Color.argb(255, 79, 42, 147);
+        int fillColor17 = Color.argb(230, 255, 255, 255);
+        int fillColor16 = Color.argb(204, 169, 220, 246);
         
         // Resize to Target Frame
         canvas.save();
@@ -1539,14 +1539,14 @@ public class HabiticaIcons {
         Paint paint = CacheForWarrior.paint;
         
         // Local Colors
-        int fillColor43 = Color.argb(255, 200, 43, 43);
-        int fillColor22 = Color.argb(255, 242, 123, 134);
-        int fillColor20 = Color.argb(255, 255, 181, 183);
-        int fillColor42 = Color.argb(255, 255, 149, 152);
-        int fillColor21 = Color.argb(255, 255, 182, 184);
         int fillColor23 = Color.argb(255, 229, 65, 77);
-        int fillColor41 = Color.argb(255, 255, 149, 152);
+        int fillColor21 = Color.argb(255, 255, 182, 184);
         int fillColor = Color.argb(255, 240, 97, 102);
+        int fillColor22 = Color.argb(255, 242, 123, 134);
+        int fillColor41 = Color.argb(255, 255, 149, 152);
+        int fillColor20 = Color.argb(255, 255, 181, 183);
+        int fillColor43 = Color.argb(255, 200, 43, 43);
+        int fillColor42 = Color.argb(255, 255, 149, 152);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -2713,10 +2713,10 @@ public class HabiticaIcons {
     
     public static void drawDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float difficulty) {
         // Local Variables
-        float _4StarDifficulty = difficulty >= 4f ? 1f : (difficulty >= 3.5f ? 0.5f : 0f);
-        float _1StarDifficulty = difficulty >= 1f ? 1f : (difficulty >= 0.5f ? 0.5f : 0f);
-        float _3StarDifficulty = difficulty >= 3f ? 1f : (difficulty >= 2.5f ? 0.5f : 0f);
         float _2StarDifficulty = difficulty >= 2f ? 1f : (difficulty >= 1.5f ? 0.5f : 0f);
+        float _1StarDifficulty = difficulty >= 1f ? 1f : (difficulty >= 0.5f ? 0.5f : 0f);
+        float _4StarDifficulty = difficulty >= 4f ? 1f : (difficulty >= 3.5f ? 0.5f : 0f);
+        float _3StarDifficulty = difficulty >= 3f ? 1f : (difficulty >= 2.5f ? 0.5f : 0f);
         
         // Resize to Target Frame
         canvas.save();
@@ -2793,8 +2793,8 @@ public class HabiticaIcons {
         Paint paint = CacheForDifficultyStar.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
         int fillColor24 = Color.argb(255, 255, 166, 36);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
         
         // Local Variables
         boolean isHalf = singleDifficulty == 0.5f;
@@ -2903,8 +2903,8 @@ public class HabiticaIcons {
         Paint paint = CacheForStarSmall.paint;
         
         // Local Colors
-        int fillColor26 = Color.argb(102, 229, 220, 255);
         int fillColor27 = Color.argb(255, 229, 220, 255);
+        int fillColor26 = Color.argb(102, 229, 220, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -3046,11 +3046,11 @@ public class HabiticaIcons {
         Paint paint = CacheForStarLarge.paint;
         
         // Local Colors
-        int fillColor27 = Color.argb(255, 229, 220, 255);
         int fillColor28 = Color.argb(64, 229, 220, 255);
         int fillColor31 = Color.argb(191, 229, 220, 255);
-        int fillColor30 = Color.argb(166, 229, 220, 255);
         int fillColor29 = Color.argb(128, 229, 220, 255);
+        int fillColor30 = Color.argb(166, 229, 220, 255);
+        int fillColor27 = Color.argb(255, 229, 220, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -3450,10 +3450,10 @@ public class HabiticaIcons {
         Paint paint = CacheForStarMedium.paint;
         
         // Local Colors
-        int fillColor34 = Color.argb(38, 229, 220, 255);
         int fillColor27 = Color.argb(255, 229, 220, 255);
-        int fillColor33 = Color.argb(77, 229, 220, 255);
         int fillColor32 = Color.argb(153, 229, 220, 255);
+        int fillColor34 = Color.argb(38, 229, 220, 255);
+        int fillColor33 = Color.argb(77, 229, 220, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -3780,8 +3780,8 @@ public class HabiticaIcons {
         Paint paint = CacheForAddRemovePin.paint;
         
         // Local Colors
-        int fillColor2 = Color.argb(255, 255, 97, 101);
         int fillColor36 = Color.argb(255, 97, 51, 180);
+        int fillColor2 = Color.argb(255, 255, 97, 101);
         
         // Local Variables
         int pinColor = addPin ? fillColor36 : fillColor2;
@@ -3980,19 +3980,19 @@ public class HabiticaIcons {
         Paint paint = CacheForItemIndicator.paint;
         
         // Local Colors
-        int fillColor38 = Color.argb(255, 165, 161, 172);
-        int strokeColor2 = Color.argb(255, 189, 168, 255);
-        int indicatorLockedDark = Color.argb(255, 82, 82, 82);
-        int shadowTint = Color.argb(255, 26, 24, 29);
-        int indicatorLocked = Color.argb(255, 237, 236, 238);
-        int strokeColor = Color.argb(255, 97, 51, 180);
         int fillColor39 = Color.argb(255, 189, 168, 255);
+        int fillColor38 = Color.argb(255, 165, 161, 172);
+        int indicatorLocked = Color.argb(255, 237, 236, 238);
+        int indicatorLockedDark = Color.argb(255, 82, 82, 82);
+        int strokeColor = Color.argb(255, 97, 51, 180);
+        int shadowTint = Color.argb(255, 26, 24, 29);
+        int strokeColor2 = Color.argb(255, 189, 168, 255);
         
         // Local Shadows
         PaintCodeShadow shadow = CacheForItemIndicator.shadow.get(PaintCodeColor.colorByChangingAlpha(shadowTint, (int) (Color.alpha(shadowTint) * 0.12f * 255f)), 0f, 1f, 1f);
         
         // Local Variables
-        int itemIndicatorColor = isLocked ? (isDark ? indicatorLockedDark : indicatorLocked) : (isLimited ? strokeColor : fillColor38);
+        int itemIndicatorColor = isLocked ? (isDark ? indicatorLockedDark : indicatorLocked) : (isLimited ? strokeColor : (isDark ? indicatorLockedDark : fillColor38));
         
         // Resize to Target Frame
         canvas.save();
@@ -4121,7 +4121,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorNumber.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, false, true);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, false, false);
         canvas.restore();
         
         canvas.restore();
@@ -4369,13 +4369,13 @@ public class HabiticaIcons {
         Paint paint = CacheForRogue.paint;
         
         // Local Colors
-        int fillColor48 = Color.argb(255, 137, 102, 199);
-        int fillColor45 = Color.argb(255, 155, 129, 226);
+        int fillColor46 = Color.argb(255, 122, 84, 192);
+        int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor36 = Color.argb(255, 97, 51, 180);
+        int fillColor45 = Color.argb(255, 155, 129, 226);
+        int fillColor48 = Color.argb(255, 137, 102, 199);
         int fillColor47 = Color.argb(255, 198, 182, 228);
         int fillColor44 = Color.argb(255, 204, 190, 237);
-        int fillColor19 = Color.argb(255, 79, 42, 147);
-        int fillColor46 = Color.argb(255, 122, 84, 192);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -5166,18 +5166,18 @@ public class HabiticaIcons {
         Paint paint = CacheForHealer.paint;
         
         // Local Colors
-        int fillColor57 = Color.argb(255, 255, 221, 181);
         int fillColor49 = Color.argb(255, 255, 215, 168);
-        int fillColor10 = Color.argb(255, 255, 166, 35);
-        int fillColor56 = Color.argb(255, 255, 166, 35);
-        int fillColor55 = Color.argb(255, 253, 198, 126);
-        int fillColor54 = Color.argb(255, 207, 130, 41);
-        int fillColor53 = Color.argb(255, 206, 129, 41);
-        int fillColor52 = Color.argb(255, 253, 198, 126);
-        int fillColor59 = Color.argb(255, 255, 228, 201);
-        int fillColor51 = Color.argb(255, 229, 144, 37);
-        int fillColor58 = Color.argb(255, 229, 144, 37);
         int fillColor50 = Color.argb(255, 226, 158, 69);
+        int fillColor52 = Color.argb(255, 253, 198, 126);
+        int fillColor58 = Color.argb(255, 229, 144, 37);
+        int fillColor59 = Color.argb(255, 255, 228, 201);
+        int fillColor57 = Color.argb(255, 255, 221, 181);
+        int fillColor53 = Color.argb(255, 206, 129, 41);
+        int fillColor56 = Color.argb(255, 255, 166, 35);
+        int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor55 = Color.argb(255, 253, 198, 126);
+        int fillColor51 = Color.argb(255, 229, 144, 37);
+        int fillColor54 = Color.argb(255, 207, 130, 41);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6003,17 +6003,17 @@ public class HabiticaIcons {
         Paint paint = CacheForMage.paint;
         
         // Local Colors
-        int fillColor61 = Color.argb(255, 39, 138, 191);
+        int fillColor65 = Color.argb(255, 107, 196, 233);
+        int fillColor60 = Color.argb(255, 182, 225, 247);
         int fillColor67 = Color.argb(255, 83, 180, 229);
         int fillColor70 = Color.argb(255, 132, 207, 242);
         int fillColor66 = Color.argb(255, 107, 196, 233);
-        int fillColor63 = Color.argb(255, 42, 160, 207);
-        int fillColor69 = Color.argb(255, 169, 219, 245);
-        int fillColor65 = Color.argb(255, 107, 196, 233);
-        int fillColor64 = Color.argb(255, 77, 178, 214);
         int fillColor62 = Color.argb(255, 83, 180, 229);
-        int fillColor60 = Color.argb(255, 182, 225, 247);
+        int fillColor64 = Color.argb(255, 77, 178, 214);
+        int fillColor61 = Color.argb(255, 39, 138, 191);
+        int fillColor63 = Color.argb(255, 42, 160, 207);
         int fillColor68 = Color.argb(255, 31, 110, 162);
+        int fillColor69 = Color.argb(255, 169, 219, 245);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6573,10 +6573,10 @@ public class HabiticaIcons {
         Paint paint = CacheForHourglassShop.paint;
         
         // Local Colors
-        int fillColor17 = Color.argb(230, 255, 255, 255);
-        int fillColor16 = Color.argb(204, 169, 220, 246);
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor19 = Color.argb(255, 79, 42, 147);
+        int fillColor17 = Color.argb(230, 255, 255, 255);
+        int fillColor16 = Color.argb(204, 169, 220, 246);
         
         // Resize to Target Frame
         canvas.save();
@@ -6824,10 +6824,10 @@ public class HabiticaIcons {
         Paint paint = CacheForAttributeSparklesLeft.paint;
         
         // Local Colors
-        int fillColor71 = Color.argb(255, 80, 181, 233);
-        int fillColor73 = Color.argb(255, 255, 180, 69);
         int fillColor72 = Color.argb(255, 255, 97, 101);
+        int fillColor73 = Color.argb(255, 255, 180, 69);
         int fillColor18 = Color.argb(255, 154, 98, 255);
+        int fillColor71 = Color.argb(255, 80, 181, 233);
         
         // Resize to Target Frame
         canvas.save();
@@ -6950,10 +6950,10 @@ public class HabiticaIcons {
         Paint paint = CacheForAttributeSparklesRight.paint;
         
         // Local Colors
-        int fillColor72 = Color.argb(255, 255, 97, 101);
         int fillColor71 = Color.argb(255, 80, 181, 233);
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor74 = Color.argb(255, 255, 190, 93);
+        int fillColor72 = Color.argb(255, 255, 97, 101);
         
         // Resize to Target Frame
         canvas.save();
@@ -7202,37 +7202,37 @@ public class HabiticaIcons {
         Paint paint = CacheForContributorBadge.paint;
         
         // Local Colors
-        int fillColor76 = Color.argb(255, 255, 182, 184);
-        int fillColor82 = Color.argb(255, 154, 98, 255);
-        int fillColor7 = Color.argb(255, 41, 149, 205);
-        int fillColor2 = Color.argb(255, 255, 97, 101);
-        int strokeColor5 = Color.argb(255, 225, 22, 27);
         int strokeColor12 = Color.argb(255, 0, 87, 55);
-        int strokeColor11 = Color.argb(255, 106, 52, 204);
-        int strokeColor3 = Color.argb(255, 253, 124, 127);
-        int strokeColor8 = Color.argb(255, 28, 163, 114);
-        int strokeColor7 = Color.argb(255, 238, 145, 9);
-        int strokeColor6 = Color.argb(255, 236, 109, 23);
-        int fillColor77 = Color.argb(255, 201, 43, 43);
-        int strokeColor9 = Color.argb(255, 52, 181, 193);
-        int fillColor81 = Color.argb(255, 94, 221, 233);
-        int fillColor80 = Color.argb(255, 63, 218, 162);
-        int fillColor83 = Color.argb(255, 119, 244, 199);
         int strokeColor10 = Color.argb(255, 5, 112, 168);
-        int strokeColor4 = Color.argb(255, 136, 10, 10);
+        int strokeColor7 = Color.argb(255, 238, 145, 9);
+        int fillColor76 = Color.argb(255, 255, 182, 184);
         int fillColor79 = Color.argb(255, 255, 190, 93);
+        int strokeColor5 = Color.argb(255, 225, 22, 27);
+        int strokeColor3 = Color.argb(255, 253, 124, 127);
+        int strokeColor9 = Color.argb(255, 52, 181, 193);
         int fillColor78 = Color.argb(255, 255, 148, 76);
+        int fillColor81 = Color.argb(255, 94, 221, 233);
+        int fillColor83 = Color.argb(255, 119, 244, 199);
+        int fillColor7 = Color.argb(255, 41, 149, 205);
+        int strokeColor6 = Color.argb(255, 236, 109, 23);
+        int fillColor82 = Color.argb(255, 154, 98, 255);
+        int fillColor77 = Color.argb(255, 201, 43, 43);
+        int fillColor80 = Color.argb(255, 63, 218, 162);
+        int fillColor2 = Color.argb(255, 255, 97, 101);
+        int strokeColor4 = Color.argb(255, 136, 10, 10);
+        int strokeColor11 = Color.argb(255, 106, 52, 204);
+        int strokeColor8 = Color.argb(255, 28, 163, 114);
         
         // Local Variables
-        boolean isTier7 = _1 == 7f && !isNPC;
-        boolean isTier8 = _1 == 8f && !isNPC;
         boolean isTier4 = _1 == 4f && !isNPC;
-        boolean isTier3 = _1 == 3f && !isNPC;
-        boolean isTier2 = _1 == 2f && !isNPC;
         boolean isTier5 = _1 == 5f && !isNPC;
+        boolean isTier7 = _1 == 7f && !isNPC;
+        boolean isTier2 = _1 == 2f && !isNPC;
         boolean isTier1 = _1 == 1f && !isNPC;
-        boolean isTier6 = _1 == 6f && !isNPC;
+        boolean isTier3 = _1 == 3f && !isNPC;
+        boolean isTier8 = _1 == 8f && !isNPC;
         boolean isTier9 = _1 == 9f && !isNPC;
+        boolean isTier6 = _1 == 6f && !isNPC;
         
         // Resize to Target Frame
         canvas.save();
@@ -8073,18 +8073,18 @@ public class HabiticaIcons {
         Paint paint = CacheForDamage.paint;
         
         // Local Colors
-        int fillColor89 = Color.argb(255, 227, 143, 61);
-        int fillColor86 = Color.argb(255, 213, 200, 255);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
-        int fillColor84 = Color.argb(255, 240, 97, 102);
-        int fillColor87 = Color.argb(255, 189, 168, 255);
+        int fillColor85 = Color.argb(255, 237, 236, 238);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
         int fillColor40 = Color.argb(255, 165, 161, 172);
-        int fillColor35 = Color.argb(255, 195, 192, 199);
         int fillColor88 = Color.argb(255, 179, 98, 19);
+        int fillColor86 = Color.argb(255, 213, 200, 255);
+        int fillColor89 = Color.argb(255, 227, 143, 61);
+        int fillColor87 = Color.argb(255, 189, 168, 255);
         int fillColor75 = Color.argb(255, 135, 129, 144);
         int fillColor90 = Color.argb(179, 78, 74, 87);
-        int fillColor25 = Color.argb(255, 225, 224, 227);
-        int fillColor85 = Color.argb(255, 237, 236, 238);
+        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int fillColor35 = Color.argb(255, 195, 192, 199);
+        int fillColor84 = Color.argb(255, 240, 97, 102);
         
         // Resize to Target Frame
         canvas.save();
@@ -8963,12 +8963,12 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor93 = Color.argb(255, 244, 120, 37);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor15 = Color.argb(89, 27, 153, 107);
-        int fillColor92 = Color.argb(255, 90, 228, 178);
         int fillColor94 = Color.argb(89, 180, 89, 27);
+        int fillColor92 = Color.argb(255, 90, 228, 178);
         int fillColor14 = Color.argb(255, 36, 204, 143);
         int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor15 = Color.argb(89, 27, 153, 107);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -9276,10 +9276,10 @@ public class HabiticaIcons {
     
     public static void drawTaskDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, float difficulty, boolean isActive) {
         // Local Variables
+        boolean isTrivial = difficulty == 0.1f;
         boolean isHard = difficulty == 2f;
         boolean isMedium = difficulty == 1.5f;
         boolean isEasy = difficulty == 1f;
-        boolean isTrivial = difficulty == 0.1f;
         
         // Resize to Target Frame
         canvas.save();
@@ -9433,8 +9433,8 @@ public class HabiticaIcons {
         int strokeColor15 = Color.argb(255, 195, 192, 199);
         
         // Local Variables
-        int borderColor = isActive ? taskTintColor : strokeColor15;
         int starFillColor = isActive ? taskTintColor : transparent;
+        int borderColor = isActive ? taskTintColor : strokeColor15;
         
         // Resize to Target Frame
         canvas.save();
@@ -9503,8 +9503,8 @@ public class HabiticaIcons {
         
         // Local Variables
         int borderColor = isActive ? taskTintColor : strokeColor15;
-        int controlFillColor = isActive ? fillColor37 : strokeColor15;
         int starFillColor = isActive ? taskTintColor : transparent;
+        int controlFillColor = isActive ? fillColor37 : strokeColor15;
         
         // Resize to Target Frame
         canvas.save();
@@ -9591,8 +9591,8 @@ public class HabiticaIcons {
         
         // Local Variables
         int borderColor = isActive ? taskTintColor : strokeColor15;
-        int controlFillColor = isActive ? fillColor37 : strokeColor15;
         int starFillColor = isActive ? taskTintColor : transparent;
+        int controlFillColor = isActive ? fillColor37 : strokeColor15;
         
         // Resize to Target Frame
         canvas.save();
@@ -9849,33 +9849,33 @@ public class HabiticaIcons {
         GlobalCache.initializeTypefaceBuilders(context.getAssets());
         
         // Local Colors
-        int crestGold1 = Color.argb(255, 255, 188, 90);
-        int crestBronze6 = Color.argb(255, 179, 98, 19);
-        int crestGold2 = Color.argb(255, 255, 210, 145);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestSilver3 = Color.argb(255, 141, 141, 141);
         int crestGold6 = Color.argb(255, 223, 145, 30);
-        int crestBronze2 = Color.argb(255, 244, 165, 89);
-        int crestBronze3 = Color.argb(255, 179, 98, 19);
-        int crestBronze4 = Color.argb(255, 215, 122, 32);
-        int crestSilver1 = Color.argb(255, 194, 194, 194);
-        int crestSilver6 = Color.argb(255, 141, 141, 141);
-        int crestBronze5 = Color.argb(255, 179, 98, 19);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
         int crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
-        int crestBronze1 = Color.argb(255, 234, 140, 49);
         int crestGold5 = Color.argb(255, 223, 145, 30);
-        int crestSilver5 = Color.argb(255, 141, 141, 141);
         int crestGold3 = Color.argb(255, 223, 145, 30);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestSilver1 = Color.argb(255, 194, 194, 194);
+        int crestGold2 = Color.argb(255, 255, 210, 145);
+        int crestBronze6 = Color.argb(255, 179, 98, 19);
+        int crestBronze3 = Color.argb(255, 179, 98, 19);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
+        int crestGold1 = Color.argb(255, 255, 188, 90);
+        int crestBronze5 = Color.argb(255, 179, 98, 19);
+        int crestSilver5 = Color.argb(255, 141, 141, 141);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
         
         // Local Variables
-        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
-        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
         int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
-        boolean isPrivate = !isPublic;
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
-        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
         int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
+        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
+        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
+        boolean isPrivate = !isPublic;
+        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
         
         // Resize to Target Frame
         canvas.save();
@@ -10378,28 +10378,28 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildCrestMedium.paint;
         
         // Local Colors
-        int crestGold1 = Color.argb(255, 255, 188, 90);
-        int crestBronze6 = Color.argb(255, 179, 98, 19);
-        int crestGold2 = Color.argb(255, 255, 210, 145);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestSilver3 = Color.argb(255, 141, 141, 141);
         int crestGold6 = Color.argb(255, 223, 145, 30);
-        int crestBronze2 = Color.argb(255, 244, 165, 89);
-        int crestBronze3 = Color.argb(255, 179, 98, 19);
-        int crestBronze4 = Color.argb(255, 215, 122, 32);
-        int crestSilver1 = Color.argb(255, 194, 194, 194);
-        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
         int crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
-        int crestBronze1 = Color.argb(255, 234, 140, 49);
         int crestGold3 = Color.argb(255, 223, 145, 30);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestSilver1 = Color.argb(255, 194, 194, 194);
+        int crestGold2 = Color.argb(255, 255, 210, 145);
+        int crestBronze6 = Color.argb(255, 179, 98, 19);
+        int crestBronze3 = Color.argb(255, 179, 98, 19);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
+        int crestGold1 = Color.argb(255, 255, 188, 90);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
         
         // Local Variables
+        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
         int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
         int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
         int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
-        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
         
         // Resize to Target Frame
         canvas.save();
@@ -10580,9 +10580,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
-        int crestBronze4 = Color.argb(255, 215, 122, 32);
         int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int fillColor37 = Color.argb(255, 255, 255, 255);
         
         // Local Variables
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
@@ -10694,14 +10694,14 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildHeaderCrest.paint;
         
         // Local Colors
+        int textForeground2 = Color.argb(255, 255, 255, 255);
         int guildHeaderDark2 = PaintCodeColor.colorByChangingValue(guildHeader, 0.7f);
+        int guildHeaderDark6 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.3f);
         int guildHeaderDark8 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.4f);
         int guildHeaderDark7 = PaintCodeColor.colorByChangingValue(guildHeaderDark8, 1f);
-        int guildHeaderDark6 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.3f);
         int guildHeaderDark3 = PaintCodeColor.colorByChangingValue(guildHeader, 1f);
         int guildHeaderDark5 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.7f);
         int guildHeaderDark4 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.15f);
-        int textForeground2 = Color.argb(255, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -11639,9 +11639,9 @@ public class HabiticaIcons {
         int strokeColor19 = Color.argb(255, 154, 98, 255);
         
         // Local Variables
-        float filterNode1Position = 3f + 10f * percentage;
         float filterNode2Position = 13f - 10f * percentage;
         float filterNode3Position = 3f + 5f * percentage;
+        float filterNode1Position = 3f + 10f * percentage;
         
         // Resize to Target Frame
         canvas.save();
@@ -11907,8 +11907,8 @@ public class HabiticaIcons {
         Paint paint = CacheForBuffIcon.paint;
         
         // Local Colors
-        int fillColor85 = Color.argb(255, 237, 236, 238);
         int fillColor18 = Color.argb(255, 154, 98, 255);
+        int fillColor85 = Color.argb(255, 237, 236, 238);
         
         // Resize to Target Frame
         canvas.save();
@@ -11988,9 +11988,9 @@ public class HabiticaIcons {
         Paint paint = CacheForParticipantsIcon.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
-        int fillColor39 = Color.argb(255, 189, 168, 255);
         int fillColor104 = Color.argb(255, 249, 249, 249);
+        int fillColor39 = Color.argb(255, 189, 168, 255);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
         
         // Resize to Target Frame
         canvas.save();
@@ -12552,8 +12552,8 @@ public class HabiticaIcons {
         Paint paint = CacheForBuffIconDark.paint;
         
         // Local Colors
-        int buffBackgroundColorDark = Color.argb(255, 70, 40, 125);
         int fillColor39 = Color.argb(255, 189, 168, 255);
+        int buffBackgroundColorDark = Color.argb(255, 70, 40, 125);
         
         // Resize to Target Frame
         canvas.save();
@@ -12656,12 +12656,12 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor25 = Color.argb(255, 225, 224, 227);
-        int fillColor35 = Color.argb(255, 195, 192, 199);
-        int fillColor106 = Color.argb(255, 216, 216, 216);
         int strokeColor21 = Color.argb(255, 135, 129, 144);
-        int fillColor89 = Color.argb(255, 227, 143, 61);
-        int fillColor107 = Color.argb(255, 179, 98, 19);
         int fillColor40 = Color.argb(255, 165, 161, 172);
+        int fillColor35 = Color.argb(255, 195, 192, 199);
+        int fillColor89 = Color.argb(255, 227, 143, 61);
+        int fillColor106 = Color.argb(255, 216, 216, 216);
+        int fillColor107 = Color.argb(255, 179, 98, 19);
         
         // Resize to Target Frame
         canvas.save();
@@ -13166,8 +13166,8 @@ public class HabiticaIcons {
         Paint paint = CacheForTaskFilterIcon.paint;
         
         // Local Colors
-        int fillColor108 = Color.argb(255, 78, 74, 87);
         int strokeColor18 = Color.argb(255, 78, 74, 87);
+        int fillColor108 = Color.argb(255, 78, 74, 87);
         
         // Resize to Target Frame
         canvas.save();
@@ -13680,9 +13680,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor109 = Color.argb(255, 250, 133, 55);
+        int fillColor73 = Color.argb(255, 255, 180, 69);
         int strokeColor24 = Color.argb(255, 146, 92, 243);
         int fillColor37 = Color.argb(255, 255, 255, 255);
-        int fillColor73 = Color.argb(255, 255, 180, 69);
         
         // Resize to Target Frame
         canvas.save();
@@ -13987,6 +13987,39 @@ public class HabiticaIcons {
         canvas.restore();
     }
     
+    private static class CacheForItemIndicatorNumberDark {
+        private static RectF originalFrame = new RectF(0f, 0f, 28f, 28f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF symbolRect = new RectF();
+        private static RectF symbolTargetRect = new RectF();
+    }
+    
+    private static void drawItemIndicatorNumberDark(Canvas canvas, int lockColor) {
+        HabiticaIcons.drawItemIndicatorNumberDark(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor);
+    }
+    
+    private static void drawItemIndicatorNumberDark(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor) {
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForItemIndicatorNumberDark.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForItemIndicatorNumberDark.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 28f, resizedFrame.height() / 28f);
+        
+        // Symbol
+        RectF symbolRect = CacheForItemIndicatorNumberDark.symbolRect;
+        symbolRect.set(0f, 0f, 28f, 28f);
+        canvas.save();
+        canvas.clipRect(symbolRect);
+        canvas.translate(symbolRect.left, symbolRect.top);
+        RectF symbolTargetRect = CacheForItemIndicatorNumberDark.symbolTargetRect;
+        symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, false, true);
+        canvas.restore();
+        
+        canvas.restore();
+    }
+    
     
     // Canvas Images
     // Tab
@@ -14691,6 +14724,14 @@ public class HabiticaIcons {
         return imageOfSpookyGemPromoBG;
     }
     
+    public static Bitmap imageOfItemIndicatorNumberDark(int lockColor) {
+        Bitmap imageOfItemIndicatorNumberDark = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfItemIndicatorNumberDark);
+        HabiticaIcons.drawItemIndicatorNumberDark(canvas, lockColor);
+        
+        return imageOfItemIndicatorNumberDark;
+    }
+    
     
     // Resizing Behavior
     public static void resizingBehaviorApply(ResizingBehavior behavior, RectF rect, RectF target, RectF result) {
@@ -14736,25 +14777,25 @@ public class HabiticaIcons {
 
 class PaintCodeColor extends Color {
     private static float[] ColorToHSV(int originalColor) {
-        float hsv[] = new float[3];
+        float[] hsv = new float[3];
         RGBToHSV(red(originalColor), green(originalColor), blue(originalColor), hsv);
         return hsv;
     }
     
     public static int colorByChangingHue(int originalColor, float newHue) {
-        float hsv[] = ColorToHSV(originalColor);
+        float[] hsv = ColorToHSV(originalColor);
         hsv[0] = newHue;
         return HSVToColor(alpha(originalColor), hsv);
     }
     
     public static int colorByChangingSaturation(int originalColor, float newSaturation) {
-        float hsv[] = ColorToHSV(originalColor);
+        float[] hsv = ColorToHSV(originalColor);
         hsv[1] = newSaturation;
         return HSVToColor(alpha(originalColor), hsv);
     }
     
     public static int colorByChangingValue(int originalColor, float newValue) {
-        float hsv[] = ColorToHSV(originalColor);
+        float[] hsv = ColorToHSV(originalColor);
         hsv[2] = newValue;
         return HSVToColor(alpha(originalColor), hsv);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index e3c572a94..aa1a80b42 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -293,6 +293,20 @@ public class HabiticaIconsHelper {
         return imageOfItemIndicatorNumber;
     }
 
+    private static Bitmap imageOfItemIndicatorNumberDark = null;
+    public static Bitmap imageOfItemIndicatorNumberDark() {
+        if (imageOfItemIndicatorNumberDark != null)
+            return imageOfItemIndicatorNumberDark;
+
+        int size = scaleSize(28);
+        imageOfItemIndicatorNumberDark = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfItemIndicatorNumberDark);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, false, true);
+
+        return imageOfItemIndicatorNumberDark;
+    }
+
     private static Bitmap imageOfItemIndicatorLocked = null;
     public static Bitmap imageOfItemIndicatorLocked() {
         if (imageOfItemIndicatorLocked != null)
@@ -306,6 +320,19 @@ public class HabiticaIconsHelper {
         return imageOfItemIndicatorLocked;
     }
 
+    private static Bitmap imageOfItemIndicatorLockedDark = null;
+    public static Bitmap imageOfItemIndicatorLockedDark() {
+        if (imageOfItemIndicatorLockedDark != null)
+            return imageOfItemIndicatorLockedDark;
+
+        int size = scaleSize(28);
+        imageOfItemIndicatorLockedDark = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfItemIndicatorLockedDark);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), true, false, true);
+        return imageOfItemIndicatorLockedDark;
+    }
+
     private static Bitmap imageOfItemIndicatorLimited = null;
     public static Bitmap imageOfItemIndicatorLimited() {
         if (imageOfItemIndicatorLimited != null)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
index d265e1b6e..6ce84e3a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
@@ -49,7 +49,6 @@ class HabiticaProgressBar(context: Context, attrs: AttributeSet?) : FrameLayout(
             }
         }
 
-
     private fun updateBar() {
         val remainingValue = currentValue - pendingValue
         val remainingPercent = if (remainingValue < 0) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
index 631956268..61a67c14d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
@@ -41,7 +41,7 @@ class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(contex
     }
 
     init {
-        context?.layoutInflater?.inflate(R.layout.npc_banner, this)
+        context.layoutInflater.inflate(R.layout.npc_banner, this)
     }
 
     private fun setImage() {
@@ -57,7 +57,7 @@ class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(contex
             drawable.tileModeX = Shader.TileMode.REPEAT
             Observable.just(drawable)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(Consumer {
+                    .subscribe({
                         backgroundView.background = it
                     }, RxErrorHandler.handleEmptyError())
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
index b960feebd..2d45e9d68 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
@@ -33,9 +33,9 @@ class SupportCollapsibleSection : LinearLayout {
         binding.titleView.text = a.getString(R.styleable.SupportCollapsibleSection_title)
         binding.subtitleView.text = a.getString(R.styleable.SupportCollapsibleSection_subtitle)
         binding.descriptionView.text = MarkdownParser.parseMarkdown(a.getString(R.styleable.SupportCollapsibleSection_description))
-        binding.titleView.setTextColor(a.getColor(R.styleable.SupportCollapsibleSection_titleColor, ContextCompat.getColor(context, R.color.gray_50)))
+        binding.titleView.setTextColor(a.getColor(R.styleable.SupportCollapsibleSection_titleColor, ContextCompat.getColor(context, R.color.text_primary)))
 
-        background = context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
+        background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
 
         a.recycle()
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
index bb4179946..5b0f453cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
@@ -44,7 +44,7 @@ class Typewriter : androidx.appcompat.widget.AppCompatTextView {
     }
 
     private fun setupTextColors(context: Context) {
-        visibleSpan = ForegroundColorSpan(ContextCompat.getColor(context, R.color.textColorLight))
+        visibleSpan = ForegroundColorSpan(ContextCompat.getColor(context, R.color.text_primary))
         hiddenSpan = ForegroundColorSpan(ContextCompat.getColor(context, R.color.transparent))
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.kt
index 2e374aaab..9bdbaceff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.kt
@@ -13,6 +13,7 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import java.math.RoundingMode
 import java.text.NumberFormat
@@ -68,7 +69,7 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
                 attrs,
                 R.styleable.ValueBar,
                 0, 0)
-        setLightBackground(attributes?.getBoolean(R.styleable.ValueBar_lightBackground, false) == true)
+        setLightBackground(attributes?.getBoolean(R.styleable.ValueBar_lightBackground, !context.isUsingNightModeResources()) == true)
 
         progressBar.barForegroundColor = attributes?.getColor(R.styleable.ValueBar_barForegroundColor, 0) ?: 0
         progressBar.barPendingColor = attributes?.getColor(R.styleable.ValueBar_barPendingColor, 0) ?: 0
@@ -139,7 +140,7 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
     fun setLightBackground(lightBackground: Boolean) {
         val textColor: Int
         if (lightBackground) {
-            textColor = ContextCompat.getColor(context, R.color.gray_10)
+            textColor = ContextCompat.getColor(context, R.color.text_primary)
             progressBar.setBackgroundResource(R.drawable.layout_rounded_bg_light_gray)
         } else {
             textColor = context.getThemeColor(R.attr.textColorPrimaryDark)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
index f8625df1c..5ab7ffbaa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
@@ -234,19 +234,19 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
         if (isCelebratory) {
             titleTextView.post {
                 val confettiContainer = view.findViewById<RelativeLayout>(R.id.confetti_container)
-                ParticleSystem(confettiContainer, 40, context.getDrawable(R.drawable.confetti_blue), 3000)
+                ParticleSystem(confettiContainer, 40, ContextCompat.getDrawable(context, R.drawable.confetti_blue), 3000)
                         .setAcceleration(0.00013f, 90)
                         .setRotationSpeed(144f)
                         .setSpeedByComponentsRange(-0.15f, 0.15f, -0.1f, -0.5f)
                         .setFadeOut(200, AccelerateInterpolator())
                         .emitWithGravity(titleTextView, Gravity.BOTTOM, 10, 2000)
-                ParticleSystem(confettiContainer, 40, context.getDrawable(R.drawable.confetti_red), 3000)
+                ParticleSystem(confettiContainer, 40, ContextCompat.getDrawable(context, R.drawable.confetti_red), 3000)
                         .setAcceleration(0.00013f, 90)
                         .setRotationSpeed(144f)
                         .setSpeedByComponentsRange(-0.15f, 0.15f, -0.1f, -0.5f)
                         .setFadeOut(200, AccelerateInterpolator())
                         .emitWithGravity(titleTextView, Gravity.BOTTOM, 10, 2000)
-                ParticleSystem(confettiContainer, 40, context.getDrawable(R.drawable.confetti_green), 3000)
+                ParticleSystem(confettiContainer, 40, ContextCompat.getDrawable(context, R.drawable.confetti_green), 3000)
                         .setAcceleration(0.00013f, 90)
                         .setRotationSpeed(144f)
                         .setSpeedByComponentsRange(-0.15f, 0.15f, -0.1f, -0.5f)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
index 3f8dc7a27..b23757a41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
@@ -133,7 +133,7 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                     if (!hasPotion) {
                         observable = observable.flatMap { activity.inventoryRepository.purchaseItem("hatchingPotions", thisPotion.key, 1) }
                     }
-                    observable.subscribe(Consumer {
+                    observable.subscribe({
                         (getActivity() as? MainActivity)?.hatchPet(thisPotion, thisEgg)
                     }, RxErrorHandler.handleEmptyError())
                 }
@@ -149,7 +149,7 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
             val drawable = BitmapDrawable(resources, if (hasMount) it else it.extractAlpha())
             Observable.just(drawable)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(Consumer {
+                    .subscribe({
                         binding.petView.background = drawable
                     }, RxErrorHandler.handleEmptyError())
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
index eb5591fdd..3017c8761 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
@@ -36,7 +36,7 @@ class EquipmentOverviewItem @JvmOverloads constructor(
             DataBindingUtils.loadImage(binding.iconView, "shop_$key")
             binding.localIconView.visibility = View.GONE
             binding.iconView.visibility = View.VISIBLE
-            binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_white)
+            binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
             if (isTwoHanded) {
                 binding.twoHandedIndicator.setImageDrawable(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfTwoHandedIcon()))
             }
@@ -44,7 +44,7 @@ class EquipmentOverviewItem @JvmOverloads constructor(
             binding.localIconView.visibility = View.VISIBLE
             binding.iconView.visibility = View.GONE
             if (isDisabledFromTwoHand) {
-                binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_white)
+                binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
                 binding.localIconView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.equipment_two_handed))
             } else {
                 binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_10)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt
index 88df381d6..99547763d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.views.equipment
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.EquipmentOverviewViewBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
@@ -17,7 +18,7 @@ class EquipmentOverviewView @JvmOverloads constructor(
     private var binding: EquipmentOverviewViewBinding = EquipmentOverviewViewBinding.inflate(context.layoutInflater, this)
 
     init {
-        background = context.getDrawable(R.drawable.layout_rounded_bg_gray_50)
+        background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_50)
         setScaledPadding(context, 12, 12, 12 ,12)
         orientation = VERTICAL
 
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 bad8e4afc..f1d3600fa 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
@@ -14,6 +14,7 @@ import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
+import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.children
 import com.habitrpg.android.habitica.R
@@ -95,7 +96,7 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
             animateButtonTap()
             true
         }
-        addButton.setOnTouchListener { _, event ->
+        addButton.setOnTouchListener { view, event ->
             if (event.action == MotionEvent.ACTION_DOWN) {
                 val animX = ObjectAnimator.ofFloat(addButton, "scaleX", 1f, 1.1f)
                 animX.duration = 100
@@ -119,10 +120,10 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
         submenuWrapper.setOnClickListener { hideSubmenu() }
         updateItemSelection()
 
-        val cutout = context.getDrawable(R.drawable.bottom_navigation_inset)
+        val cutout = ContextCompat.getDrawable(context, R.drawable.bottom_navigation_inset)
         cutout?.setColorFilter(context.getThemeColor(R.attr.barColor), PorterDuff.Mode.MULTIPLY)
         cutoutBackgroundView.setImageDrawable(cutout)
-        val fabBackground = context.getDrawable(R.drawable.fab_background)
+        val fabBackground = ContextCompat.getDrawable(context, R.drawable.fab_background)
         fabBackground?.setColorFilter(context.getThemeColor(R.attr.colorAccent), PorterDuff.Mode.MULTIPLY)
         addButtonBackground.background = fabBackground
     }
@@ -162,19 +163,19 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
             val view = BottomNavigationSubmenuItem(context)
             when (taskType) {
                 Task.TYPE_HABIT -> {
-                    view.icon = context.getDrawable(R.drawable.add_habit)
+                    view.icon = ContextCompat.getDrawable(context, R.drawable.add_habit)
                     view.title = context.getString(R.string.habit)
                 }
                 Task.TYPE_DAILY -> {
-                    view.icon = context.getDrawable(R.drawable.add_daily)
+                    view.icon = ContextCompat.getDrawable(context, R.drawable.add_daily)
                     view.title = context.getString(R.string.daily)
                 }
                 Task.TYPE_TODO -> {
-                    view.icon = context.getDrawable(R.drawable.add_todo)
+                    view.icon = ContextCompat.getDrawable(context, R.drawable.add_todo)
                     view.title = context.getString(R.string.todo)
                 }
                 Task.TYPE_REWARD -> {
-                    view.icon = context.getDrawable(R.drawable.add_rewards)
+                    view.icon = ContextCompat.getDrawable(context, R.drawable.add_rewards)
                     view.title = context.getString(R.string.reward)
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuView.kt
index 68d44d93f..00a1b5c25 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuView.kt
@@ -19,7 +19,7 @@ class PromoMenuView @JvmOverloads constructor(
     var binding: PromoMenuBinding = PromoMenuBinding.inflate(context.layoutInflater, this)
 
     init {
-        setBackgroundColor(ContextCompat.getColor(context, R.color.gray_700))
+        setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
         clipToPadding = false
         clipChildren = false
         clipToOutline = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/SubscriptionBuyGemsPromoView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/SubscriptionBuyGemsPromoView.kt
index 256403eff..348bdac8d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/SubscriptionBuyGemsPromoView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/SubscriptionBuyGemsPromoView.kt
@@ -16,7 +16,7 @@ class SubscriptionBuyGemsPromoView @JvmOverloads constructor(
 
     init {
         inflate(R.layout.promo_subscription_buy_gems, true)
-        setBackgroundColor(ContextCompat.getColor(context, R.color.gray_700))
+        setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
         clipToPadding = false
         clipChildren = false
         clipToOutline = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 5ac29e960..02f9616da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -20,10 +20,6 @@ import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.OwnedItem
@@ -93,8 +89,8 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             if (shopItem.locked) {
                 buyLabel.text = context.getString(R.string.locked)
                 limitedTextView.visibility = View.VISIBLE
-                limitedTextView.background = ContextCompat.getColor(context, R.color.gray_600).toDrawable()
-                limitedTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+                limitedTextView.background = ContextCompat.getColor(context, R.color.offset_background).toDrawable()
+                limitedTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
             }
 
             priceLabel.isLocked = shopItem.locked || shopItem.lockedReason(context) != null
@@ -104,11 +100,11 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 shopItem.isTypeItem -> contentView = PurchaseDialogItemContent(context)
                 shopItem.isTypeQuest -> {
                     contentView = PurchaseDialogQuestContent(context)
-                    inventoryRepository.getQuestContent(shopItem.key).firstElement().subscribe(Consumer { contentView.setQuestContent(it) }, RxErrorHandler.handleEmptyError())
+                    inventoryRepository.getQuestContent(shopItem.key).firstElement().subscribe({ contentView.setQuestContent(it) }, RxErrorHandler.handleEmptyError())
                 }
                 shopItem.isTypeGear -> {
                     contentView = PurchaseDialogGearContent(context)
-                    inventoryRepository.getEquipment(shopItem.key).firstElement().subscribe(Consumer { contentView.setEquipment(it) }, RxErrorHandler.handleEmptyError())
+                    inventoryRepository.getEquipment(shopItem.key).firstElement().subscribe({ contentView.setEquipment(it) }, RxErrorHandler.handleEmptyError())
                     checkGearClass()
                 }
                 "gems" == shopItem.purchaseType -> contentView = PurchaseDialogGemsContent(context)
@@ -138,13 +134,13 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         priceLabel.value = shopItem.value.toDouble() * purchaseQuantity
 
         if ((shopItem.currency != "gold" || shopItem.canAfford(user, purchaseQuantity)) && !shopItem.locked && purchaseQuantity >= 1) {
-            buyButton.background = context.getDrawable(R.drawable.button_background_primary)
+            buyButton.background = ContextCompat.getDrawable(context, R.drawable.button_background_primary)
             priceLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
             buyLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
         } else {
-            buyButton.background = context.getDrawable(R.drawable.button_background_gray_600)
-            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
-            buyLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+            buyButton.background = ContextCompat.getDrawable(context, R.drawable.button_background_offset)
+            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            buyLabel.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
         }
 
         if (purchaseQuantity < 1 || (shopItem.limitedNumberLeft != null && (shopItem.limitedNumberLeft ?: 0) < purchaseQuantity)) {
@@ -164,7 +160,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         if (shopItem.habitClass != null && shopItem.habitClass != "special" && user.stats?.habitClass != shopItem.habitClass) {
             limitedTextView.text = context.getString(R.string.class_equipment_shop_dialog)
             limitedTextView.visibility = View.VISIBLE
-            limitedTextView.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_100))
+            limitedTextView.setBackgroundColor(ContextCompat.getColor(context, R.color.inverted_background))
         } else {
             limitedTextView.visibility = View.GONE
         }
@@ -178,11 +174,11 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             field = value
             if (isPinned) {
                 pinButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfUnpinItem()), null, null, null)
-                pinButton.setTextColor(ContextCompat.getColor(context, R.color.red_10))
+                pinButton.setTextColor(ContextCompat.getColor(context, R.color.text_red))
                 pinButton.text = context.getText(R.string.unpin)
             } else {
                 pinButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfPinItem()), null, null, null)
-                pinButton.setTextColor(ContextCompat.getColor(context, R.color.brand_300))
+                pinButton.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
                 pinButton.text = context.getText(R.string.pin)
             }
         }
@@ -200,11 +196,11 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         }
         priceLabel = buyButton.findViewById(R.id.priceLabel)
         buyLabel = buyButton.findViewById(R.id.buy_label)
-        pinButton.setOnClickListener { inventoryRepository.togglePinnedItem(shopItem).subscribe(Consumer { isPinned = !this.isPinned }, RxErrorHandler.handleEmptyError()) }
+        pinButton.setOnClickListener { inventoryRepository.togglePinnedItem(shopItem).subscribe({ isPinned = !this.isPinned }, RxErrorHandler.handleEmptyError()) }
 
         shopItem = item
 
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer<User> { this.setUser(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.getUser().subscribe({ this.setUser(it) }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun setUser(user: User) {
@@ -228,7 +224,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 limitedTextView.setBackgroundColor(ContextCompat.getColor(context, R.color.green_10))
             }
             val gemContent = additionalContentView as? PurchaseDialogGemsContent
-            gemContent?.stepperView?.maxValue = (user?.purchased?.plan?.numberOfGemsLeft() ?: 1).toDouble()
+            gemContent?.stepperView?.maxValue = (user.purchased?.plan?.numberOfGemsLeft() ?: 1).toDouble()
         }
 
         buyButton.elevation = 0f
@@ -325,9 +321,9 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                     event.type = HabiticaSnackbar.SnackbarDisplayType.NORMAL
                     event.rightIcon = priceLabel.compoundDrawables[0]
                     when (item.currency) {
-                        "gold" -> event.rightTextColor = ContextCompat.getColor(context, R.color.yellow_5)
-                        "gems" -> event.rightTextColor = ContextCompat.getColor(context, R.color.green_10)
-                        "hourglasses" -> event.rightTextColor = ContextCompat.getColor(context, R.color.brand_300)
+                        "gold" -> event.rightTextColor = ContextCompat.getColor(context, R.color.text_yellow)
+                        "gems" -> event.rightTextColor = ContextCompat.getColor(context, R.color.text_green)
+                        "hourglasses" -> event.rightTextColor = ContextCompat.getColor(context, R.color.text_brand)
                     }
                     event.rightText = "-" + priceLabel.text
                     EventBus.getDefault().post(event)
@@ -360,10 +356,10 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         val alert = HabiticaAlertDialog(context)
         alert.setTitle(R.string.excess_items)
         alert.setMessage(context.getString(R.string.excessItemsXLeft, quantity, item.text, purchaseQuantity))
-        alert.addButton(context.getString(R.string.purchaseX, purchaseQuantity), true, false) { _, _ ->
+        alert.addButton(context.getString(R.string.purchaseX, purchaseQuantity), isPrimary = true, isDestructive = false) { _, _ ->
             buyItem(purchaseQuantity)
         }
-        alert.addButton(context.getString(R.string.purchaseX, quantity), false, false) { _, _ ->
+        alert.addButton(context.getString(R.string.purchaseX, quantity), isPrimary = false, isDestructive = false) { _, _ ->
             buyItem(quantity)
         }
         alert.setExtraCloseButtonVisibility(View.VISIBLE)
@@ -423,7 +419,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                         }
                     }
                         inventoryRepository.getOwnedPets()
-                    }.firstElement().subscribe(Consumer {
+                    }.firstElement().subscribe({
                         for (pet in it) {
                             if (pet.key?.contains(item.key) == true) {
                                 ownedCount += if (pet.trained > 0) 1 else 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt
index 1267e459a..e6917ee6e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt
@@ -50,8 +50,8 @@ internal class PurchaseDialogGearContent : PurchaseDialogContent {
     private fun configureFieldsForValue(labelView: TextView?, valueTextView: TextView?, value: Int) {
         valueTextView?.text = "+$value"
         if (value == 0) {
-            labelView?.setTextColor(ContextCompat.getColor(context, R.color.gray_400))
-            valueTextView?.setTextColor(ContextCompat.getColor(context, R.color.gray_400))
+            labelView?.setTextColor(ContextCompat.getColor(context, R.color.text_dimmed))
+            valueTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_dimmed))
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
index b25d82eb8..4e5a70ce5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
@@ -4,36 +4,45 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.ImageButton
 import android.widget.LinearLayout
-import android.widget.MultiAutoCompleteTextView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.ChatBarViewBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteTokenizer
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import javax.inject.Inject
 
 
 class ChatBarView : LinearLayout {
 
+    var hasAcceptedGuidelines: Boolean = false
+    set(value) {
+        field = value
+        if (field) {
+            binding.communityGuidelinesView.visibility = View.GONE
+            binding.chatBarContent.visibility = View.VISIBLE
+        } else {
+            binding.chatBarContent.visibility = View.GONE
+        }
+    }
+    var onCommunityGuidelinesAccepted: (() -> Unit)? = null
+
     @Inject
     lateinit var socialRepository: SocialRepository
 
     @Inject
     lateinit var appConfigManager: AppConfigManager
 
-    private val sendButton: ImageButton by bindView(R.id.sendButton)
-    private val chatEditText: MultiAutoCompleteTextView by bindView(R.id.chatEditText)
-    private val textIndicator: TextView by bindView(R.id.text_indicator)
-    private val indicatorSpacing: View by bindView(R.id.indicator_spacing)
+    private val binding = ChatBarViewBinding.inflate(context.layoutInflater, this)
 
     var chatMessages: List<ChatMessage>
         get() = autocompleteAdapter?.chatMessages ?: listOf()
@@ -55,9 +64,9 @@ class ChatBarView : LinearLayout {
             autocompleteAdapter?.groupID = value
         }
 
-    var message: String?
-    get() = chatEditText.text.toString()
-    set(value) = chatEditText.setText(value)
+    var message: String
+    get() = binding.chatEditText.text.toString()
+    set(value) = binding.chatEditText.setText(value, TextView.BufferType.EDITABLE)
 
     constructor(context: Context) : super(context) {
         setupView(context)
@@ -72,39 +81,46 @@ class ChatBarView : LinearLayout {
     private fun setupView(context: Context) {
         orientation = LinearLayout.VERTICAL
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
-        inflater?.inflate(R.layout.tavern_chat_new_entry_item, this)
+        inflater?.inflate(R.layout.chat_bar_view, this)
         this.setBackgroundResource(R.color.white)
 
         HabiticaBaseApplication.userComponent?.inject(this)
 
-        chatEditText.addTextChangedListener(OnChangeTextWatcher { _, _, _, _ ->
-                setSendButtonEnabled(chatEditText.text.isNotEmpty() && chatEditText.text.length <= maxChatLength)
-                updateTextIndicator(chatEditText.text.toString())
+        binding.chatEditText.addTextChangedListener(OnChangeTextWatcher { _, _, _, _ ->
+                setSendButtonEnabled(binding.chatEditText.text.isNotEmpty() && binding.chatEditText.text.length <= maxChatLength)
+                updateTextIndicator(binding.chatEditText.text.toString())
         })
 
-        sendButton.setOnClickListener { sendButtonPressed() }
+        binding.sendButton.setOnClickListener { sendButtonPressed() }
 
         autocompleteAdapter = AutocompleteAdapter(context, socialRepository, autocompleteContext, groupID, appConfigManager.enableUsernameAutocomplete())
-        chatEditText.setAdapter(autocompleteAdapter)
-        chatEditText.threshold = 2
+        binding.chatEditText.setAdapter(autocompleteAdapter)
+        binding.chatEditText.threshold = 2
 
-        chatEditText.setTokenizer(AutocompleteTokenizer(listOf('@', ':')))
+        binding.chatEditText.setTokenizer(AutocompleteTokenizer(listOf('@', ':')))
+
+        binding.communityGuidelinesAcceptButton.setOnClickListener {
+            onCommunityGuidelinesAccepted?.invoke()
+        }
+        binding.communityGuidelinesReviewView.setOnClickListener {
+            MainNavigationController.navigate(R.id.guidelinesActivity)
+        }
     }
 
     private fun updateTextIndicator(text: String) {
-        if (chatEditText.lineCount >= 3) {
-            textIndicator.visibility = View.VISIBLE
-            indicatorSpacing.visibility = View.VISIBLE
-            textIndicator.text = "${text.length}/$maxChatLength"
+        if (binding.chatEditText.lineCount >= 3) {
+            binding.textIndicator.visibility = View.VISIBLE
+            binding.indicatorSpacing.visibility = View.VISIBLE
+            binding.textIndicator.text = "${text.length}/$maxChatLength"
             val color = when {
-                text.length > maxChatLength -> R.color.red_50
-                text.length > (maxChatLength * 0.95) -> R.color.yellow_5
-                else -> R.color.gray_400
+                text.length > maxChatLength -> R.color.text_red
+                text.length > (maxChatLength * 0.95) -> R.color.text_yellow
+                else -> R.color.text_dimmed
             }
-            textIndicator.setTextColor(ContextCompat.getColor(context, color))
+            binding.textIndicator.setTextColor(ContextCompat.getColor(context, color))
         } else {
-            textIndicator.visibility = View.GONE
-            indicatorSpacing.visibility = View.GONE
+            binding.textIndicator.visibility = View.GONE
+            binding.indicatorSpacing.visibility = View.GONE
         }
     }
 
@@ -112,16 +128,16 @@ class ChatBarView : LinearLayout {
         val tintColor: Int = if (enabled) {
             context.getThemeColor(R.attr.colorAccent)
         } else {
-            ContextCompat.getColor(context, R.color.gray_400)
+            ContextCompat.getColor(context, R.color.disabled_background)
         }
-        sendButton.setColorFilter(tintColor)
-        sendButton.isEnabled = enabled
+        binding.sendButton.setColorFilter(tintColor)
+        binding.sendButton.isEnabled = enabled
     }
 
     private fun sendButtonPressed() {
-        val chatText = message ?: ""
+        val chatText = message
         if (chatText.isNotEmpty()) {
-            chatEditText.text = null
+            binding.chatEditText.text = null
             sendAction?.invoke(chatText)
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
index f399b96e1..bf1b71fee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
@@ -34,9 +34,9 @@ class OldQuestProgressView : LinearLayout {
 
     private val rect = RectF()
     private val displayDensity = context.resources.displayMetrics.density
-    private val lightGray = ContextCompat.getColor(context, R.color.gray_700)
-    private val mediumGray = ContextCompat.getColor(context, R.color.gray_600)
-    private val darkGray = ContextCompat.getColor(context, R.color.gray_400)
+    private val lightGray = ContextCompat.getColor(context, R.color.window_background)
+    private val mediumGray = ContextCompat.getColor(context, R.color.offset_background)
+    private val darkGray = ContextCompat.getColor(context, R.color.separator)
 
     constructor(context: Context) : super(context) {
         setupView(context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
index 7d0c1ed8b..7102febbd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
@@ -199,7 +199,7 @@ class QuestProgressView : LinearLayout {
                 DataBindingUtils.loadImage("rage_strike_${strike.key}") {
                     Observable.just(it)
                             .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(Consumer { bitmap ->
+                            .subscribe({ bitmap ->
                                 val displayDensity = resources.displayMetrics.density
                                 val width = bitmap.width * displayDensity
                                 val height = bitmap.height * displayDensity
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
index 965e46731..af6a5b74a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
@@ -85,7 +85,7 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        subscription = userRepository.getUser().subscribe(Consumer {
+        subscription = userRepository.getUser().subscribe({
             user = it
         }, RxErrorHandler.handleEmptyError())
 
@@ -147,7 +147,7 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
         if (allocatedPoints > 0) {
             titleView.setBackgroundColor(context.getThemeColor(R.attr.colorAccent))
         } else {
-            titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_400))
+            titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.disabled_background))
         }
 
         getButton(BUTTON_POSITIVE).isEnabled = allocatedPoints > 0
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 d87021c85..e3c84e459 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
@@ -44,15 +44,15 @@ class StatsView(context: Context?, attrs: AttributeSet?) : LinearLayout(context,
             field = value
             allocateButton.visibility = if (value) View.VISIBLE else View.GONE
             if (value) {
-                allocatedWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600_30))
-                allocateButton.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600_30))
+                allocatedWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background_30))
+                allocateButton.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background_30))
                 allocatedValueTextView.setTextColor(statColor)
                 allocatedLabelView.setTextColor(statColor)
             } else {
-                allocatedWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_700))
-                allocateButton.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_700))
-                allocatedValueTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_50))
-                allocatedLabelView.setTextColor(ContextCompat.getColor(context, R.color.gray_300))
+                allocatedWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
+                allocateButton.setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
+                allocatedValueTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+                allocatedLabelView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt
index ca5a9efbf..6977b0639 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt
@@ -67,17 +67,17 @@ class SubscriptionOptionView(context: Context, attrs: AttributeSet) : FrameLayou
             binding.gemCapTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
             binding.hourglassTextView.setBackgroundResource(R.drawable.pill_bg_purple_400)
             binding.hourglassTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
-            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.brand_300))
-            binding.descriptionTextView.setTextColor(ContextCompat.getColor(context, R.color.brand_300))
+            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
+            binding.descriptionTextView.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
         } else {
             binding.wrapper.setBackgroundResource(R.drawable.subscription_box_bg)
             binding.subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_unselected)
             binding.gemCapTextView.setBackgroundResource(R.drawable.pill_bg)
-            binding.gemCapTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_50))
+            binding.gemCapTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
             binding.hourglassTextView.setBackgroundResource(R.drawable.pill_bg)
-            binding.hourglassTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_50))
-            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_50))
-            binding.descriptionTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_50))
+            binding.hourglassTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+            binding.descriptionTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
         }
         val horizontalPadding = resources.getDimension(R.dimen.pill_horizontal_padding).toInt()
         val verticalPadding = resources.getDimension(R.dimen.pill_vertical_padding).toInt()
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 0ede16d8d..2fe18b08e 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
@@ -182,9 +182,9 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
         createTagViews()
         tagsEditButton.setText(R.string.edit_tag_btn_edit)
         this.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
-        repository.updateTags(editedTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe(Consumer { tag -> editedTags.remove(tag.id) }, RxErrorHandler.handleEmptyError())
-        repository.createTags(createdTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe(Consumer { tag -> createdTags.remove(tag.id) }, RxErrorHandler.handleEmptyError())
-        repository.deleteTags(deletedTags).subscribe(Consumer { deletedTags.clear() }, RxErrorHandler.handleEmptyError())
+        repository.updateTags(editedTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe({ tag -> editedTags.remove(tag.id) }, RxErrorHandler.handleEmptyError())
+        repository.createTags(createdTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe({ tag -> createdTags.remove(tag.id) }, RxErrorHandler.handleEmptyError())
+        repository.deleteTags(deletedTags).subscribe({ deletedTags.clear() }, RxErrorHandler.handleEmptyError())
     }
 
     private fun createTagEditViews() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
index 43b889d1f..809762f29 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
@@ -79,7 +79,7 @@ class ChecklistItemFormView @JvmOverloads constructor(
     init {
         minimumHeight = 38.dpToPx(context)
         inflate(R.layout.task_form_checklist_item, true)
-        background = context.getDrawable(R.drawable.layout_rounded_bg_task_form)
+        background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_task_form)
         background.mutate().setTint(ContextCompat.getColor(context, R.color.taskform_gray))
         gravity = Gravity.CENTER_VERTICAL
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt
index c34184297..ff605b637 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt
@@ -50,7 +50,7 @@ class HabitResetStreakButtons @JvmOverloads constructor(
             button.layoutParams = layoutParams
             addView(button)
             if (resetOption == selectedResetOption) {
-                selectedButton = button;
+                selectedButton = button
             }
         }
     }
@@ -62,7 +62,7 @@ class HabitResetStreakButtons @JvmOverloads constructor(
         val buttonText = context.getString(resetOption.nameRes)
         button.text = buttonText
         button.contentDescription = toContentDescription(buttonText, isActive)
-        button.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_white)
+        button.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
 
         if (isActive) {
             button.background.setTint(tintColor)
@@ -70,7 +70,7 @@ class HabitResetStreakButtons @JvmOverloads constructor(
             button.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
         } else {
             button.background.setTint(ContextCompat.getColor(context, R.color.taskform_gray))
-            button.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+            button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
             button.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
         }
         button.setOnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
index 65d9b3e95..e5dd7b69e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
@@ -40,7 +40,7 @@ class HabitScoringButtonsView @JvmOverloads constructor(
                 positiveView.contentDescription = toContentDescription(R.string.positive_habit_form, R.string.on)
                 positiveTextView.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
             } else {
-                positiveTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+                positiveTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
                 positiveView.contentDescription = toContentDescription(R.string.positive_habit_form, R.string.off)
                 positiveTextView.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
             }
@@ -55,7 +55,7 @@ class HabitScoringButtonsView @JvmOverloads constructor(
                 negativeView.contentDescription = toContentDescription(R.string.negative_habit_form, R.string.on)
                 negativeTextView.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
             } else {
-                negativeTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+                negativeTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
                 negativeView.contentDescription = toContentDescription(R.string.negative_habit_form, R.string.off)
                 negativeTextView.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
             }
@@ -75,7 +75,7 @@ class HabitScoringButtonsView @JvmOverloads constructor(
         }
         negativeView.setOnClickListener {
             isNegative = !isNegative
-            sendAccessibilityEvent(AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION);
+            sendAccessibilityEvent(AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION)
         }
 
         isPositive = true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
index 0b487f6c1..23fab8ec7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
@@ -76,7 +76,7 @@ class ReminderItemFormView @JvmOverloads constructor(
     init {
         minimumHeight = 38.dpToPx(context)
         inflate(R.layout.task_form_reminder_item, true)
-        background = context.getDrawable(R.drawable.layout_rounded_bg_task_form)
+        background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_task_form)
         background.mutate().setTint(ContextCompat.getColor(context, R.color.taskform_gray))
         gravity = Gravity.CENTER_VERTICAL
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
index 50bebcf13..9dea1b431 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
@@ -48,7 +48,7 @@ class TaskDifficultyButtons @JvmOverloads constructor(
                 addView(space)
             }
             if (difficulty.value == selectedDifficulty) {
-                selectedButton = button;
+                selectedButton = button
             }
         }
     }
@@ -63,8 +63,8 @@ class TaskDifficultyButtons @JvmOverloads constructor(
             view.findViewById<TextView>(R.id.text_view).typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
         } else {
             view.findViewById<ImageView>(R.id.image_view).background.mutate().setTint(ContextCompat.getColor(context, R.color.taskform_gray))
-            view.findViewById<TextView>(R.id.text_view).setTextColor(ContextCompat.getColor(context, R.color.gray_100))
-            difficultyColor = ContextCompat.getColor(context, R.color.gray_400)
+            view.findViewById<TextView>(R.id.text_view).setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            difficultyColor = ContextCompat.getColor(context, R.color.disabled_background)
             view.findViewById<TextView>(R.id.text_view).typeface = Typeface.create("sans-serif", Typeface.NORMAL)
         }
         val drawable = HabiticaIconsHelper.imageOfTaskDifficultyStars(difficultyColor, difficulty.value, true).asDrawable(resources)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
index 131c6e958..1df41bdf6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
@@ -258,12 +258,12 @@ class TaskSchedulingControls @JvmOverloads constructor(
             button.contentDescription = toContentDescription(weekdays[weekdayCode], isActive)
             button.tag = weekdayCode
             if (isActive) {
-                button.background = context.getDrawable(R.drawable.habit_scoring_circle_selected)
+                button.background = ContextCompat.getDrawable(context, R.drawable.habit_scoring_circle_selected)
                 button.background.mutate().setTint(tintColor)
                 button.setTextColor(ContextCompat.getColor(context, R.color.white))
             } else {
-                button.background = context.getDrawable(R.drawable.habit_scoring_circle)
-                button.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+                button.background = ContextCompat.getDrawable(context, R.drawable.habit_scoring_circle)
+                button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
             }
             button.setOnClickListener {
                 setWeekdayActive(weekdayCode, !isActive)
@@ -299,7 +299,7 @@ class TaskSchedulingControls @JvmOverloads constructor(
     }
 
     private fun styleButtonAsInactive(button: TextView) {
-        button.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+        button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
         button.background.mutate().setTint(ContextCompat.getColor(context, R.color.taskform_gray))
         button.contentDescription = toContentDescription(button.text, false)
     }
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 925ec944b..11e29784e 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
@@ -31,7 +31,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
 
     private lateinit var yesterdailiesList: LinearLayout
 
-    private val taskGray: Int by bindColor(context, R.color.task_gray)
+    private val taskGray: Int by bindColor(context, R.color.disabled_background)
 
     init {
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
@@ -109,16 +109,16 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
         checkbox?.isChecked = item.completed
         checkbox?.setOnCheckedChangeListener { _, isChecked ->
             item.completed = isChecked
-            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe({ }, RxErrorHandler.handleEmptyError())
             configureChecklistView(checklistView, task, item)
         }
         checklistView.setOnClickListener {
             item.completed = !item.completed
-            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe({ }, RxErrorHandler.handleEmptyError())
             configureChecklistView(checklistView, task, item)
         }
         val checkboxHolder = checklistView.findViewById<View>(R.id.checkBoxHolder)
-        checkboxHolder.setBackgroundResource(R.color.gray_700)
+        checkboxHolder.setBackgroundResource(R.color.window_background)
         val textView = checklistView.findViewById(R.id.checkedTextView) as? TextView
         textView?.text = item.text
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
index b817fe4b5..e15c91c6e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
@@ -41,7 +41,7 @@ class AvatarStatsWidgetProvider : BaseWidgetProvider() {
         this.appWidgetManager = appWidgetManager
         this.context = context
 
-        userRepository?.getUser()?.firstElement()?.subscribe(Consumer<User> { this.updateData(it) }, RxErrorHandler.handleEmptyError())
+        userRepository.getUser().firstElement()?.subscribe({ this.updateData(it) }, RxErrorHandler.handleEmptyError())
     }
 
     override fun configureRemoteViews(remoteViews: RemoteViews, widgetId: Int, columns: Int, rows: Int): RemoteViews {
@@ -114,7 +114,7 @@ class AvatarStatsWidgetProvider : BaseWidgetProvider() {
 
             avatarView.setAvatar(user)
             val finalRemoteViews = remoteViews
-            avatarView.onAvatarImageReady(Consumer { bitmap ->
+            avatarView.onAvatarImageReady({ bitmap ->
                 finalRemoteViews.setImageViewBitmap(R.id.avatar_view, bitmap)
                 appWidgetManager.partiallyUpdateAppWidget(allWidgetIds, finalRemoteViews)
             })
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
index 73c1a759d..520103c83 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
@@ -65,7 +65,7 @@ class HabitButtonWidgetProvider : BaseWidgetProvider() {
 
             if (taskId != null) {
                 userRepository.getUser().firstElement().flatMap { user -> taskRepository.taskChecked(user, taskId, TaskDirection.UP.text == direction, false, null) }
-                        .subscribe(Consumer { taskDirectionData -> showToastForTaskDirection(context, taskDirectionData) }, RxErrorHandler.handleEmptyError(), Action { this.onUpdate(context, mgr, ids) })
+                        .subscribe({ taskDirectionData -> showToastForTaskDirection(context, taskDirectionData) }, RxErrorHandler.handleEmptyError(), { this.onUpdate(context, mgr, ids) })
             }
         }
         super.onReceive(context, intent)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
index f9a955d51..ee955ca38 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
@@ -45,7 +45,7 @@ class HabitButtonWidgetService : Service() {
         makeTaskMapping()
 
         for (taskid in this.taskMapping.keys) {
-            taskRepository.getUnmanagedTask(taskid).firstElement().subscribe(Consumer<Task> { this.updateData(it) }, RxErrorHandler.handleEmptyError())
+            taskRepository.getUnmanagedTask(taskid).firstElement().subscribe({ this.updateData(it) }, RxErrorHandler.handleEmptyError())
         }
 
         stopSelf()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
index 2c9ea4ebc..2399a17d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
@@ -50,7 +50,7 @@ abstract class TaskListFactory internal constructor(val context: Context, intent
                     .flatMapMaybe { tasks -> taskRepository.getTaskCopies(tasks).firstElement() }
                     .subscribeOn(AndroidSchedulers.mainThread())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(Consumer { tasks ->
+                    .subscribe({ tasks ->
                         reloadData = false
                         taskList = tasks
                         AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgetId, R.id.list_view)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
index 5cd7c9d9a..778b8f5c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
@@ -42,7 +42,7 @@ abstract class TaskListWidgetProvider : BaseWidgetProvider() {
 
             if (taskId != null) {
                 userRepository.getUser().firstElement().flatMap { user -> taskRepository.taskChecked(user, taskId, up = true, force = false, notifyFunc = null) }
-                        .subscribe(Consumer { taskDirectionData ->
+                        .subscribe({ taskDirectionData ->
                             showToastForTaskDirection(context, taskDirectionData)
                             AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
                         }, RxErrorHandler.handleEmptyError())
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/MountTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/MountTest.kt
index 8423b781c..020a098a4 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/MountTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/MountTest.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.android.habitica.models.inventory;
+package com.habitrpg.android.habitica.models.inventory
 
 import android.content.Context
 import com.google.common.truth.Truth.assertThat
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt
index f0f19d8d8..2cfa8b83e 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.android.habitica.models.inventory;
+package com.habitrpg.android.habitica.models.inventory
 
 import android.content.Context
 import com.google.common.truth.Truth.assertThat
diff --git a/build.gradle b/build.gradle
index 501f17995..b19cb22e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.0'
     ext.build_tools_version = '29.0.0'
     ext.sdk_version = 28
 
@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.1'
         classpath "io.realm:realm-gradle-plugin:6.0.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.1.0"