diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index a36049ec9..8d875260e 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -12,6 +12,7 @@
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" tools:node="remove" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
 
 
     <application
@@ -115,10 +116,6 @@
             android:name=".ui.activities.GiftGemsActivity"
             android:label="@string/gift_gems">
         </activity>
-        <activity
-            android:name=".ui.activities.GiftOneGetOneInfoActivity"
-            android:label="@string/gift_one_get_one">
-        </activity>
         <activity
             android:name=".ui.activities.GuidelinesActivity"
             android:label="@string/community_guidelines">
@@ -128,12 +125,11 @@
         <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"
             tools:ignore="UnusedAttribute"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateVisible|adjustResize">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/Habitica/AndroidManifestTesting.xml b/Habitica/AndroidManifestTesting.xml
index a22b7fb94..b2a3cbd1a 100644
--- a/Habitica/AndroidManifestTesting.xml
+++ b/Habitica/AndroidManifestTesting.xml
@@ -11,7 +11,6 @@
         android:minSdkVersion="15"
         android:targetSdkVersion="24" />
 
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -66,10 +65,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"
@@ -119,7 +114,7 @@
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <receiver  android:process=":remote" android:name=".NotificationPublisher" />
 
-        <receiver android:process=":remote" android:name=".receivers.TaskReceiver"></receiver>
+        <receiver android:process=":remote" android:name=".receivers.TaskReceiver" />
         <receiver android:name=".receivers.TaskAlarmBootReceiver" android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
             <intent-filter>
                 <action android:name="android.intent.action._BOOT_COMPLETED"/>
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 6354a298a..51aea9b20 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath('com.noveogroup.android:check:1.2.5') {
             exclude module: 'checkstyle'
             exclude module: 'pmd-java'
@@ -42,60 +42,56 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //Networking
-    implementation 'com.squareup.okhttp3:okhttp:3.14.6'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.6'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
     //REST API handling
-    implementation('com.squareup.retrofit2:retrofit:2.7.1') {
+    implementation('com.squareup.retrofit2:retrofit:2.9.0') {
         exclude module: 'okhttp'
     }
-    implementation 'com.squareup.retrofit2:converter-gson:2.7.1'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.7.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
     //Crash Logging
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
 
     //Dependency Injection
-    implementation 'com.google.dagger:dagger:2.27'
-    kapt 'com.google.dagger:dagger-compiler:2.25.4'
+    implementation 'com.google.dagger:dagger:2.31.2'
+    kapt 'com.google.dagger:dagger-compiler:2.31.2'
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
     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.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    // Emojis
-    implementation 'com.github.viirus:emoji-lib:0.0.5'
     // Markdown
-    implementation "io.noties.markwon:core:4.2.0"
-    implementation "io.noties.markwon:ext-strikethrough:4.2.0"
-    implementation "io.noties.markwon:image:4.2.0"
-    implementation "io.noties.markwon:recycler:4.2.0"
-    implementation "io.noties.markwon:html:4.2.0"
-    // About View for all dependent Libraries, we are using
-    implementation('com.mikepenz:aboutlibraries:5.9.4@aar') {
-        transitive = true
-    }
+    implementation "io.noties.markwon:core:4.6.1"
+    implementation "io.noties.markwon:ext-strikethrough:4.6.1"
+    implementation "io.noties.markwon:image:4.6.1"
+    implementation "io.noties.markwon:recycler:4.6.1"
+    implementation "io.noties.markwon:html:4.6.1"
     //Eventbus
-    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'org.greenrobot:eventbus:3.2.0'
     // IAP Handling / Verification
-    implementation 'org.solovyev.android:checkout:1.2.1'
+    implementation 'org.solovyev.android:checkout:1.2.2'
     //Facebook
-    implementation('com.facebook.android:facebook-android-sdk:4.40.0') {
+    implementation('com.facebook.android:facebook-android-sdk:8.1.0') {
         transitive = true
     }
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
     //RxJava
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
-    implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    implementation 'io.reactivex.rxjava3:rxjava:3.0.9'
+    implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
+    implementation "com.github.akarnokd:rxjava3-bridge:3.0.0"
 
     //Analytics
-    implementation 'com.amplitude:android-sdk:2.23.2'
+    implementation 'com.amplitude:android-sdk:2.30.0'
     // Fresco Image Management Library
-    implementation('com.facebook.fresco:fresco:2.0.0') {
+    implementation('com.facebook.fresco:fresco:2.4.0') {
         exclude module: 'bolts-android'
     }
-    implementation('com.facebook.fresco:animated-gif:2.0.0') {
+    implementation('com.facebook.fresco:animated-gif:2.4.0') {
         exclude module: 'bolts-android'
     }
     //Tests
@@ -112,30 +108,27 @@ dependencies {
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.0'
     testImplementation 'org.powermock:powermock-module-junit4:1.7.0'
     //Leak Detection
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
-    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
     //Push Notifications
-    implementation 'com.google.firebase:firebase-core:17.5.0'
-    implementation 'com.google.firebase:firebase-messaging:20.2.4'
-    implementation 'com.google.firebase:firebase-config:19.2.0'
-    implementation 'com.google.firebase:firebase-perf:19.0.8'
-    implementation 'com.google.android.gms:play-services-auth:18.1.0'
-    implementation 'io.realm:android-adapters:3.1.0'
+    implementation 'com.google.firebase:firebase-core:18.0.1'
+    implementation 'com.google.firebase:firebase-messaging:21.0.1'
+    implementation 'com.google.firebase:firebase-config:20.0.2'
+    implementation 'com.google.firebase:firebase-perf:19.1.0'
+    implementation 'com.google.android.gms:play-services-auth:19.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.nex3z:flow-layout:1.2.2'
 
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
     implementation "androidx.paging:paging-runtime-ktx:2.1.2"
     implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'
 
-    implementation 'com.willowtreeapps:signinwithapplebutton:0.2'
+    implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
 
     implementation project(':shared')
 }
@@ -155,25 +148,20 @@ android {
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "STORE", "\"google\""
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
-        multiDexEnabled true
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2519
-        versionName "2.8"
+        versionCode 2695
+        versionName "3.2"
     }
 
-    viewBinding {
-        enabled = true
+    buildFeatures {
+        viewBinding true
     }
 
     lintOptions {
         abortOnError false
     }
 
-    viewBinding {
-        enabled true
-    }
-
     signingConfigs {
         release
     }
@@ -183,7 +171,6 @@ android {
         debug {
             applicationIdSuffix ".debug"
             debuggable true
-            multiDexEnabled true
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             // Disable fabric build ID generation for debug builds
@@ -195,7 +182,6 @@ android {
         release {
             signingConfig signingConfigs.release
             debuggable false
-            multiDexEnabled true
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -271,6 +257,11 @@ android {
     }
 }
 
+androidExtensions {
+    features = ['parcelize']
+    experimental = true
+}
+
 Properties props = new Properties()
 def propFile = new File('signingrelease.properties')
 if (propFile.canRead()) {
@@ -343,4 +334,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/proguard-rules.pro b/Habitica/proguard-rules.pro
index 038acf3b3..80cc5c85e 100644
--- a/Habitica/proguard-rules.pro
+++ b/Habitica/proguard-rules.pro
@@ -74,9 +74,6 @@
 -dontwarn javax.**
 -dontwarn io.realm.**
 
-#support library
--keep class android.support.v7.widget.SearchView { *; }
-
 #eventbus
 -keepclassmembers class ** {
     @org.greenrobot.eventbus.Subscribe <methods>;
diff --git a/Habitica/res/color/dialog_button_text_color.xml b/Habitica/res/color/dialog_button_text_color.xml
new file mode 100644
index 000000000..3d5214e3c
--- /dev/null
+++ b/Habitica/res/color/dialog_button_text_color.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="1.00" android:color="@color/text_brand_neon" android:state_checkable="true" android:state_checked="true" android:state_enabled="true"/>
+    <item android:alpha="0.60" android:color="?attr/colorOnSurface" android:state_checkable="true" android:state_checked="false" android:state_enabled="true"/>
+    <item android:alpha="1.00" android:color="@color/text_brand_neon" android:state_enabled="true"/>
+    <item android:alpha="0.38" android:color="?attr/colorOnSurface"/>
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..f3452f064
Binary files /dev/null and b/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_left.png b/Habitica/res/drawable-hdpi/g1g1_promo_left.png
index 59dcd684f..7530e505d 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_left.png and b/Habitica/res/drawable-hdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-hdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..ca3893bc5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-hdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..f024e8000
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..07a0a816f
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_right.png
index fd03bab4f..410b9f7e5 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_right.png and b/Habitica/res/drawable-hdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-hdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..482f62438
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..5870b55b6
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..1708142bc
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_dailies_selected.webp b/Habitica/res/drawable-hdpi/icon_dailies.webp
similarity index 100%
rename from Habitica/res/drawable-hdpi/icon_dailies_selected.webp
rename to Habitica/res/drawable-hdpi/icon_dailies.webp
diff --git a/Habitica/res/drawable-hdpi/icon_habits_selected.webp b/Habitica/res/drawable-hdpi/icon_habits.webp
similarity index 100%
rename from Habitica/res/drawable-hdpi/icon_habits_selected.webp
rename to Habitica/res/drawable-hdpi/icon_habits.webp
diff --git a/Habitica/res/drawable-hdpi/icon_rewards_selected.webp b/Habitica/res/drawable-hdpi/icon_rewards.webp
similarity index 100%
rename from Habitica/res/drawable-hdpi/icon_rewards_selected.webp
rename to Habitica/res/drawable-hdpi/icon_rewards.webp
diff --git a/Habitica/res/drawable-hdpi/icon_todos_selected.webp b/Habitica/res/drawable-hdpi/icon_todos.webp
similarity index 100%
rename from Habitica/res/drawable-hdpi/icon_todos_selected.webp
rename to Habitica/res/drawable-hdpi/icon_todos.webp
diff --git a/Habitica/res/drawable-hdpi/no_background.png b/Habitica/res/drawable-hdpi/no_background.png
new file mode 100644
index 000000000..3b4306613
Binary files /dev/null and b/Habitica/res/drawable-hdpi/no_background.png differ
diff --git a/Habitica/res/drawable-hdpi/subscriber_banner_dark.png b/Habitica/res/drawable-hdpi/subscriber_banner_dark.png
new file mode 100644
index 000000000..fc85f736e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/subscriber_banner_dark.png differ
diff --git a/Habitica/res/drawable-hdpi/task_icon_team.png b/Habitica/res/drawable-hdpi/task_icon_team.png
new file mode 100644
index 000000000..5b8c03e38
Binary files /dev/null and b/Habitica/res/drawable-hdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-hdpi/team_info_icon.png b/Habitica/res/drawable-hdpi/team_info_icon.png
new file mode 100644
index 000000000..1f0372b42
Binary files /dev/null and b/Habitica/res/drawable-hdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable-hdpi/won_challenge_icon.png b/Habitica/res/drawable-hdpi/won_challenge_icon.png
new file mode 100644
index 000000000..ca83d23b1
Binary files /dev/null and b/Habitica/res/drawable-hdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-mdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-mdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..03e3f959b
Binary files /dev/null and b/Habitica/res/drawable-mdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_left.png b/Habitica/res/drawable-mdpi/g1g1_promo_left.png
index 9f858cd6b..eed4a13cc 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_left.png and b/Habitica/res/drawable-mdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..bdc4377e4
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-mdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..7d46ed660
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..077e318f2
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_right.png
index 80d855105..26458f1ad 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_right.png and b/Habitica/res/drawable-mdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..92eab4fe9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..32968bfa0
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..37d6eee82
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png
new file mode 100644
index 000000000..08657fd5c
Binary files /dev/null and b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_dailies_selected.webp b/Habitica/res/drawable-mdpi/icon_dailies.webp
similarity index 100%
rename from Habitica/res/drawable-mdpi/icon_dailies_selected.webp
rename to Habitica/res/drawable-mdpi/icon_dailies.webp
diff --git a/Habitica/res/drawable-mdpi/icon_dailies_selected.png b/Habitica/res/drawable-mdpi/icon_dailies_selected.png
new file mode 100644
index 000000000..251fc7aca
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_dailies_selected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_habits_selected.webp b/Habitica/res/drawable-mdpi/icon_habits.webp
similarity index 100%
rename from Habitica/res/drawable-mdpi/icon_habits_selected.webp
rename to Habitica/res/drawable-mdpi/icon_habits.webp
diff --git a/Habitica/res/drawable-mdpi/icon_habits_selected.png b/Habitica/res/drawable-mdpi/icon_habits_selected.png
new file mode 100644
index 000000000..019135af1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_habits_selected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_rewards_selected.webp b/Habitica/res/drawable-mdpi/icon_rewards.webp
similarity index 100%
rename from Habitica/res/drawable-mdpi/icon_rewards_selected.webp
rename to Habitica/res/drawable-mdpi/icon_rewards.webp
diff --git a/Habitica/res/drawable-mdpi/icon_rewards_selected.png b/Habitica/res/drawable-mdpi/icon_rewards_selected.png
new file mode 100644
index 000000000..48c79fc08
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_rewards_selected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_todos_selected.webp b/Habitica/res/drawable-mdpi/icon_todos.webp
similarity index 100%
rename from Habitica/res/drawable-mdpi/icon_todos_selected.webp
rename to Habitica/res/drawable-mdpi/icon_todos.webp
diff --git a/Habitica/res/drawable-mdpi/icon_todos_selected.png b/Habitica/res/drawable-mdpi/icon_todos_selected.png
new file mode 100644
index 000000000..87b84c02f
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_todos_selected.png differ
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-mdpi/no_background.png b/Habitica/res/drawable-mdpi/no_background.png
new file mode 100644
index 000000000..8c9e7f1ce
Binary files /dev/null and b/Habitica/res/drawable-mdpi/no_background.png differ
diff --git a/Habitica/res/drawable-mdpi/subscribe_header_dark.png b/Habitica/res/drawable-mdpi/subscribe_header_dark.png
new file mode 100644
index 000000000..77e46fbd0
Binary files /dev/null and b/Habitica/res/drawable-mdpi/subscribe_header_dark.png differ
diff --git a/Habitica/res/drawable-mdpi/subscriber_banner_dark.png b/Habitica/res/drawable-mdpi/subscriber_banner_dark.png
new file mode 100644
index 000000000..3c968c244
Binary files /dev/null and b/Habitica/res/drawable-mdpi/subscriber_banner_dark.png differ
diff --git a/Habitica/res/drawable-mdpi/task_icon_team.png b/Habitica/res/drawable-mdpi/task_icon_team.png
new file mode 100644
index 000000000..cea954d3d
Binary files /dev/null and b/Habitica/res/drawable-mdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-mdpi/team_info_icon.png b/Habitica/res/drawable-mdpi/team_info_icon.png
new file mode 100644
index 000000000..0e94b23f7
Binary files /dev/null and b/Habitica/res/drawable-mdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable-mdpi/won_challenge_icon.png b/Habitica/res/drawable-mdpi/won_challenge_icon.png
new file mode 100644
index 000000000..fc62e61a8
Binary files /dev/null and b/Habitica/res/drawable-mdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-hdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-hdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..6eff51109
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-hdpi/no_background.png b/Habitica/res/drawable-night-hdpi/no_background.png
new file mode 100644
index 000000000..75e93a504
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/no_background.png differ
diff --git a/Habitica/res/drawable-night-hdpi/won_challenge_icon.png b/Habitica/res/drawable-night-hdpi/won_challenge_icon.png
new file mode 100644
index 000000000..b4e4b76aa
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-mdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-mdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..4e00ffce3
Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-mdpi/no_background.png b/Habitica/res/drawable-night-mdpi/no_background.png
new file mode 100644
index 000000000..2d2e5fe82
Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/no_background.png differ
diff --git a/Habitica/res/drawable-night-mdpi/won_challenge_icon.png b/Habitica/res/drawable-night-mdpi/won_challenge_icon.png
new file mode 100644
index 000000000..defd8f1e8
Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-xhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-xhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..6573424b6
Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-xhdpi/no_background.png b/Habitica/res/drawable-night-xhdpi/no_background.png
new file mode 100644
index 000000000..d7ebe62ed
Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-night-xhdpi/won_challenge_icon.png b/Habitica/res/drawable-night-xhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..3608f2db4
Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-xxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-xxhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..1340361ea
Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-xxhdpi/no_background.png b/Habitica/res/drawable-night-xxhdpi/no_background.png
new file mode 100644
index 000000000..a3e452f26
Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-night-xxhdpi/won_challenge_icon.png b/Habitica/res/drawable-night-xxhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..92f26055e
Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-xxxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-xxxhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..6c66fb945
Binary files /dev/null and b/Habitica/res/drawable-night-xxxhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-xxxhdpi/won_challenge_icon.png b/Habitica/res/drawable-night-xxxhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..92f26055e
Binary files /dev/null and b/Habitica/res/drawable-night-xxxhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-v21/bb_bottom_bar_item_container.xml b/Habitica/res/drawable-v21/bb_bottom_bar_item_container.xml
deleted file mode 100644
index 1185bd5fe..000000000
--- a/Habitica/res/drawable-v21/bb_bottom_bar_item_container.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <FrameLayout
-        android:id="@+id/bb_bottom_bar_outer_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:id="@+id/bb_bottom_bar_background_overlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="invisible" />
-
-        <LinearLayout
-            android:id="@+id/bb_bottom_bar_item_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="horizontal" />
-
-    </FrameLayout>
-
-</merge>
\ No newline at end of file
diff --git a/Habitica/res/drawable-v21/ic_close_white_24dp.xml b/Habitica/res/drawable-v21/ic_close_white_24dp.xml
deleted file mode 100644
index 4881cf5be..000000000
--- a/Habitica/res/drawable-v21/ic_close_white_24dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#FFFFFF" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..860b11f9b
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png
index 7d2614f6a..0b37a0491 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..bdaaf36b0
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..fa4d52f5c
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..5bc571b1a
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png
index b4578e4ee..ebe4225f9 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..e2f40b772
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..91682e80b
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..4cae12268
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png
new file mode 100644
index 000000000..eb06901ee
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_dailies_selected.webp b/Habitica/res/drawable-xhdpi/icon_dailies.webp
similarity index 100%
rename from Habitica/res/drawable-xhdpi/icon_dailies_selected.webp
rename to Habitica/res/drawable-xhdpi/icon_dailies.webp
diff --git a/Habitica/res/drawable-xhdpi/icon_dailies_selected.png b/Habitica/res/drawable-xhdpi/icon_dailies_selected.png
new file mode 100644
index 000000000..feacd1657
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_dailies_selected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_habits_selected.webp b/Habitica/res/drawable-xhdpi/icon_habits.webp
similarity index 100%
rename from Habitica/res/drawable-xhdpi/icon_habits_selected.webp
rename to Habitica/res/drawable-xhdpi/icon_habits.webp
diff --git a/Habitica/res/drawable-xhdpi/icon_habits_selected.png b/Habitica/res/drawable-xhdpi/icon_habits_selected.png
new file mode 100644
index 000000000..3dc462d86
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_habits_selected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_rewards_selected.webp b/Habitica/res/drawable-xhdpi/icon_rewards.webp
similarity index 100%
rename from Habitica/res/drawable-xhdpi/icon_rewards_selected.webp
rename to Habitica/res/drawable-xhdpi/icon_rewards.webp
diff --git a/Habitica/res/drawable-xhdpi/icon_rewards_selected.png b/Habitica/res/drawable-xhdpi/icon_rewards_selected.png
new file mode 100644
index 000000000..e25c6805c
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_rewards_selected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_todos_selected.webp b/Habitica/res/drawable-xhdpi/icon_todos.webp
similarity index 100%
rename from Habitica/res/drawable-xhdpi/icon_todos_selected.webp
rename to Habitica/res/drawable-xhdpi/icon_todos.webp
diff --git a/Habitica/res/drawable-xhdpi/icon_todos_selected.png b/Habitica/res/drawable-xhdpi/icon_todos_selected.png
new file mode 100644
index 000000000..f242b02a7
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_todos_selected.png differ
diff --git a/Habitica/res/drawable-xhdpi/no_background.png b/Habitica/res/drawable-xhdpi/no_background.png
new file mode 100644
index 000000000..dc10295c7
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscribe_header_dark.png b/Habitica/res/drawable-xhdpi/subscribe_header_dark.png
new file mode 100644
index 000000000..859b8a208
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/subscribe_header_dark.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscriber_banner_dark.png b/Habitica/res/drawable-xhdpi/subscriber_banner_dark.png
new file mode 100644
index 000000000..80bea79ec
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/subscriber_banner_dark.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_icon_team.png b/Habitica/res/drawable-xhdpi/task_icon_team.png
new file mode 100644
index 000000000..a32a12e99
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-xhdpi/team_info_icon.png b/Habitica/res/drawable-xhdpi/team_info_icon.png
new file mode 100644
index 000000000..a28ae3e66
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable-xhdpi/won_challenge_icon.png b/Habitica/res/drawable-xhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..914b8cca8
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..44b5516fa
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png
index 8604581a8..960b525f3 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..6382735fe
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..b2623c1c2
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..d800b10c4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png
index 6efdd65db..c283f62a8 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..7443adeed
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..7b36e791e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..18f0845d9
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png
new file mode 100644
index 000000000..4c91cbd4f
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_dailies_selected.webp b/Habitica/res/drawable-xxhdpi/icon_dailies.webp
similarity index 100%
rename from Habitica/res/drawable-xxhdpi/icon_dailies_selected.webp
rename to Habitica/res/drawable-xxhdpi/icon_dailies.webp
diff --git a/Habitica/res/drawable-xxhdpi/icon_dailies_selected.png b/Habitica/res/drawable-xxhdpi/icon_dailies_selected.png
new file mode 100644
index 000000000..09ab53a9a
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_dailies_selected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_habits_selected.webp b/Habitica/res/drawable-xxhdpi/icon_habits.webp
similarity index 100%
rename from Habitica/res/drawable-xxhdpi/icon_habits_selected.webp
rename to Habitica/res/drawable-xxhdpi/icon_habits.webp
diff --git a/Habitica/res/drawable-xxhdpi/icon_habits_selected.png b/Habitica/res/drawable-xxhdpi/icon_habits_selected.png
new file mode 100644
index 000000000..33986b253
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_habits_selected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_rewards_selected.webp b/Habitica/res/drawable-xxhdpi/icon_rewards.webp
similarity index 100%
rename from Habitica/res/drawable-xxhdpi/icon_rewards_selected.webp
rename to Habitica/res/drawable-xxhdpi/icon_rewards.webp
diff --git a/Habitica/res/drawable-xxhdpi/icon_rewards_selected.png b/Habitica/res/drawable-xxhdpi/icon_rewards_selected.png
new file mode 100644
index 000000000..51a117205
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_rewards_selected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_todos_selected.webp b/Habitica/res/drawable-xxhdpi/icon_todos.webp
similarity index 100%
rename from Habitica/res/drawable-xxhdpi/icon_todos_selected.webp
rename to Habitica/res/drawable-xxhdpi/icon_todos.webp
diff --git a/Habitica/res/drawable-xxhdpi/icon_todos_selected.png b/Habitica/res/drawable-xxhdpi/icon_todos_selected.png
new file mode 100644
index 000000000..66a617ed3
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_todos_selected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/no_background.png b/Habitica/res/drawable-xxhdpi/no_background.png
new file mode 100644
index 000000000..ae58b4a5e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscribe_header_dark.png b/Habitica/res/drawable-xxhdpi/subscribe_header_dark.png
new file mode 100644
index 000000000..68bce9fcd
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/subscribe_header_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png b/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png
new file mode 100644
index 000000000..accd24c6f
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/task_icon_team.png b/Habitica/res/drawable-xxhdpi/task_icon_team.png
new file mode 100644
index 000000000..9e566f7c0
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-xxhdpi/team_info_icon.png b/Habitica/res/drawable-xxhdpi/team_info_icon.png
new file mode 100644
index 000000000..8145895e4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable-xxhdpi/won_challenge_icon.png b/Habitica/res/drawable-xxhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..c68d6d205
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xxxhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..1f8a82a75
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_left.png
index 80d6813de..a7c52f6a5 100644
Binary files a/Habitica/res/drawable-xxxhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..06d2a689a
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..b6b968bdb
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..1910abcce
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_right.png
index 796d90bef..b5414eea9 100644
Binary files a/Habitica/res/drawable-xxxhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..aac553c1b
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..ff9023e67
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..03b6c18d7
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/task_icon_team.png b/Habitica/res/drawable-xxxhdpi/task_icon_team.png
new file mode 100644
index 000000000..ef9b0acf5
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/team_info_icon.png b/Habitica/res/drawable-xxxhdpi/team_info_icon.png
new file mode 100644
index 000000000..8982e1eac
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable/achievement_badge_bg.xml b/Habitica/res/drawable/achievement_badge_bg.xml
index 47576caee..591490270 100644
--- a/Habitica/res/drawable/achievement_badge_bg.xml
+++ b/Habitica/res/drawable/achievement_badge_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/gray_300" />
+    <solid android:color="@color/dimmed_background" />
     <corners android:radius="12dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/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_bg.xml b/Habitica/res/drawable/adventure_guide_menu_bg.xml
index b5877fa91..7a696951d 100644
--- a/Habitica/res/drawable/adventure_guide_menu_bg.xml
+++ b/Habitica/res/drawable/adventure_guide_menu_bg.xml
@@ -8,12 +8,12 @@
     </item>
     <item>
         <bitmap
-            android:gravity="left|top"
+            android:gravity="start|top"
             android:src="@drawable/gold_coins_left" />
     </item>
     <item>
         <bitmap
-            android:gravity="right|bottom"
+            android:gravity="end|bottom"
             android:src="@drawable/gold_coins_right" />
     </item>
 </layer-list>
\ 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/avatar_customization_category_bg.xml b/Habitica/res/drawable/avatar_customization_category_bg.xml
index 2f30bb800..300ee34d1 100644
--- a/Habitica/res/drawable/avatar_customization_category_bg.xml
+++ b/Habitica/res/drawable/avatar_customization_category_bg.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 <item>
     <shape android:shape="rectangle">
-        <solid android:color="?colorPrimaryOffset" />
+        <solid android:color="@color/brand_200" />
     </shape>
 </item>
     <item android:left="0dp" android:right="0dp" android:gravity="bottom">
diff --git a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
index 3be259e51..46989087c 100644
--- a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
+++ b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?colorPrimary" />
+            <solid android:color="@color/brand" />
         </shape>
     </item>
     <item android:left="0dp" android:right="0dp" android:gravity="bottom">
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/bb_bottom_bar_top_shadow.xml b/Habitica/res/drawable/bb_bottom_bar_top_shadow.xml
deleted file mode 100644
index fd78efcf7..000000000
--- a/Habitica/res/drawable/bb_bottom_bar_top_shadow.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="90"
-        android:startColor="#1F000000"
-        android:endColor="#00000000"
-        android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/border.xml b/Habitica/res/drawable/border.xml
deleted file mode 100644
index 961ca4066..000000000
--- a/Habitica/res/drawable/border.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparent" />
-
-    <stroke
-        android:width="1dip"
-        android:color="#000000"/>
-
-</shape>
diff --git a/Habitica/res/drawable/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/challenge_gem_remove_button.xml b/Habitica/res/drawable/challenge_gem_remove_button.xml
index 6b0b2d3e5..c0816d931 100644
--- a/Habitica/res/drawable/challenge_gem_remove_button.xml
+++ b/Habitica/res/drawable/challenge_gem_remove_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/challenge_gem_remove_button_disabled" android:state_enabled="false"></item>
-    <item android:drawable="@drawable/challenge_gem_remove_button_enabled" android:state_enabled="true"></item>
+    <item android:drawable="@drawable/challenge_gem_remove_button_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/challenge_gem_remove_button_enabled" android:state_enabled="true" />
 </selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/checklist_unchecked.xml b/Habitica/res/drawable/checklist_unchecked.xml
index 1109b6b19..bb27279ad 100644
--- a/Habitica/res/drawable/checklist_unchecked.xml
+++ b/Habitica/res/drawable/checklist_unchecked.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-    <solid android:color="#A6FFFFFF" />
+    <solid android:color="@color/white" />
     <size android:height="20dp" android:width="20dp" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/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/class_selection_inset_arrow.xml b/Habitica/res/drawable/class_selection_inset_arrow.xml
index 8e631daf3..f0ba3ac24 100644
--- a/Habitica/res/drawable/class_selection_inset_arrow.xml
+++ b/Habitica/res/drawable/class_selection_inset_arrow.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24.0">
     <path
         android:pathData="M0,12l0,12 11.5,-5.7c6.3,-3.2 11.5,-6 11.5,-6.3 0,-0.3 -5.2,-3.1 -11.5,-6.3l-11.5,-5.7 0,12z"
-        android:strokeColor="@color/white"
-        android:fillColor="@color/white"/>
+        android:strokeColor="@color/content_background"
+        android:fillColor="@color/content_background"/>
 </vector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/confetti_blue.xml b/Habitica/res/drawable/confetti_blue.xml
index 7bf62fc88..26ffcc2f9 100644
--- a/Habitica/res/drawable/confetti_blue.xml
+++ b/Habitica/res/drawable/confetti_blue.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">
     <size android:height="4dp" android:width="8dp" />
-    <solid android:color="@color/blue_100" />
+    <solid android:color="@color/background_blue" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/confetti_green.xml b/Habitica/res/drawable/confetti_green.xml
index 3dc32447b..7b6fc1354 100644
--- a/Habitica/res/drawable/confetti_green.xml
+++ b/Habitica/res/drawable/confetti_green.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">
     <size android:height="4dp" android:width="8dp" />
-    <solid android:color="@color/green_100" />
+    <solid android:color="@color/background_green" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/confetti_red.xml b/Habitica/res/drawable/confetti_red.xml
index 36ecd37ad..a0ada10f1 100644
--- a/Habitica/res/drawable/confetti_red.xml
+++ b/Habitica/res/drawable/confetti_red.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">
 <size android:height="4dp" android:width="8dp" />
-    <solid android:color="@color/red_100" />
+    <solid android:color="@color/background_red" />
 </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..5a7c3dbfa 100644
--- a/Habitica/res/drawable/daily_checked.xml
+++ b/Habitica/res/drawable/daily_checked.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-            <solid android:color="@color/gray_600" />
-            <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>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/checkmark" android:gravity="center" />
-    </item>
-</layer-list>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
+    <solid android:color="@color/checkbox_fill_selected" />
+    <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>
\ No newline at end of file
diff --git a/Habitica/res/drawable/daily_inactive.xml b/Habitica/res/drawable/daily_inactive.xml
new file mode 100644
index 000000000..308ea3ff9
--- /dev/null
+++ b/Habitica/res/drawable/daily_inactive.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
+    <solid android:color="@color/checkbox_fill_inactive" />
+    <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>
\ No newline at end of file
diff --git a/Habitica/res/drawable/daily_unchecked.xml b/Habitica/res/drawable/daily_unchecked.xml
index fe23a6a13..8ee7a4e40 100644
--- a/Habitica/res/drawable/daily_unchecked.xml
+++ b/Habitica/res/drawable/daily_unchecked.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
     <solid android:color="@color/checkbox_fill" />
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/g1g1_menu_background.xml b/Habitica/res/drawable/g1g1_menu_background.xml
new file mode 100644
index 000000000..df3114871
--- /dev/null
+++ b/Habitica/res/drawable/g1g1_menu_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#925CF3"
+        android:endColor="#3BCAD7"
+        android:angle="135"/>
+    <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/g1g1_promo_background.xml b/Habitica/res/drawable/g1g1_promo_background.xml
new file mode 100644
index 000000000..2c7932f4c
--- /dev/null
+++ b/Habitica/res/drawable/g1g1_promo_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#925CF3"
+        android:endColor="#3BCAD7"
+        android:angle="135"/>
+    <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/g1g1_promo_pill_bg.xml b/Habitica/res/drawable/g1g1_promo_pill_bg.xml
new file mode 100644
index 000000000..c6ef244f0
--- /dev/null
+++ b/Habitica/res/drawable/g1g1_promo_pill_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#925CF3"
+        android:endColor="#3BCAD7"
+        android:angle="135"/>
+    <corners android:radius="10dp"/>
+    <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/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..16a7cd5c7 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/content_background_offset" 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/ic_check_white_18dp.xml b/Habitica/res/drawable/ic_check_white_18dp.xml
index 6b98d7012..ab7e02962 100644
--- a/Habitica/res/drawable/ic_check_white_18dp.xml
+++ b/Habitica/res/drawable/ic_check_white_18dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="18dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="18dp">
-    <path android:fillColor="#FFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+    <path android:fillColor="@color/white" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_close_white_24dp.xml b/Habitica/res/drawable/ic_close_white_24dp.xml
index 4881cf5be..dcb92cdd5 100644
--- a/Habitica/res/drawable/ic_close_white_24dp.xml
+++ b/Habitica/res/drawable/ic_close_white_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#FFFFFF" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+    <path android:fillColor="@color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
index 91fb946f2..386b0cde9 100644
--- a/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
+++ b/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#7e000000" android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml b/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
index 0f8503e44..03a069141 100644
--- a/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
+++ b/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#7e000000" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_launcher_foreground.xml b/Habitica/res/drawable/ic_launcher_foreground.xml
index d07e5042a..4fc0d90b9 100644
--- a/Habitica/res/drawable/ic_launcher_foreground.xml
+++ b/Habitica/res/drawable/ic_launcher_foreground.xml
@@ -7,12 +7,12 @@
         android:pathData="M290.6,290.5C287.6,286.6 284.4,291.1 276.8,290.3C271.8,289.8 271.8,287.6 271.8,257.7C271.8,257.7 271.3,255.9 274.2,254.2C277.1,252.6 285.8,238.1 280.4,225.8C275.1,213.4 278.9,214 281.2,215.3C283.4,216.5 284.5,214.9 283.2,208.2C280.4,194.2 276.1,189.4 266,183.1C259.4,179 261.8,171.5 271.2,172C275.9,172.3 275.9,172.3 276.4,168.7C277.4,163 275.5,153.2 268.5,151.9C263.6,151 257.5,156.2 250.3,152.6C243.1,148.9 231.2,158 226.3,160.1C221.5,162.2 217.4,162.2 211.9,162.1C206.3,162 214.8,171.3 223.3,173.4C230.7,175.2 227.8,176.5 227.4,182.5C226.9,189.2 228.8,192.1 225.7,192.8C220.9,193.8 215.6,181 207.4,175.6C188.7,163.3 177.7,169.2 145.1,133.4C139.5,127.2 141.8,146.4 145.2,156.6C154.5,184 172.5,187.6 181,188.4C188.1,189.1 192.9,187.5 192.9,190.2C192.9,192.2 184.5,193.1 181.3,193.1C178.2,193.1 174.7,192.8 170.7,192.1C164.2,190.9 174.1,207.3 180.5,212.5C191.2,221.3 203.4,224.6 213.3,225.6C216.1,225.9 220.2,225.9 220.2,228.1C220.2,230.2 218,230.7 215.5,230.7C201.7,230.8 193.8,241.9 191.5,254.6C190.1,262.7 191.2,271.9 191.3,278.7L191.9,283.6C193,292.1 162.1,295.5 158,281.6C153.6,266.5 177.9,258.6 178.4,244.2C178.7,235.1 170.4,231 170.4,231L170.4,227.3L170.4,217.7L160.8,217.7L160.8,208.2L151.3,208.2L151.3,198.6L141.7,198.6L141.7,208.2L141.7,217.7L141.7,227.3L151.3,227.3L151.3,236.8L160.8,236.8L167,236.8C170.6,236.8 173.4,239.2 173.1,244.3C172.3,256.8 145.5,264.6 152.9,284.6C158.2,299.1 181.1,299.3 204,299.3L204,299.3L246.9,299.3C248.2,299.3 250.1,298.7 247.3,291.7C245.1,286.2 237.5,290.1 231.1,290.1C224.2,290.1 224,284.3 228.4,278.2C231.1,274.5 234.5,271.7 240.3,269C249.2,264.9 256,270.2 259.4,274.8C264.2,281.4 265.7,289 261.5,290.2C256.3,291.6 254.8,291.8 254.6,296.7C254.5,300.2 256.1,299.2 264.2,299.2L290.9,299.2C295.1,299.2 294.8,296 290.6,290.5"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:strokeWidth="1"/>
     <path
         android:pathData="M132.2,198.9l9.5,0l0,-9.5l-9.5,0z"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:strokeWidth="1"/>
 </vector>
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_brand_400.xml
similarity index 69%
rename from Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml
rename to Habitica/res/drawable/layout_rounded_bg_brand_400.xml
index 5f9772be1..6a9cc53d0 100644
--- a/Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_brand_400.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/brand_400" />
     <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" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700.xml b/Habitica/res/drawable/layout_rounded_bg_brand_700.xml
index 1472825f9..81f46ab8d 100644
--- a/Habitica/res/drawable/layout_rounded_bg_brand_700.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_brand_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/brand_700" />
+    <solid android:color="@color/lightly_tinted_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/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_600.xml b/Habitica/res/drawable/layout_rounded_bg_offset.xml
similarity index 83%
rename from Habitica/res/drawable/layout_rounded_bg_gray_600.xml
rename to Habitica/res/drawable/layout_rounded_bg_offset.xml
index 30464dd0d..e2b945656 100644
--- a/Habitica/res/drawable/layout_rounded_bg_gray_600.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_600" />
+    <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_red.xml b/Habitica/res/drawable/layout_rounded_bg_red.xml
index c45e3d635..a261a2173 100644
--- a/Habitica/res/drawable/layout_rounded_bg_red.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_red.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/red_100" />
+    <solid android:color="@color/background_red" />
     <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_700.xml b/Habitica/res/drawable/layout_rounded_bg_window.xml
similarity index 83%
rename from Habitica/res/drawable/layout_rounded_bg_gray_700.xml
rename to Habitica/res/drawable/layout_rounded_bg_window.xml
index a5b041924..f3645d99d 100644
--- a/Habitica/res/drawable/layout_rounded_bg_gray_700.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_700" />
+    <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_window_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml
new file mode 100644
index 000000000..d2983eda5
--- /dev/null
+++ b/Habitica/res/drawable/layout_rounded_bg_window_brand_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/bar_radius"/>
+    <stroke android:width="2dp" android:color="@color/background_brand" />
+    <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_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_white.xml
similarity index 100%
rename from Habitica/res/drawable/layout_top_rounded_bg.xml
rename to Habitica/res/drawable/layout_top_rounded_bg_white.xml
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/no_party_background_gradient.xml b/Habitica/res/drawable/no_party_background_gradient.xml
index 792a5b12d..a72529e44 100644
--- a/Habitica/res/drawable/no_party_background_gradient.xml
+++ b/Habitica/res/drawable/no_party_background_gradient.xml
@@ -4,8 +4,8 @@
     <gradient
         android:angle="90"
         android:centerColor="@color/transparent_white"
-        android:endColor="@color/white"
-        android:startColor="@color/white"
+        android:endColor="@color/content_background"
+        android:startColor="@color/content_background"
         android:type="linear"
         android:centerX="0.6"/>
 
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_gray_700.xml b/Habitica/res/drawable/pill_bg_content.xml
similarity index 81%
rename from Habitica/res/drawable/pill_bg_gray_700.xml
rename to Habitica/res/drawable/pill_bg_content.xml
index fc8626c84..34654a9f6 100644
--- a/Habitica/res/drawable/pill_bg_gray_700.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/gray_700"/>
+    <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_300.xml b/Habitica/res/drawable/pill_bg_purple_300.xml
index 841f8257a..5e2df8a8e 100644
--- a/Habitica/res/drawable/pill_bg_purple_300.xml
+++ b/Habitica/res/drawable/pill_bg_purple_300.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_300"/>
+    <solid android:color="@color/background_brand"/>
     <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_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_white.xml b/Habitica/res/drawable/pill_bg_window.xml
similarity index 82%
rename from Habitica/res/drawable/pill_bg_white.xml
rename to Habitica/res/drawable/pill_bg_window.xml
index f90c324d3..70382d6db 100644
--- a/Habitica/res/drawable/pill_bg_white.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/white"/>
+    <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/plus.xml b/Habitica/res/drawable/plus.xml
index cf36e152d..86497d05e 100644
--- a/Habitica/res/drawable/plus.xml
+++ b/Habitica/res/drawable/plus.xml
@@ -1,4 +1,4 @@
-<vector android:height="16dp" android:tint="#FFFFFF"
+<vector android:height="16dp" android:tint="@color/white"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/Habitica/res/drawable/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/round_checklist_unchecked.xml b/Habitica/res/drawable/round_checklist_unchecked.xml
index 54c3938e2..779bc97dd 100644
--- a/Habitica/res/drawable/round_checklist_unchecked.xml
+++ b/Habitica/res/drawable/round_checklist_unchecked.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="#A6FFFFFF" />
+    <solid android:color="@color/white" />
     <size android:height="20dp" android:width="20dp" />
 </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_dark_square.xml b/Habitica/res/drawable/rounded_purple_dark_square.xml
index eebd55800..710d9b4c7 100644
--- a/Habitica/res/drawable/rounded_purple_dark_square.xml
+++ b/Habitica/res/drawable/rounded_purple_dark_square.xml
@@ -5,7 +5,7 @@
 
     <!-- view background color -->
     <solid
-        android:color="@color/brand_300" >
+        android:color="@color/background_brand" >
     </solid>
 
     <!-- Here is the corner radius -->
diff --git a/Habitica/res/drawable/rounded_purple_square.xml b/Habitica/res/drawable/rounded_purple_square.xml
index 0dc0c7e65..bed89759c 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_300" />
+    <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..aeb16bbee 100644
--- a/Habitica/res/drawable/todo_checked.xml
+++ b/Habitica/res/drawable/todo_checked.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-            <solid android:color="@color/gray_600" />
-            <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>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/checkmark" android:gravity="center" />
-    </item>
-</layer-list>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
+    <solid android:color="@color/checkbox_fill_selected" />
+    <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-v22/progress_bar.xml b/Habitica/res/layout-v22/progress_bar.xml
new file mode 100644
index 000000000..5f2bdff98
--- /dev/null
+++ b/Habitica/res/layout-v22/progress_bar.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:weightSum="1">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:weightSum="1">
+        <View
+            android:id="@+id/pendingBar"
+            android:layout_width="0dip"
+            android:layout_height="match_parent" />
+
+        <View
+            android:id="@+id/pendingEmptyBarSpace"
+            android:layout_width="0dip"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:weightSum="1">
+        <View
+            android:id="@+id/bar"
+            android:layout_width="0dip"
+            android:layout_height="match_parent"/>
+        <View
+            android:id="@+id/emptyBarSpace"
+            android:layout_width="0dip"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+</merge>
diff --git a/Habitica/res/layout/achievement_challenge_item.xml b/Habitica/res/layout/achievement_challenge_item.xml
new file mode 100644
index 000000000..e78a2845a
--- /dev/null
+++ b/Habitica/res/layout/achievement_challenge_item.xml
@@ -0,0 +1,27 @@
+<?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:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:paddingTop="13dp"
+    android:paddingBottom="13dp">
+    <ImageView
+        android:id="@+id/achievement_count_label"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:gravity="center"
+        android:textColor="@color/text_ternary"
+        style="@style/Body1"
+        android:src="@drawable/won_challenge_icon"
+        android:layout_marginStart="35dp"
+        android:layout_marginEnd="25dp"/>
+    <TextView
+        android:id="@+id/achievement_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Body1"
+        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_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..8f008a50d 100644
--- a/Habitica/res/layout/achievement_section_header.xml
+++ b/Habitica/res/layout/achievement_section_header.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:layout_marginTop="@dimen/spacing_medium"
-    android:paddingLeft="@dimen/spacing_large"
-    android:paddingRight="@dimen/spacing_large">
+    android:paddingStart="@dimen/spacing_large"
+    android:paddingEnd="@dimen/spacing_large">
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
@@ -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..1c9e260ff 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"/>
 
@@ -109,7 +109,7 @@
                     android:layout_height="43dp"
                     android:text="@string/rogue"
                     style="@style/ClassSelectionClassButton"
-                    android:textColor="@color/brand_300" />
+                    android:textColor="@color/text_brand" />
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/warriorWrapper"
@@ -137,7 +137,7 @@
             </LinearLayout>
         </LinearLayout>
         <LinearLayout
-            android:id="@+id/selected_wrapper"
+            android:id="@+id/selected_wrapper_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1.7"
@@ -156,7 +156,7 @@
                 android:rotation="90"
                 android:src="@drawable/class_selection_inset_arrow"/>
             <TextView
-                android:id="@+id/selected_title_textview"
+                android:id="@+id/selected_title_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="Healer"
@@ -167,7 +167,7 @@
                 android:layout_height="0dp"
                 android:layout_weight="1">
                 <TextView
-                    android:id="@+id/selected_description_textview"
+                    android:id="@+id/selected_description_text_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:text="@string/healer_description"
@@ -175,12 +175,14 @@
                     style="@style/Body2"
                     android:lineSpacingExtra="4sp"/>
             </ScrollView>
-            <Button
+            <TextView
                 android:id="@+id/selected_button"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/HabiticaButton"
+                android:layout_height="43dp"
                 android:textColor="@color/white"
+                android:gravity="center"
+                style="@style/Subheader1"
+                android:background="@drawable/layout_rounded_bg_yellow_10"
                 tools:text="Becoma a Healer"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml
index 9c5cab514..95d517f8e 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"
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
-            android:theme="@style/Toolbar"
+            android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
@@ -38,17 +38,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?colorPrimaryOffset"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingStart="@dimen/activity_horizontal_margin"
+            android:paddingEnd="@dimen/activity_horizontal_margin"
             android:paddingTop="22dp">
 
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColorHint="?textColorPrimaryDark"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat"
                 android:id="@+id/create_challenge_title_input_layout">
 
@@ -58,9 +56,6 @@
                     android:layout_gravity="fill_horizontal"
                     android:hint="@string/new_challenge_title"
                     android:id="@+id/create_challenge_title"
-                    android:textColor="@color/white"
-                    android:textColorHighlight="?textColorPrimaryDark"
-                    android:textColorHint="?textColorPrimaryDark"
 
                     tools:text="Get in shape"
                     android:inputType="text" />
@@ -69,22 +64,18 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColorHint="?textColorPrimaryDark"
-
-                app:hintTextAppearance="@style/TextAppearance.AppCompat">
+                app:hintTextAppearance="@style/TextAppearance.AppCompat"
+                android:layout_marginBottom="12dp"
+                android:layout_marginTop="12dp">
 
                 <EditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/description_optional"
                     android:inputType="textMultiLine"
-
                     android:id="@+id/create_challenge_description"
                     android:maxLines="5"
-                    android:minLines="3"
-                    android:textColor="@color/white"
-                    android:textColorHighlight="?textColorPrimaryDark"
-                    android:textColorHint="?textColorPrimaryDark" />
+                    android:minLines="3" />
             </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
@@ -93,8 +84,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin">
+            android:paddingStart="@dimen/activity_horizontal_margin"
+            android:paddingEnd="@dimen/activity_horizontal_margin">
             <LinearLayout
                 android:id="@+id/challenge_creation_views"
                 android:layout_width="match_parent"
@@ -107,7 +98,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="23dp"
                 android:text="@string/gem_reward"
-                android:textColor="#cc000000" />
+                android:textColor="@color/text_primary" />
 
             <TextView
                 style="@style/Caption3"
@@ -116,7 +107,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="23dp"
                 android:text="@string/gem_reward"
-                android:textColor="#f74e52"
+                android:textColor="@color/text_red"
                 android:visibility="gone"
                 tools:visibility="visible"/>
 
@@ -125,16 +116,17 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="28dp">
 
-                <Button
+                <ImageButton
                     android:id="@+id/challenge_add_gem_btn"
                     style="@style/Body1_Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:drawableStart="@drawable/challenge_gem_add_button"/>
+                    android:tint="@color/text_brand_neon"
+                    android:src="@drawable/challenge_gem_add_button"/>
 
                 <ImageView
-                    android:id="@+id/gem_icon"
+                    android:id="@+id/gem_icon_view"
                     android:layout_width="18dp"
                     android:layout_height="18dp"
                     android:layout_gravity="center"/>
@@ -146,18 +138,19 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:inputType="number"
-                    android:textColor="#8a000000"
+                    android:textColor="@color/text_secondary"
                     android:text="0"
                     android:id="@+id/create_challenge_prize"
                     android:textAlignment="center" />
 
-                <Button
+                <ImageButton
                     android:id="@+id/challenge_remove_gem_btn"
                     style="@style/Body1_Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:drawableEnd="@drawable/challenge_gem_remove_button"/>
+                    android:tint="@color/text_brand_neon"
+                    android:src="@drawable/challenge_gem_remove_button"/>
 
             </LinearLayout>
 
@@ -167,14 +160,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="26dp"
                 android:text="@string/location"
-                android:textColor="#cc000000" />
+                android:textColor="@color/text_primary" />
 
             <Spinner
                 android:id="@+id/challenge_location_spinner"
                 style="@android:style/Widget.Material.Spinner.Underlined"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="#8a000000"
+                android:textColor="@color/text_secondary"
                 android:layout_marginTop="17dp" />
 
             <TextView
@@ -183,15 +176,14 @@
                 android:layout_height="20dp"
                 android:layout_marginTop="39dp"
                 android:drawablePadding="12dp"
-                android:drawableEnd="@drawable/ic_info_outline_black_24dp"
                 android:gravity="center"
                 android:text="@string/short_name"
-                android:textColor="#cc000000" />
+                android:textColor="@color/text_primary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-
+                android:layout_marginTop="10dp"
                 android:id="@+id/create_challenge_tag_input_layout"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
@@ -202,8 +194,8 @@
 
                     android:hint="@string/identify_your_challenge_with_a_tag"
                     android:maxLines="1"
-                    android:textColor="@color/gray_100"
-                    android:textColorHint="#61000000" />
+                    android:textColor="@color/text_secondary"
+                    android:textColorHint="@color/text_ternary" />
             </com.google.android.material.textfield.TextInputLayout>
 
             </LinearLayout>
@@ -211,6 +203,7 @@
                 style="@style/Subheader2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
                 android:text="@string/tasks" />
 
             <TextView
@@ -219,20 +212,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="23dp"
-                android:textColor="#f74e52"
+                android:textColor="@color/text_red"
                 android:text="@string/challenge_create_error_no_tasks"
                 android:visibility="gone"
                 tools:visibility="visible"/>
-
-
-
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-
             android:nestedScrollingEnabled="false"
+            android:background="@color/content_background"
             android:id="@+id/create_challenge_task_list">
 
         </androidx.recyclerview.widget.RecyclerView>
diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml
index 7dce1e80b..55083564d 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">
@@ -16,9 +16,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
-            android:theme="@style/Toolbar"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+            android:theme="@style/Toolbar.Modern"
+            app:layout_scrollFlags="scroll|enterAlways"/>
 
     </com.google.android.material.appbar.AppBarLayout>
             <ScrollView android:layout_width="match_parent"
@@ -32,14 +31,14 @@
                         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
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
                         android:layout_marginBottom="12dp" >
                     <View
                         android:id="@+id/healthIconBackgroundView"
@@ -55,14 +54,13 @@
                             android:layout_height="match_parent"
                             android:layout_width="0dp"
                             android:layout_weight="1"
-                            android:background="@drawable/layout_rounded_bg_gray_700"
-                            android:paddingTop="8dp"
+                            android:background="@drawable/layout_rounded_bg_window"
                             android:hint="@string/health"
                             android:paddingStart="16dp">
-                            <EditText
+                            <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/healthEditText"
                                 android:layout_width="match_parent"
-                                android:layout_height="match_parent"
+                                android:layout_height="wrap_content"
                                 android:inputType="numberDecimal"
                                 android:background="@android:color/transparent"/>
                         </com.google.android.material.textfield.TextInputLayout>
@@ -76,14 +74,14 @@
                         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
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
                         android:layout_marginBottom="12dp" >
                         <View
                             android:id="@+id/experienceIconBackgroundView"
@@ -98,14 +96,13 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
-                                android:paddingTop="8dp"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:hint="@string/experience_points"
                                 android:paddingStart="16dp">
-                                <EditText
+                                <com.google.android.material.textfield.TextInputEditText
                                     android:id="@+id/experienceEditText"
                                     android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
+                                    android:layout_height="wrap_content"
                                     android:inputType="numberDecimal"
                                     android:background="@android:color/transparent"/>
                             </com.google.android.material.textfield.TextInputLayout>
@@ -119,14 +116,14 @@
                             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
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
                         android:layout_marginBottom="12dp" >
                         <View
                             android:id="@+id/manaIconBackgroundView"
@@ -141,14 +138,13 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
-                                android:paddingTop="8dp"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:hint="@string/mana_points"
                                 android:paddingStart="16dp">
-                                <EditText
+                                <com.google.android.material.textfield.TextInputEditText
                                     android:id="@+id/manaEditText"
                                     android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
+                                    android:layout_height="wrap_content"
                                     android:inputType="numberDecimal"
                                     android:background="@android:color/transparent"/>
                             </com.google.android.material.textfield.TextInputLayout>
@@ -162,14 +158,14 @@
                             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
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
                         android:layout_marginBottom="12dp" >
                         <View
                             android:id="@+id/goldIconBackgroundView"
@@ -184,14 +180,13 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
-                                android:paddingTop="8dp"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:hint="@string/gold_capitalilzed"
                                 android:paddingStart="16dp">
-                                <EditText
+                                <com.google.android.material.textfield.TextInputEditText
                                     android:id="@+id/goldEditText"
                                     android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
+                                    android:layout_height="wrap_content"
                                     android:inputType="numberDecimal"
                                     android:background="@android:color/transparent"/>
                             </com.google.android.material.textfield.TextInputLayout>
@@ -205,14 +200,14 @@
                             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
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
                         android:layout_marginBottom="12dp" >
                         <View
                             android:id="@+id/levelIconBackgroundView"
@@ -227,14 +222,13 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
-                                android:paddingTop="8dp"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:hint="@string/character_level"
                                 android:paddingStart="16dp">
-                                <EditText
+                                <com.google.android.material.textfield.TextInputEditText
                                     android:id="@+id/levelEditText"
                                     android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
+                                    android:layout_height="wrap_content"
                                     android:inputType="number"
                                     android:background="@android:color/transparent"/>
                             </com.google.android.material.textfield.TextInputLayout>
@@ -248,14 +242,14 @@
                             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
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
                         android:layout_marginBottom="12dp" >
                         <View
                             android:id="@+id/streakIconBackgroundView"
@@ -271,14 +265,13 @@
                                 android:layout_height="match_parent"
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
-                                android:background="@drawable/layout_rounded_bg_gray_700"
-                                android:paddingTop="8dp"
+                                android:background="@drawable/layout_rounded_bg_window"
                                 android:hint="@string/streak_label"
                                 android:paddingStart="16dp">
-                                <EditText
+                                <com.google.android.material.textfield.TextInputEditText
                                     android:id="@+id/streakEditText"
                                     android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
+                                    android:layout_height="wrap_content"
                                     android:inputType="number"
                                     android:background="@android:color/transparent"/>
                             </com.google.android.material.textfield.TextInputLayout>
@@ -292,7 +285,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..8028c71a2 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">
@@ -19,11 +19,11 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/Theme.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView
-        android:id="@+id/fullprofile_scrollview"
+        android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -32,8 +32,39 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <androidx.cardview.widget.CardView
-                style="@style/CardView.Default"
+            <FrameLayout
+                android:id="@+id/blocked_disclaimer_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/FlatCardView"
+                android:background="@drawable/layout_rounded_bg_red"
+                android:visibility="gone">
+                <LinearLayout
+                    style="@style/CardContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/CardTitle"
+                        android:text="@string/user_is_blocked"
+                        android:textColor="@color/white"
+                        android:layout_gravity="center" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/CardText"
+                        android:text="@string/user_is_blocked_explanation"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:layout_gravity="center" />
+                </LinearLayout>
+            </FrameLayout>
+
+            <FrameLayout
+                style="@style/FlatCardView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -50,7 +81,7 @@
                         android:layout_height="wrap_content" />
 
                     <TextView
-                        android:id="@+id/profile_blurb"
+                        android:id="@+id/blurb_text_view"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textIsSelectable="true"
@@ -116,10 +147,10 @@
                             tools:text="100"/>
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
-            <androidx.cardview.widget.CardView
-                style="@style/CardView.Default"
+            <FrameLayout
+                style="@style/FlatCardView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <LinearLayout
@@ -134,6 +165,7 @@
                         android:text="@string/profile_send_message"
                         style="?android:attr/buttonBarButtonStyle"
                         android:textAllCaps="false"
+                        android:drawableTint="?colorPrimary"
                         android:textSize="13sp"
                         android:drawableTop="@drawable/icon_messages"/>
                     <Button
@@ -143,6 +175,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/profile_gift_gems"
                         style="?android:attr/buttonBarButtonStyle"
+                        android:drawableTint="?colorPrimary"
                         android:textAllCaps="false"
                         android:textSize="13sp"
                         android:drawableTop="@drawable/icon_gift_gems"/>
@@ -153,17 +186,17 @@
                         android:layout_height="wrap_content"
                         android:text="@string/profile_gift_subscription"
                         style="?android:attr/buttonBarButtonStyle"
+                        android:drawableTint="?colorPrimary"
                         android:textAllCaps="false"
                         android:textSize="13sp"
                         android:drawableTop="@drawable/icon_gift_subscription"/>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
-            <androidx.cardview.widget.CardView
-                style="@style/CardView.Default"
+            <FrameLayout
+                style="@style/FlatCardView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-
                 <LinearLayout
                     style="@style/CardContent"
                     android:layout_width="match_parent"
@@ -177,17 +210,17 @@
                         android:text="@string/battle_gear"
                         android:textStyle="bold" />
                     <TableLayout
-                        android:id="@+id/equipment_table"
+                        android:id="@+id/equipment_table_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:shrinkColumns="1"
                         android:stretchColumns="0" />
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/profile_costume_card"
-                style="@style/CardView.Default"
+            <FrameLayout
+                style="@style/FlatCardView"
+                android:id="@+id/costume_card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -204,17 +237,17 @@
                         android:text="@string/costume"
                         android:textStyle="bold" />
                     <TableLayout
-                        android:id="@+id/costume_table"
+                        android:id="@+id/costume_table_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:shrinkColumns="1"
                         android:stretchColumns="0" />
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/profile_attributes_card"
-                style="@style/CardView.Default"
+            <FrameLayout
+                style="@style/FlatCardView"
+                android:id="@+id/attributes_card_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:clickable="true"
@@ -228,7 +261,7 @@
                     android:weightSum="1">
 
                     <TableLayout
-                        android:id="@+id/attributes_table"
+                        android:id="@+id/attributes_table_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:stretchColumns="0,1,2,3,4">
@@ -279,11 +312,11 @@
 
                     </TableLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
 
-            <androidx.cardview.widget.CardView
-                style="@style/CardView.Default"
+            <FrameLayout
+                style="@style/FlatCardView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -316,7 +349,7 @@
                                 android:text="@string/profile_pets_found" />
 
                             <TextView
-                                android:id="@+id/profile_pets_found_count"
+                                android:id="@+id/pets_found_count"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 tools:text="#" />
@@ -336,7 +369,7 @@
                                 android:text="@string/profile_mounts_tamed" />
 
                             <TextView
-                                android:id="@+id/profile_mounts_tamed_count"
+                                android:id="@+id/mounts_tamed_count"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 tools:text="#" />
@@ -348,12 +381,12 @@
                         </TableRow>
                     </TableLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
 
-            <androidx.cardview.widget.CardView
+            <FrameLayout
+                style="@style/FlatCardView"
                 android:id="@+id/profile_achievements_card"
-                style="@style/CardView.Default"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -371,20 +404,20 @@
                         android:textStyle="bold" />
 
                     <ProgressBar
-                        android:id="@+id/avatar_achievements_progress"
+                        android:id="@+id/achievement_progress"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
                         android:indeterminate="true" />
 
                     <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-                        android:id="@+id/recyclerView"
+                        android:id="@+id/achievement_group_list"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scrollbarSize="3dp"
                         android:scrollbarThumbVertical="@color/scrollbarThumb"
                         android:scrollbars="vertical" />
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index aa1383e4c..ad55e0dc3 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,9 +35,9 @@
                     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" />
+                    app:popupTheme="@style/PopupTheme" />
             </com.google.android.material.appbar.AppBarLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/activity_gift1get1_info.xml b/Habitica/res/layout/activity_gift1get1_info.xml
deleted file mode 100644
index 7834af30f..000000000
--- a/Habitica/res/layout/activity_gift1get1_info.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/white">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="30dp"
-        android:background="@color/white">
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <ImageButton
-                android:id="@+id/cancel_button"
-                android:layout_width="50dp"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_close_purple_300_24dp"
-                style="@style/Base.Widget.AppCompat.Button.Borderless"
-                android:contentDescription="@string/cancel" />
-        </LinearLayout>
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="103dp"
-            android:background="@drawable/layout_rounded_bg_teal"
-            android:layout_marginStart="@dimen/spacing_large"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="24dp">
-            <LinearLayout
-                android:id="@+id/contentWrapper"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:orientation="vertical"
-                android:gravity="center"
-                android:paddingStart="@dimen/spacing_large"
-                android:paddingEnd="@dimen/spacing_large"
-                >
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/gift_one_get_one"
-                    android:textColor="@color/white"
-                    android:textSize="20sp"
-                    android:textStyle="bold"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/limited_event"
-                    android:textColor="@color/white"
-                    android:textAllCaps="true"
-                    android:textSize="10sp"
-                    style="@style/Caption2"
-                    android:textAlignment="center"
-                    android:maxWidth="240dp"
-                    android:letterSpacing="0.18"
-                    android:layout_marginBottom="12dp"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/g1g1_duration"
-                    android:textColor="@color/white"
-                    style="@style/Caption2"
-                    android:textSize="15sp"
-                    android:textAlignment="center"
-                    android:maxWidth="240dp"/>
-            </LinearLayout>
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/g1g1_promo_left"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentStart="true"
-                android:layout_marginStart="-5dp"/>
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/g1g1_promo_right"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="-5dp" />
-        </RelativeLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="@dimen/spacing_large"
-            android:paddingEnd="@dimen/spacing_large"
-            android:orientation="vertical">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/teal_10"
-            android:textStyle="bold"
-            android:textSize="15sp"
-            android:gravity="center"
-            android:lineHeight="20sp"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            android:text="@string/g1g1_info_1"/>
-            <Button
-                android:id="@+id/gift_button"
-                android:layout_width="match_parent"
-                android:layout_height="38dp"
-                style="@style/HabiticaButton.Purple"
-                android:text="@string/gift_a_subscription"
-                android:layout_marginTop="24dp"
-                android:layout_marginBottom="24dp"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/g1g1_info_2"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:gravity="center"
-                android:layout_marginBottom="7dp"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/g1g1_info_2_text"
-                android:gravity="center"
-                android:textColor="@color/gray_300"
-                android:lineSpacingExtra="1dp"
-                android:layout_marginBottom="22dp"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="15dp"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/g1g1_info_3"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:gravity="center"
-                android:layout_marginBottom="7dp"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/g1g1_info_3_text"
-                android:gravity="center"
-                android:textColor="@color/gray_300"
-                android:lineSpacingExtra="1dp"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="15dp"/>
-        </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml
index faa1191b7..d494d0732 100644
--- a/Habitica/res/layout/activity_gift_gems.xml
+++ b/Habitica/res/layout/activity_gift_gems.xml
@@ -3,15 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
-    <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:background="@color/content_background">
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         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"
@@ -22,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="?attr/actionBarSize"
-                android:theme="@style/Toolbar"
+                android:background="?attr/colorContentBackground"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
@@ -33,7 +31,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_gravity="bottom"
-            android:background="?attr/colorPrimary"
+            android:background="?headerOffsetColor"
             android:elevation="0dp"
             android:fillViewport="false"
 
@@ -43,7 +41,7 @@
 
             app:layout_collapseMode="pin"
             app:tabGravity="fill"
-            app:tabIndicatorColor="@android:color/white"
+            app:tabIndicatorColor="?colorPrimary"
             app:tabMode="fixed" />
 
         <androidx.viewpager.widget.ViewPager
@@ -51,6 +49,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..b66f4cdb3 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">
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
-            android:theme="@style/Toolbar"
+            android:background="?attr/colorContentBackground"
             app:layout_scrollFlags="scroll|enterAlways"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
@@ -40,16 +40,16 @@
                 app:showSleeping="false"
                 android:layout_gravity="center_horizontal"/>
             <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-                android:id="@+id/display_name_textview"
+                android:id="@+id/display_name_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 />
             <TextView
-                android:id="@+id/username_textview"
+                android:id="@+id/username_text_view"
                 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,50 +59,51 @@
                 android:layout_gravity="center_horizontal"
                 android:gravity="center_horizontal"
                 android:text="@string/gift_subscription_subtitle"
-                android:textColor="@color/gray_300"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"/>
+                android:textColor="@color/text_quad"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"/>
             <LinearLayout
                 android:id="@+id/subscriptionOptions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginTop="24dp"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
                 android:layout_marginBottom="@dimen/spacing_large">
 
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-                    android:id="@+id/subscription1month"
+                    android:id="@+id/subscription1MonthView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="@string/one_month"
+                    app:recurringText="@string/one_month_one_time"
                     app:gemCapText="@string/subscribe1month_gemcap"
                     app:isNonRecurring="true"/>
 
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-                    android:id="@+id/subscription3month"
+                    android:id="@+id/subscription3MonthView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="@string/three_months"
+                    app:recurringText="@string/three_months_one_time"
                     app:gemCapText="@string/subscribe3month_gemcap"
                     app:isNonRecurring="true"
                     app:hourGlassCount="1" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-                    android:id="@+id/subscription6month"
+                    android:id="@+id/subscription6MonthView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="@string/six_months"
+                    app:recurringText="@string/six_months_one_time"
                     app:gemCapText="@string/subscribe6month_gemcap"
                     app:isNonRecurring="true"
                     app:hourGlassCount="2" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-                    android:id="@+id/subscription12month"
+                    android:id="@+id/subscription12MonthView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="@string/twelve_months"
+                    app:recurringText="@string/twelve_months_one_time"
                     app:gemCapText="@string/subscribe12month_gemcap"
                     app:isNonRecurring="true"
+                    app:flagText="@string/save_20"
                     app:hourGlassCount="4" >
 
                 </com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView>
@@ -110,8 +111,8 @@
                 <Button
                     android:text="@string/send_gift"
                     android:layout_width="match_parent"
-                    android:layout_height="36dp"
-                    android:id="@+id/subscribeButton"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/subscription_button"
                     style="@style/HabiticaButton.Purple.Small"
                     android:textAllCaps="false"
                     android:layout_marginTop="8dp"/>
@@ -120,20 +121,35 @@
                 android:id="@+id/gift_subscription_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/teal_50"
-                android:padding="@dimen/spacing_large"
+                android:background="@drawable/g1g1_menu_background"
+                android:paddingHorizontal="32dp"
+                android:paddingVertical="16dp"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/g1g1_sparkle_left" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/gift_one_get_one"
                     android:gravity="center_horizontal"
                     android:textColor="@color/white"
-                    android:textSize="16sp"
+                    android:textSize="17sp"
+                    android:layout_marginHorizontal="12dp"
                     android:fontFamily="@string/font_family_medium"/>
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/g1g1_sparkle_right" />
+                </LinearLayout>
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="300dp"
                     android:layout_height="wrap_content"
                     android:text="@string/gift_one_get_one_detailed_description"
                     android:gravity="center_horizontal"
diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml
index 9096e6b16..f6182808d 100644
--- a/Habitica/res/layout/activity_group_form.xml
+++ b/Habitica/res/layout/activity_group_form.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/gray_700">
+    android:background="?attr/colorContentBackground">
 
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="30dp"
-        android:background="@color/white">
+        android:paddingBottom="20dp">
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -20,7 +19,8 @@
                 android:id="@+id/cancel_button"
                 android:layout_width="50dp"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_close_purple_300_24dp"
+                android:src="@drawable/ic_close_white_24dp"
+                android:tint="?colorPrimary"
                 style="@style/Base.Widget.AppCompat.Button.Borderless"
                 android:contentDescription="@string/cancel" />
             <Space
@@ -33,63 +33,52 @@
                 android:layout_height="wrap_content"
                 android:text="@string/create"
                 style="@style/HabiticaButton.Borderless"
-                android:textColor="?colorAccent"
+                android:textColor="?colorPrimary"
                 android:paddingEnd="@dimen/spacing_large"
                 android:paddingStart="@dimen/spacing_large"
                 android:minWidth="20dp"/>
         </LinearLayout>
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             app:hintTextAppearance="@style/TextAppearance.AppCompat"
             android:layout_marginTop="@dimen/spacing_small"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
-            android:background="@drawable/edittext"
-            android:textColorHint="@color/gray_50">
-            <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
-                android:id="@+id/group_name_edittext"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:textColorHint="@color/text_primary">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/group_name_edit_text"
                 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: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>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat"
                 android:layout_marginTop="@dimen/spacing_large"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"
-                android:background="@drawable/edittext"
-                android:textColorHint="@color/gray_50">
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:textColorHint="@color/text_primary">
 
-                <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
-                    android:id="@+id/group_description_edittext"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/group_description_edit_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="@string/description"
-                    android:textColor="@android:color/black"
                     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:gravity="top"
                     android:minLines="3"
-                    android:gravity="top" />
+                    android:scrollbars="vertical"/>
             </com.google.android.material.textfield.TextInputLayout>
 
 
@@ -97,14 +86,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_large"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large">
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large">
             <TextView
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:text="@string/only_leader_create_challenge"/>
-            <Switch
+            <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/leader_create_challenge_switch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -123,8 +112,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/privacyWrapper"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             tools:visibility="gone">
 
             <TextView
@@ -138,10 +127,5 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/privacySpinner" />
         </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="#1e000000"
-            android:layout_marginTop="@dimen/spacing_medium" />
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_guidelines.xml b/Habitica/res/layout/activity_guidelines.xml
index e22db839a..e144e34a6 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"
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index f11fe1000..b6e1f23c1 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -27,7 +27,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="6dp"
             android:layout_alignParentTop="true"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="40dp"
             android:textColor="@android:color/white"
             android:background="@color/transparent" />
 
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index ba11b3606..e7f0eb1cb 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -40,8 +40,8 @@
                 android:layout_height="wrap_content"
                 app:srcCompat="@drawable/cloud_1"
                 android:id="@+id/left_cloud_view"
-                android:layout_toLeftOf="@id/cloud_anchor"
-                android:layout_marginRight="150dp"
+                android:layout_toStartOf="@id/cloud_anchor"
+                android:layout_marginEnd="150dp"
                 android:layout_alignParentBottom="true"
                 android:scaleType="centerCrop"
                 android:paddingBottom="460dp"
@@ -51,8 +51,8 @@
                 android:layout_height="wrap_content"
                 app:srcCompat="@drawable/cloud_2"
                 android:id="@+id/right_cloud_view"
-                android:layout_toRightOf="@id/cloud_anchor"
-                android:layout_marginLeft="170dp"
+                android:layout_toEndOf="@id/cloud_anchor"
+                android:layout_marginStart="170dp"
                 android:layout_alignParentBottom="true"
                 android:scaleType="centerCrop"
                 android:paddingBottom="400dp"
@@ -72,8 +72,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingTop="@dimen/spacing_large"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:orientation="vertical"
             android:background="@color/transparent"
                         >
@@ -87,7 +87,7 @@
                 android:layout_margin="24dp"
                 android:contentDescription="@string/brand_name" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/new_game_button"
                 android:layout_width="@dimen/login_intro_button_size"
                 android:layout_height="@dimen/login_intro_button_size"
@@ -95,9 +95,10 @@
                 android:layout_gravity="center_vertical|center_horizontal"
                 android:textColor="@color/white"
                 android:layout_marginTop="@dimen/spacing_large"
-                android:background="@drawable/login_begin_button"/>
+                android:background="@drawable/login_begin_button"
+                android:backgroundTint="@color/brand_100"/>
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/show_login_button"
                 android:layout_width="@dimen/login_intro_button_size"
                 android:layout_height="@dimen/login_intro_button_size"
@@ -105,7 +106,8 @@
                 android:layout_gravity="center_vertical|center_horizontal"
                 android:textColor="@color/white"
                 android:layout_marginTop="@dimen/spacing_large"
-                android:background="@drawable/login_begin_button"/>
+                android:background="@drawable/login_begin_button"
+                android:backgroundTint="@color/brand_100"/>
 
             <ScrollView
                 android:layout_width="match_parent"
@@ -122,7 +124,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="@dimen/spacing_large"
-                    android:id="@+id/login_linear_layout"
+                    android:id="@+id/form_wrapper"
                     android:orientation="vertical"
                     android:background="@color/transparent">
 
@@ -131,7 +133,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:drawableEnd="@drawable/ic_username"
-                        android:drawableRight="@drawable/ic_username"
                         android:imeOptions="actionNext"
                         android:inputType="textPersonName"
                         android:nextFocusDown="@+id/email"
@@ -146,12 +147,12 @@
                         android:layout_height="wrap_content"
                         android:inputType="textEmailAddress"
                         android:imeOptions="actionNext"
-                        android:drawableRight="@drawable/ic_email"
                         android:nextFocusDown="@+id/password"
                         android:drawableEnd="@drawable/ic_email"
                         android:hint="@string/emailAddress"
                         android:textColor="@color/white_75_alpha"
                         android:theme="@style/LoginEditTextTheme"
+                        android:autofillHints="emailAddress"
                         />
 
                     <EditText
@@ -161,7 +162,6 @@
                         android:inputType="textPassword"
                         android:imeOptions="actionNext"
                         android:nextFocusDown="@+id/confirm_password"
-                        android:drawableRight="@drawable/ic_password"
                         android:drawableEnd="@drawable/ic_password"
                         android:hint="@string/password"
                         android:textColor="@color/white_75_alpha"
@@ -172,12 +172,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textPassword"
-                        android:drawableRight="@drawable/ic_password"
                         android:drawableEnd="@drawable/ic_password"
                         android:imeOptions="actionDone"
                         android:hint="@string/confirmpassword"
                         android:textColor="@color/white_75_alpha"
-                        android:theme="@style/LoginEditTextTheme"/>
+                        android:theme="@style/LoginEditTextTheme"
+                        android:autofillHints="newPassword"/>
 
                     <ProgressBar
                         android:id="@+id/PB_AsyncTask"
@@ -234,6 +234,19 @@
                         android:textColor="@color/white_75_alpha"
                         android:background="@color/transparent" />
 
+                    <TextView
+                        android:id="@+id/privacy_policy"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:layout_marginBottom="@dimen/spacing_xlarge"
+                        android:gravity="center_horizontal"
+                        android:layout_height="wrap_content"
+                        android:text="@string/login_disclaimer"
+                        android:linksClickable="true"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="@color/white_75_alpha"
+                        android:background="@color/transparent" />
+
                 </LinearLayout>
 
             </ScrollView>
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index a5dfb33e2..46a26521e 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. -->
@@ -46,6 +46,7 @@
                         android:layout_marginTop="?attr/actionBarSize"
                         android:layout_marginEnd="@dimen/header_border_spacing"
                         android:layout_marginStart="@dimen/header_border_spacing"
+                        android:layout_marginBottom="@dimen/spacing_medium"
                         app:layout_collapseMode="parallax" />
 
                     <androidx.appcompat.widget.Toolbar
@@ -53,10 +54,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,11 +97,8 @@
                     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"
-
                     app:layout_collapseMode="pin"
                     app:tabGravity="fill"
                     app:tabIndicatorColor="?colorPrimary"
@@ -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..70cd5d2fe 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"
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            app:popupTheme="@style/PopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/Habitica/res/layout/activity_party_invite.xml b/Habitica/res/layout/activity_party_invite.xml
index 8c62f603f..ea9b050a2 100644
--- a/Habitica/res/layout/activity_party_invite.xml
+++ b/Habitica/res/layout/activity_party_invite.xml
@@ -3,15 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
-    <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:background="@color/content_background">
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         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 +31,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 +49,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..36641ca4f 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"
@@ -22,13 +22,23 @@
                 app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
         </com.google.android.material.appbar.AppBarLayout>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:layout_gravity="top|center" >
-
+    </FrameLayout>
+        <FrameLayout
+            android:id="@+id/snackbar_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="158dp"
+            android:layout_gravity="bottom"
+            android:paddingBottom="68dp"/>
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index b67106b28..e9d5f836c 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
@@ -77,8 +77,8 @@
                 android:orientation="vertical" android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingTop="16dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="24dp"
+                android:paddingStart="24dp"
+                android:paddingEnd="24dp"
                 android:paddingBottom="25dp"
                 android:layout_marginBottom="0dp"
                 android:focusableInTouchMode="true">
@@ -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_setup.xml b/Habitica/res/layout/activity_setup.xml
index 427c8a7dd..5eb83565f 100644
--- a/Habitica/res/layout/activity_setup.xml
+++ b/Habitica/res/layout/activity_setup.xml
@@ -1,57 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent" android:layout_height="match_parent">
+    android:layout_width="match_parent" android:layout_height="match_parent">
 
     <com.habitrpg.android.habitica.ui.views.FadingViewPager
-            android:id="@+id/viewPager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/bottomBar" />
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/bottomBar" />
 
     <RelativeLayout
-            android:id="@+id/bottomBar"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentEnd="true"
-            android:background="@color/brand_300"
-            android:paddingLeft="@dimen/content_inset"
-            android:paddingRight="@dimen/content_inset"
-            android:gravity="center_vertical"
-            android:elevation="8dp">
-
+        android:id="@+id/bottomBar"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:background="@color/background_brand"
+        android:gravity="center_vertical"
+        android:elevation="8dp">
         <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/previousButton"
-                android:drawableLeft="@drawable/back_arrow_disabled"
-                android:background="@color/transparent"
-                android:drawablePadding="12dp"
-                android:textColor="@color/white"
-                android:layout_alignParentLeft="true"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/previousButton"
+            android:drawableStart="@drawable/back_arrow_disabled"
+            android:background="@color/transparent"
+            android:drawablePadding="12dp"
+            android:textColor="@color/white"
+            android:layout_alignParentStart="true"/>
         <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/next_button"
-                android:id="@+id/nextButton"
-                android:drawablePadding="12dp"
-                android:textColor="@color/white"
-                android:drawableRight="@drawable/forward_arrow_enabled"
-                android:background="@color/transparent"
-                android:layout_alignParentRight="true"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/next_button"
+            android:id="@+id/nextButton"
+            android:drawablePadding="12dp"
+            android:textColor="@color/white"
+            android:drawableEnd="@drawable/forward_arrow_enabled"
+            android:background="@color/transparent"
+            android:layout_alignParentEnd="true"/>
 
         <com.viewpagerindicator.IconPageIndicator
-                android:id="@+id/view_pager_indicator"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                />
-
+            android:id="@+id/view_pager_indicator"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true" />
     </RelativeLayout>
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_skill_members.xml b/Habitica/res/layout/activity_skill_members.xml
index e536a11c9..22228fcd8 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"
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/Habitica/res/layout/activity_skill_tasks.xml b/Habitica/res/layout/activity_skill_tasks.xml
index 499a5bb2e..c00c542eb 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"
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -28,17 +28,15 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
-        android:background="?attr/colorPrimary"
+        android:background="?headerOffsetColor"
         android:elevation="0dp"
         android:fillViewport="false"
-
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:layout_anchor="@+id/collapsing_toolbar"
         app:layout_anchorGravity="bottom"
-
         app:layout_collapseMode="pin"
         app:tabGravity="fill"
-        app:tabIndicatorColor="@android:color/white"
+        app:tabIndicatorColor="?colorPrimary"
         app:tabMode="fixed" />
 
     <androidx.viewpager.widget.ViewPager
@@ -46,6 +44,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..a126c679b 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"
@@ -47,7 +47,8 @@
                     android:layout_height="wrap_content"
                     style="@style/TaskFormTextInputLayoutAppearance"
                     app:boxStrokeColor="?attr/colorPrimary"
-                    android:backgroundTint="?attr/colorPrimary"
+                    app:hintTextColor="?colorPrimaryText"
+                    android:backgroundTint="?attr/colorPrimaryText"
                     android:alpha="0.75">
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/text_edit_text"
@@ -63,7 +64,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:boxStrokeColor="?attr/colorPrimary"
-                    android:backgroundTint="?attr/colorPrimary"
+                    android:backgroundTint="?attr/colorPrimaryText"
+                    app:hintTextColor="?colorPrimaryText"
+                    android:layout_marginTop="@dimen/spacing_large"
                     android:alpha="0.75">
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/notes_edit_text"
@@ -82,7 +85,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>
@@ -97,7 +100,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
                 <TextView
-                    android:id="@+id/reward_value_title"
+                    android:id="@+id/reward_value_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/cost"
@@ -107,7 +110,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="56dp" />
                 <TextView
-                    android:id="@+id/checklist_title"
+                    android:id="@+id/checklist_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/checklist"
@@ -117,7 +120,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
                 <TextView
-                    android:id="@+id/task_difficulty_title"
+                    android:id="@+id/task_difficulty_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/difficulty"
@@ -127,7 +130,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
                 <TextView
-                    android:id="@+id/habit_reset_streak_title"
+                    android:id="@+id/habit_reset_streak_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/reset_streak"
@@ -137,17 +140,17 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
                 <TextView
-                    android:id="@+id/scheduling_title"
+                    android:id="@+id/scheduling_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/scheduling"
                     style="@style/TaskFormSectionheader"/>
                 <com.habitrpg.android.habitica.ui.views.tasks.form.TaskSchedulingControls
-                    android:id="@+id/scheduling_controls"
+                    android:id="@+id/task_scheduling_controls"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
                 <TextView
-                    android:id="@+id/adjust_streak_title"
+                    android:id="@+id/adjust_streak_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/adjust_streak"
@@ -162,7 +165,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1">
                         <androidx.appcompat.widget.AppCompatEditText
-                            android:id="@+id/habit_adjust_positive_streak"
+                            android:id="@+id/habit_adjust_positive_streak_view"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:hint="@string/positive_habit_form"
@@ -177,7 +180,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1">
                         <androidx.appcompat.widget.AppCompatEditText
-                            android:id="@+id/habit_adjust_negative_streak"
+                            android:id="@+id/habit_adjust_negative_streak_view"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:hint="@string/negative_habit_form"
@@ -186,7 +189,7 @@
                 </LinearLayout>
 
                 <TextView
-                    android:id="@+id/reminders_title"
+                    android:id="@+id/reminders_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/reminders"
@@ -217,7 +220,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:text="@string/strength"
-                            android:layout_marginRight="@dimen/spacing_large"/>
+                            android:layout_marginEnd="@dimen/spacing_large"/>
                         <TextView
                             android:id="@+id/stat_constitution_button"
                             style="@style/TaskFormToggle"
@@ -236,7 +239,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:text="@string/intelligence"
-                            android:layout_marginRight="@dimen/spacing_large"/>
+                            android:layout_marginEnd="@dimen/spacing_large"/>
                         <TextView
                             android:id="@+id/stat_perception_button"
                             style="@style/TaskFormToggle"
@@ -247,7 +250,7 @@
                     </LinearLayout>
                 </LinearLayout>
                 <TextView
-                    android:id="@+id/tags_title"
+                    android:id="@+id/tags_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/tags"
diff --git a/Habitica/res/layout/activity_verify_username.xml b/Habitica/res/layout/activity_verify_username.xml
index 861aed5a5..3be1b7ff5 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"
@@ -60,10 +60,10 @@
                         <TextView
                             android:layout_height="42dp"
                             android:text="@string/display_name"
-                            android:paddingLeft="@dimen/spacing_medium"
-                            android:paddingRight="@dimen/spacing_medium"
-                            android:layout_marginLeft="1dp"
-                            android:background="@color/gray_700"
+                            android:paddingStart="@dimen/spacing_medium"
+                            android:paddingEnd="@dimen/spacing_medium"
+                            android:layout_marginStart="1dp"
+                            android:background="@color/window_background"
                             android:gravity="center_vertical"
                             />
                         <View android:background="@color/gray_600"
@@ -72,41 +72,41 @@
                         <EditText android:id="@+id/display_name_edit_text"
                             android:background="@color/transparent"
                             android:layout_height="42dp"
-                            android:layout_marginLeft="@dimen/spacing_large"
-                            android:layout_marginRight="@dimen/spacing_large"
+                            android:layout_marginStart="@dimen/spacing_large"
+                            android:layout_marginEnd="@dimen/spacing_large"
                             android:lines="1"/>
                     </TableRow>
                     <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:paddingStart="@dimen/spacing_medium"
+                            android:paddingEnd="@dimen/spacing_medium"
+                            android:layout_marginStart="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
-                            android:layout_marginLeft="@dimen/spacing_large"
-                            android:layout_marginRight="@dimen/spacing_large">
+                            android:layout_marginStart="@dimen/spacing_large"
+                            android:layout_marginEnd="@dimen/spacing_large">
                             <TextView
                                 android:layout_width="wrap_content"
                                 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"
                                 android:layout_weight="1"
                                 android:layout_height="42dp"
-                                android:layout_marginLeft="@dimen/spacing_small"
+                                android:layout_marginStart="@dimen/spacing_small"
                                 android:lines="1"/>
                         </LinearLayout>
                     </TableRow>
@@ -140,10 +140,10 @@
                     android:gravity="center"
                     android:layout_marginTop="@dimen/spacing_large"
                     android:layout_marginBottom="@dimen/spacing_medium"
-                    android:layout_marginLeft="@dimen/spacing_large"
-                    android:layout_marginRight="@dimen/spacing_large"
+                    android:layout_marginStart="@dimen/spacing_large"
+                    android:layout_marginEnd="@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_setup_drawer.xml b/Habitica/res/layout/avatar_setup_drawer.xml
index 449b68542..ad5a9f8dd 100644
--- a/Habitica/res/layout/avatar_setup_drawer.xml
+++ b/Habitica/res/layout/avatar_setup_drawer.xml
@@ -21,6 +21,7 @@
                 app:tabIndicatorHeight="2dp"
                 app:tabTextColor="@color/white_50_alpha"
                 app:tabSelectedTextColor="@color/white"
+            android:background="@color/brand"
                 app:tabGravity="center"
                 app:tabPaddingEnd="24dp"
                 app:tabPaddingStart="24dp"
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index b9d83cebb..2d5a4460f 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -1,79 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_centerHorizontal="true"
-              android:adjustViewBounds="true"
-              android:background="?attr/headerBackgroundColor"
-              android:focusable="true"
-              android:focusableInTouchMode="true"
-              android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:layout_centerHorizontal="true"
+    android:adjustViewBounds="true"
+    android:background="?attr/headerBackgroundColor"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical"
+    android:layout_marginBottom="8dp">
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <com.habitrpg.android.habitica.ui.AvatarView
-                android:id="@+id/avatarView"
-                android:layout_width="@dimen/avatar_header_width"
-                android:layout_height="@dimen/avatar_header_height"
-                android:layout_gravity="center_vertical"
-                android:layout_marginEnd="20dp"
-                android:contentDescription="@string/sidebar_avatar"
-                app:showBackground="true"
-                app:showMount="true"
-                app:showPet="true"/>
+            android:id="@+id/avatarView"
+            android:layout_width="@dimen/avatar_header_width"
+            android:layout_height="@dimen/avatar_header_height"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="20dp"
+            android:contentDescription="@string/sidebar_avatar"
+            app:showBackground="true"
+            app:showMount="true"
+            app:showPet="true"/>
 
         <LinearLayout
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.habitrpg.android.habitica.ui.views.ValueBar
+                android:id="@+id/hpBar"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_marginBottom="@dimen/header_bar_spacing"
+                app:barForegroundColor="@color/background_red"
+                app:barBackgroundColor="@color/window_background"
+                app:description="@string/HP_default"/>
 
             <com.habitrpg.android.habitica.ui.views.ValueBar
-                    android:id="@+id/hpBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/header_bar_spacing"
-                    app:barForegroundColor="@color/hpColor"
-                app:lightBackground="true"
-                    app:description="@string/HP_default"/>
+                android:id="@+id/xpBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/header_bar_spacing"
+                app:barForegroundColor="@color/background_yellow"
+                app:barBackgroundColor="@color/window_background"
+                app:description="@string/XP_default"/>
 
             <com.habitrpg.android.habitica.ui.views.ValueBar
-                    android:id="@+id/xpBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/header_bar_spacing"
-                    app:barForegroundColor="@color/xpColor"
-                app:lightBackground="true"
-                    app:description="@string/XP_default"/>
-
-            <com.habitrpg.android.habitica.ui.views.ValueBar
-                    android:id="@+id/mpBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:barForegroundColor="@color/mpColor"
-                app:lightBackground="true"
-                    app:description="@string/MP_default"/>
+                android:id="@+id/mpBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:barForegroundColor="@color/background_blue"
+                app:barBackgroundColor="@color/window_background"
+                app:description="@string/MP_default"/>
 
         </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
 
         <TextView
-                android:id="@+id/lvl_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                android:drawablePadding="6dp"
-                android:gravity="center"
-                android:textColor="?headerTextColor"
-                android:textSize="14sp"
-                tools:text="Lvl 12 Warrior"/>
+            android:id="@+id/lvl_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:drawablePadding="6dp"
+            android:gravity="center"
+            android:textColor="@color/text_secondary"
+            android:textSize="12sp"
+            tools:text="Lvl 12 Warrior"/>
 
         <ImageView
             android:id="@+id/buffImageView"
@@ -84,14 +85,13 @@
             tools:srcCompat="@tools:sample/avatars" />
 
         <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1"/>
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
 
         <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:id="@+id/currencyView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/bottom_navigation_item.xml b/Habitica/res/layout/bottom_navigation_item.xml
index c486a0e2c..507ba3b8c 100644
--- a/Habitica/res/layout/bottom_navigation_item.xml
+++ b/Habitica/res/layout/bottom_navigation_item.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.RelativeLayout"
     tools:background="?colorPrimary">
         <ImageView
             android:id="@+id/icon_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:src="@drawable/icon_habits_selected"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            tools:src="@drawable/icon_habits"
+            android:scaleType="center"
             android:layout_gravity="center"
             android:layout_alignParentTop="true"
             android:layout_marginTop="6dp"
@@ -30,11 +32,12 @@
             android:layout_below="@id/icon_view"
             android:gravity="center"
             />
-        <TextView
+        <com.habitrpg.android.habitica.ui.views.DayNightTextView
             android:id="@+id/selected_title_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/white"
+            app:nightTextColor="?colorPrimaryDistinct"
+            app:dayTextColor="@color/white"
             tools:text="@string/habits"
             android:layout_gravity="center"
             android:textSize="12sp"
diff --git a/Habitica/res/layout/bottom_navigation_submenu.xml b/Habitica/res/layout/bottom_navigation_submenu.xml
index ed5a78d0b..9deffd3b1 100644
--- a/Habitica/res/layout/bottom_navigation_submenu.xml
+++ b/Habitica/res/layout/bottom_navigation_submenu.xml
@@ -16,7 +16,7 @@
         android:textSize="10sp"
         android:fontFamily="@string/font_family_medium"
         android:letterSpacing="0.15"
-        android:textColor="@color/brand_300"
+        android:textColor="@color/background_brand"
         android:layout_marginStart="36dp"
         android:layout_alignStart="@id/icon_view"
         android:paddingStart="41dp"
diff --git a/Habitica/res/layout/challenge_add_task_item.xml b/Habitica/res/layout/challenge_add_task_item.xml
index 9a7a08479..d84169f50 100644
--- a/Habitica/res/layout/challenge_add_task_item.xml
+++ b/Habitica/res/layout/challenge_add_task_item.xml
@@ -4,12 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#FFF"
     android:orientation="vertical"
     android:gravity="center">
-
-
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="22dp"
@@ -17,12 +14,9 @@
         android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
         android:textAllCaps="false"
-        style="@style/Subheader2"
-        android:textColor="?colorAccent"
-        android:background="#f9f9f9"
+        style="@style/HabiticaButton.Gray"
         android:id="@+id/btn_add_task"
         tools:text="Add habit">
 
-    </Button>
-
+    </com.google.android.material.button.MaterialButton>
 </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..70038156e 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -7,7 +7,6 @@
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
     android:clickable="true"
-    android:background="#fff"
     android:orientation="horizontal"
     android:baselineAligned="false"
     android:paddingEnd="16dp">
@@ -36,7 +35,6 @@
             android:textColor="@color/gem_icon_color"
             android:textSize="17sp"
             android:textStyle="bold"/>
-
     </LinearLayout>
 
     <LinearLayout
@@ -54,6 +52,7 @@
             style="@style/ChallengeName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textColor="@color/text_primary"
             android:maxLines="3"
             tools:text="Name" />
 
@@ -61,7 +60,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"
@@ -81,20 +80,19 @@
                 style="@style/ChallengeTaskDetails"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginStart="4dp"
+                android:layout_marginStart="@dimen/spacing_small"
                 android:gravity="center_vertical"
                 tools:text="12334" />
             <TextView
                 android:id="@+id/official_challenge_view"
-                android:layout_marginLeft="@dimen/spacing_small"
+                android:layout_marginStart="@dimen/spacing_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Pill.Purple"
                 android:text="@string/official"/>
             <TextView
                 android:id="@+id/is_joined_label"
-                android:layout_marginLeft="@dimen/spacing_small"
+                android:layout_marginStart="@dimen/spacing_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Pill.Selected.Green"
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 90%
rename from Habitica/res/layout/tavern_chat_new_entry_item.xml
rename to Habitica/res/layout/chat_bar_view.xml
index 05c31bba4..b42d9b977 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/chat_bar_view.xml
@@ -7,8 +7,8 @@
             android:layout_width="match_parent"
             android:orientation="horizontal"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/spacing_medium"
-            android:paddingRight="@dimen/spacing_medium"
+            android:paddingStart="@dimen/spacing_medium"
+            android:paddingEnd="@dimen/spacing_medium"
             android:baselineAligned="false">
 
             <com.google.android.material.textfield.TextInputLayout
@@ -25,12 +25,12 @@
                     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"
-                    android:paddingLeft="@dimen/spacing_medium"
-                    android:paddingRight="@dimen/spacing_medium"
+                    android:paddingStart="@dimen/spacing_medium"
+                    android:paddingEnd="@dimen/spacing_medium"
                     android:paddingTop="4dp"
                     android:paddingBottom="4dp"
                     tools:height="200dp"/>
@@ -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 85%
rename from Habitica/res/layout/tavern_chat_item.xml
rename to Habitica/res/layout/chat_item.xml
index ee85c7df9..6aacc5fd8 100644
--- a/Habitica/res/layout/tavern_chat_item.xml
+++ b/Habitica/res/layout/chat_item.xml
@@ -5,9 +5,9 @@
     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:paddingLeft="@dimen/chat_horizontal_inset"
-    android:paddingRight="@dimen/chat_horizontal_inset"
+    android:background="@color/content_background"
+    android:paddingStart="@dimen/chat_horizontal_inset"
+    android:paddingEnd="@dimen/chat_horizontal_inset"
     android:paddingTop="@dimen/spacing_small"
     android:paddingBottom="@dimen/spacing_small">
     <com.habitrpg.android.habitica.ui.RoundedFrameLayout
@@ -30,18 +30,11 @@
             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
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:baselineAligned="false"
-                android:gravity="center_vertical"
-                android:shrinkColumns="0"
-                android:stretchColumns="2">
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:layout_height="wrap_content">
                     <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
                         android:id="@+id/user_label"
                         style="@style/ChatMessageUserTextViewStyle"
@@ -60,16 +53,16 @@
                         android:textColor="@color/white"
                         style="@style/Pill.Purple"
                         tools:text="Moderator"
-                        android:layout_marginLeft="@dimen/spacing_small"/>
+                        android:layout_marginStart="@dimen/spacing_small"/>
                     <View
                         android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="1dp"/>
                     <LinearLayout
                         android:id="@+id/like_background_layout"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="5dp"
                         android:layout_marginStart="5dp"
                         android:background="@drawable/layout_rounded_bg">
                         <TextView
@@ -81,8 +74,7 @@
                             android:gravity="center_vertical"
                             android:focusable="true" />
                     </LinearLayout>
-                </TableRow>
-            </TableLayout>
+            </LinearLayout>
             <TextView
                 android:id="@+id/subline_textview"
                 android:layout_width="wrap_content"
@@ -92,7 +84,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 +93,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 +104,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 +114,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 +124,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 +134,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/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index 3e6450a79..55ae48abf 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -12,22 +12,25 @@
             android:layout_width="@dimen/button_width"
             android:layout_height="match_parent"
             tools:background="@color/red_10">
-            <FrameLayout
+            <View
                 android:id="@+id/checkBoxBackground"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:gravity="center"
                 android:background="@drawable/checklist_unchecked"
-                android:layout_gravity="center">
+                android:layout_gravity="center" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
                 <ImageView
                     android:id="@+id/checkmark"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:layout_gravity="center"
+                    android:scaleType="center"
                     android:src="@drawable/checkmark" />
-            </FrameLayout>
         </FrameLayout>
-        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+        <com.habitrpg.android.habitica.ui.views.EllipsisTextView
             android:id="@+id/checkedTextView"
             style="@style/Body2"
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/class_spinner_dropdown_item.xml b/Habitica/res/layout/class_spinner_dropdown_item.xml
index b3cf67212..485049104 100644
--- a/Habitica/res/layout/class_spinner_dropdown_item.xml
+++ b/Habitica/res/layout/class_spinner_dropdown_item.xml
@@ -3,8 +3,8 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:minWidth="120dp"
-              android:paddingLeft="12dp"
-              android:paddingRight="12dp"
+              android:paddingStart="12dp"
+              android:paddingEnd="12dp"
               android:paddingTop="4dp"
               android:paddingBottom="4dp"
               android:gravity="center_vertical">
@@ -12,7 +12,7 @@
         android:id="@+id/classIconView"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:layout_marginRight="8dp"/>
+        android:layout_marginEnd="8dp"/>
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/class_spinner_dropdown_item_selected.xml b/Habitica/res/layout/class_spinner_dropdown_item_selected.xml
index c340c0f57..4c0222bb8 100644
--- a/Habitica/res/layout/class_spinner_dropdown_item_selected.xml
+++ b/Habitica/res/layout/class_spinner_dropdown_item_selected.xml
@@ -9,7 +9,7 @@
         android:id="@+id/classIconView"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:layout_marginRight="8dp"/>
+        android:layout_marginEnd="8dp"/>
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/customization_grid_background_item.xml b/Habitica/res/layout/customization_grid_background_item.xml
index 015dd88d8..2dff4eb5f 100644
--- a/Habitica/res/layout/customization_grid_background_item.xml
+++ b/Habitica/res/layout/customization_grid_background_item.xml
@@ -1,37 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/card_view"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_width="match_parent">
-    <RelativeLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
+    android:minHeight="60dp">
+
+    <LinearLayout
+        android:id="@+id/wrapper"
+        android:layout_width="76dp"
         android:layout_height="wrap_content"
-        android:minHeight="60dp"
+        android:background="@drawable/layout_rounded_bg_window"
         android:orientation="vertical"
-        android:clickable="true"
-        android:background="@drawable/selection_highlight">
-        <View
-            android:id="@+id/purchaseOverlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:background="@android:color/black" />
+        android:layout_gravity="center">
+
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/imageView"
-            android:layout_width="@dimen/avatar_width"
-            android:layout_height="@dimen/avatar_height"
-            android:layout_gravity="center_horizontal"
-            android:scaleType="fitCenter"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:layout_centerVertical="true"
-            android:layout_centerHorizontal="true" />
-
-    </RelativeLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+            android:layout_width="76dp"
+            android:layout_height="76dp"
+            android:layout_gravity="start"
+            app:roundedCornerRadius="6dp"
+            app:roundingBorderWidth="6dp"
+            android:scaleType="fitEnd" />
+        <FrameLayout
+            android:id="@+id/buy_button"
+            android:layout_width="match_parent"
+            android:layout_height="32dp"
+            android:background="@drawable/layout_rounded_bg_shopitem_price">
+            <com.habitrpg.android.habitica.ui.views.CurrencyView
+                android:id="@+id/price_label"
+                android:layout_width="wrap_content"
+                android:layout_height="32dp"
+                android:textColor="@color/text_quad"
+                tools:text="150"
+                style="@style/Body1"
+                android:textSize="15sp"
+                android:layout_gravity="center" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index 5d60f1577..5d9ba5d57 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">
 
@@ -20,6 +20,7 @@
             android:layout_width="60dp"
             android:layout_height="76dp"
             android:layout_gravity="start"
+            app:roundedCornerRadius="6dp"
             android:scaleType="fitEnd" />
         <FrameLayout
             android:id="@+id/buy_button"
@@ -30,10 +31,9 @@
                         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"
                         android:textSize="15sp"
                         android:layout_gravity="center" />
         </FrameLayout>
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..43bd384c0 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout 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="@color/white"
-    android:foreground="?selectableItemBackground"
-    android:orientation="vertical">
+    android:background="?attr/colorContentBackground"
+    android:foreground="?selectableItemBackground">
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/main_task_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -16,11 +14,8 @@
         android:layout_marginVertical="@dimen/task_spacing_vertical"
         android:background="@drawable/task_background"
         android:clipChildren="true"
-        android:minHeight="@dimen/task_min_height">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+        android:minHeight="@dimen/task_min_height"
+        android:orientation="vertical">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -31,15 +26,29 @@
                 <FrameLayout
                     android:id="@+id/checkBoxHolder"
                     android:layout_width="@dimen/button_width"
-                    android:layout_height="match_parent">
-
-                    <CheckBox
-                        android:id="@+id/checkBox"
-                        android:layout_width="@dimen/checkbox_size"
-                        android:layout_height="@dimen/checkbox_size"
+                    android:layout_height="match_parent"
+                    tools:background="@color/red_10">
+                    <View
+                        android:id="@+id/checkBoxBackground"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:gravity="center"
+                        android:background="@drawable/daily_checked"
+                        android:layout_gravity="center" />
+                    <ImageView
+                        android:id="@+id/checkmark"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
                         android:layout_gravity="center"
-                        android:button="@drawable/daily_checkbox"
-                        android:gravity="center" />
+                        android:scaleType="center"
+                        android:src="@drawable/checkmark" />
+                    <ImageView
+                        android:id="@+id/lock_view"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_gravity="center"
+                        android:scaleType="center"
+                        android:src="@drawable/checkmark" />
                 </FrameLayout>
                 <include layout="@layout/task_main_content" />
                 <ProgressBar
@@ -47,8 +56,8 @@
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="@dimen/spacing_small"
-                    android:layout_marginRight="@dimen/spacing_small"
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:layout_marginEnd="@dimen/spacing_small"
                     style="@style/Widget.AppCompat.ProgressBar"/>
                 <ImageButton
                     android:id="@+id/error_icon"
@@ -57,8 +66,8 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/transparent"
                     android:src="@drawable/ic_warning_black"
-                    android:layout_marginLeft="@dimen/spacing_small"
-                    android:layout_marginRight="@dimen/spacing_small"/>
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:layout_marginEnd="@dimen/spacing_small"/>
                 <include layout="@layout/checklist_indicator" />
             </LinearLayout>
             <LinearLayout
@@ -66,6 +75,5 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
-        </LinearLayout>
-    </FrameLayout>
-</LinearLayout>
+    </LinearLayout>
+</FrameLayout>
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_achievement_details.xml b/Habitica/res/layout/dialog_achievement_details.xml
index 6769dfc17..cd0ff78f4 100644
--- a/Habitica/res/layout/dialog_achievement_details.xml
+++ b/Habitica/res/layout/dialog_achievement_details.xml
@@ -4,9 +4,9 @@
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
-    android:paddingLeft="24dip"
+    android:paddingStart="24dip"
     android:paddingTop="24dip"
-    android:paddingRight="24dip">
+    android:paddingEnd="24dip">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/dialog_bulk_allocate.xml b/Habitica/res/layout/dialog_bulk_allocate.xml
index 8a7abbc83..4cdac38ba 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:statsColor="@color/text_brand_neon"
+        app:statsTextColor="@color/text_brand"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail_daily.xml b/Habitica/res/layout/dialog_challenge_detail_daily.xml
deleted file mode 100644
index 39422ee17..000000000
--- a/Habitica/res/layout/dialog_challenge_detail_daily.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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="@drawable/border_1f000000_white"
-    android:orientation="horizontal"
-    android:weightSum="3"
-    android:baselineAligned="false"
-    android:minHeight="60dp">
-
-    <FrameLayout
-        android:id="@+id/lock_icon_background"
-        android:layout_width="48dp"
-        android:layout_height="match_parent"
-        android:layout_marginRight="@dimen/spacing_large"
-        android:layout_marginTop="0.5dp"
-        android:layout_marginBottom="0.5dp">
-        <ImageView
-            android:id="@+id/lock_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="center"
-            android:scaleType="center"/>
-    </FrameLayout>
-
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="3">
-
-        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-            android:id="@+id/daily_title"
-            style="@style/Body1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="17dp"
-            android:layout_marginTop="15dp"
-            android:maxLines="1"
-            tools:text="Long text to see" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="@dimen/checklist_wrapper_width"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center">
-
-        <LinearLayout
-            android:id="@+id/checklistIndicatorWrapper"
-            android:layout_width="@dimen/checklist_wrapper_width"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:visibility="gone"
-            android:gravity="center"
-            tools:visibility="visible">
-
-            <TextView
-                style="@style/Caption4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="0" />
-
-            <View
-                android:id="@+id/checklistDivider"
-                android:layout_width="@dimen/checklist_divider_width"
-                android:layout_height="2dp"
-                android:background="#8a000000" />
-
-            <TextView
-                android:id="@+id/checkListAllTextView"
-                style="@style/Caption4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                tools:text="4" />
-        </LinearLayout>
-    </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
deleted file mode 100644
index 609a82ed9..000000000
--- a/Habitica/res/layout/dialog_challenge_detail_habit.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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:orientation="horizontal"
-              android:background="@drawable/border_1f000000_white"
-              android:weightSum="3"
-              android:baselineAligned="false"
-    android:minHeight="60dp">
-
-    <FrameLayout
-        android:id="@+id/lock_icon_background_plus"
-        android:layout_width="48dp"
-        android:layout_height="match_parent"
-        android:background="@color/gray_700"
-        android:layout_marginRight="@dimen/spacing_large"
-        android:layout_marginTop="0.5dp"
-        android:layout_marginBottom="0.5dp">
-        <ImageView
-            android:id="@+id/lock_icon_plus"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="center"
-            android:scaleType="center"/>
-    </FrameLayout>
-
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="3">
-
-        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-            android:id="@+id/habit_title"
-            style="@style/Body1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="17dp"
-            android:layout_marginTop="15dp"
-            android:maxLines="1"
-            tools:text="Long text to see" />
-
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/lock_icon_background_minus"
-        android:layout_width="48dp"
-        android:layout_height="match_parent"
-        android:background="@color/gray_700"
-        android:layout_marginLeft="@dimen/spacing_large"
-        android:layout_marginTop="0.5dp"
-        android:layout_marginBottom="0.5dp">
-        <ImageView
-            android:id="@+id/lock_icon_minus"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="center"
-            android:scaleType="center"/>
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail_reward.xml b/Habitica/res/layout/dialog_challenge_detail_reward.xml
deleted file mode 100644
index d5b591980..000000000
--- a/Habitica/res/layout/dialog_challenge_detail_reward.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:orientation="horizontal"
-    android:background="@drawable/border_1f000000_white"
-    android:weightSum="3"
-    android:baselineAligned="false"
-    android:minHeight="60dp">
-        <ImageView
-            android:id="@+id/gold_icon"
-            android:layout_width="16dp"
-            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
-            android:id="@+id/reward_title"
-            style="@style/Body1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="17dp"
-            android:layout_marginTop="15dp"
-            android:maxLines="1"
-            tools:text="Long text to see" />
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail_task_group.xml b/Habitica/res/layout/dialog_challenge_detail_task_group.xml
index c908c8756..b5c59ba51 100644
--- a/Habitica/res/layout/dialog_challenge_detail_task_group.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_task_group.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:layout_marginLeft="@dimen/spacing_large"
+        android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginTop="24dp"
         android:layout_marginBottom="@dimen/spacing_large"
         >
@@ -23,9 +23,9 @@
             android:id="@+id/task_count_view"
             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"
+            android:layout_marginStart="@dimen/spacing_medium"
+            style="@style/Pill.Content"
+            android:textColor="@color/text_dimmed"
             tools:text="2"/>
     </LinearLayout>
 
diff --git a/Habitica/res/layout/dialog_challenge_detail_todo.xml b/Habitica/res/layout/dialog_challenge_detail_todo.xml
deleted file mode 100644
index 790a38b4c..000000000
--- a/Habitica/res/layout/dialog_challenge_detail_todo.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="@drawable/border_1f000000_white"
-    android:orientation="horizontal"
-    android:weightSum="3"
-    android:baselineAligned="false"
-    android:minHeight="60dp">
-
-    <FrameLayout
-        android:id="@+id/lock_icon_background"
-        android:layout_width="48dp"
-        android:layout_height="match_parent"
-        android:layout_marginRight="@dimen/spacing_large"
-        android:layout_marginTop="0.5dp"
-        android:layout_marginBottom="0.5dp">
-        <ImageView
-            android:id="@+id/lock_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="center"
-            android:scaleType="center"/>
-    </FrameLayout>
-
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="3">
-
-        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-            android:id="@+id/todo_title"
-            style="@style/Body1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="17dp"
-            android:layout_marginTop="15dp"
-            android:maxLines="1"
-            tools:text="Long text to see" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="@dimen/checklist_wrapper_width"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center">
-
-        <LinearLayout
-            android:id="@+id/checklistIndicatorWrapper"
-            android:layout_width="@dimen/checklist_wrapper_width"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <TextView
-                style="@style/Caption4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="0" />
-
-            <View
-                android:id="@+id/checklistDivider"
-                android:layout_width="@dimen/checklist_divider_width"
-                android:layout_height="2dp"
-                android:background="#8a000000" />
-
-            <TextView
-                android:id="@+id/checkListAllTextView"
-                style="@style/Caption4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                tools:text="4" />
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_filter.xml b/Habitica/res/layout/dialog_challenge_filter.xml
index 6a4d6ecf2..0bdd075aa 100644
--- a/Habitica/res/layout/dialog_challenge_filter.xml
+++ b/Habitica/res/layout/dialog_challenge_filter.xml
@@ -15,8 +15,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginEnd="@dimen/dialog_marginLeftRight"
-        android:layout_marginLeft="@dimen/dialog_marginLeftRight"
-        android:layout_marginRight="@dimen/dialog_marginLeftRight"
         android:layout_marginStart="@dimen/dialog_marginLeftRight"
         android:layout_marginTop="16dp"
 
@@ -44,7 +42,7 @@
                 style="@style/Body1_Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="right|center_vertical"
+                android:gravity="end|center_vertical"
                 android:text="@string/all"
                 android:textColor="#6133b4"
                 android:textSize="16sp"
@@ -55,7 +53,7 @@
                 style="@style/Body1_Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="right|center_vertical"
+                android:gravity="end|center_vertical"
                 android:text="@string/none"
                 android:textColor="#6133b4"
                 android:textSize="16sp"
@@ -85,8 +83,8 @@
                 android:layout_height="wrap_content"
                 android:checked="true"
                 android:text="@string/owned"
-                android:textColor="@color/textColorLight"
-                android:paddingLeft="8dp" />
+                android:textColor="@color/text_primary"
+                android:paddingStart="8dp" />
 
             <CheckBox
                 style="@style/Subheader2"
@@ -95,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:checked="true"
                 android:text="@string/not_owned"
-                android:textColor="@color/textColorLight"
-                android:paddingLeft="8dp"/>
+                android:textColor="@color/text_primary"
+                android:paddingStart="8dp"/>
     </LinearLayout>
 </com.habitrpg.android.habitica.ui.MaxHeightLinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_choose_message_recipient.xml b/Habitica/res/layout/dialog_choose_message_recipient.xml
index 5408a9872..5c3e394c9 100644
--- a/Habitica/res/layout/dialog_choose_message_recipient.xml
+++ b/Habitica/res/layout/dialog_choose_message_recipient.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp"
     android:gravity="center_horizontal">
 
     <TextView
@@ -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_completed_quest_content.xml b/Habitica/res/layout/dialog_completed_quest_content.xml
index 3c2cd58f2..988277709 100644
--- a/Habitica/res/layout/dialog_completed_quest_content.xml
+++ b/Habitica/res/layout/dialog_completed_quest_content.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
@@ -59,7 +59,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"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_edittext.xml b/Habitica/res/layout/dialog_edittext.xml
index f38149dfd..b98cd708e 100644
--- a/Habitica/res/layout/dialog_edittext.xml
+++ b/Habitica/res/layout/dialog_edittext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_layout"
         android:layout_width="match_parent"
@@ -12,8 +12,6 @@
             android:id="@+id/editText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="16dp"
-            android:paddingTop="16dp"
             android:paddingStart="@dimen/spacing_large"
             android:paddingEnd="@dimen/spacing_large" />
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/Habitica/res/layout/dialog_edittext_change_pw.xml b/Habitica/res/layout/dialog_edittext_change_pw.xml
index 56ede10eb..4a15a7ac5 100644
--- a/Habitica/res/layout/dialog_edittext_change_pw.xml
+++ b/Habitica/res/layout/dialog_edittext_change_pw.xml
@@ -12,11 +12,7 @@
             android:id="@+id/editText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:paddingBottom="16dp"
-            android:paddingTop="16dp"
-            android:paddingStart="@dimen/spacing_large"
-            android:paddingEnd="@dimen/spacing_large" />
+            android:inputType="textPassword" />
     </com.google.android.material.textfield.TextInputLayout>
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
@@ -29,11 +25,7 @@
             android:id="@+id/passwordEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:paddingBottom="16dp"
-            android:paddingTop="16dp"
-            android:paddingStart="@dimen/spacing_large"
-            android:paddingEnd="@dimen/spacing_large" />
+            android:inputType="textPassword" />
     </com.google.android.material.textfield.TextInputLayout>
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
@@ -46,10 +38,6 @@
             android:id="@+id/passwordRepeatEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:paddingBottom="16dp"
-            android:paddingTop="16dp"
-            android:paddingStart="@dimen/spacing_large"
-            android:paddingEnd="@dimen/spacing_large" />
+            android:inputType="textPassword" />
     </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_edittext_confirm_pw.xml b/Habitica/res/layout/dialog_edittext_confirm_pw.xml
index 79b106f81..dc9d6c843 100644
--- a/Habitica/res/layout/dialog_edittext_confirm_pw.xml
+++ b/Habitica/res/layout/dialog_edittext_confirm_pw.xml
@@ -12,8 +12,6 @@
             android:id="@+id/editText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="16dp"
-            android:paddingTop="16dp"
             android:paddingStart="@dimen/spacing_large"
             android:paddingEnd="@dimen/spacing_large" />
     </com.google.android.material.textfield.TextInputLayout>
@@ -28,8 +26,6 @@
             android:id="@+id/passwordEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="16dp"
-            android:paddingTop="16dp"
             android:paddingStart="@dimen/spacing_large"
             android:paddingEnd="@dimen/spacing_large" />
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/Habitica/res/layout/dialog_faint.xml b/Habitica/res/layout/dialog_faint.xml
index 35db018ca..c294131b2 100644
--- a/Habitica/res/layout/dialog_faint.xml
+++ b/Habitica/res/layout/dialog_faint.xml
@@ -3,15 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="24dip"
     android:paddingEnd="24dip"
-    android:paddingStart="24dip"
-    android:paddingRight="24dip">
-
-
+    android:paddingStart="24dip">
     <com.habitrpg.android.habitica.ui.views.ValueBar
         android:id="@+id/hpBar"
-        layout="@layout/value_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/header_bar_spacing"
@@ -38,5 +33,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/faint_penalty_body" />
-
 </LinearLayout>
\ No newline at end of file
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..6c4c26ac7 100644
--- a/Habitica/res/layout/dialog_habitica_base.xml
+++ b/Habitica/res/layout/dialog_habitica_base.xml
@@ -12,9 +12,9 @@
 <LinearLayout
     android:id="@+id/dialog_wrapper"
     android:orientation="vertical"
-    android:layout_width="320dp"
+    android:layout_width="360dp"
     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"
@@ -24,7 +24,7 @@
     <LinearLayout
         android:id="@+id/dialog_container"
         android:minWidth="300dp"
-        android:layout_width="320dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:background="@drawable/alert_dialog_background"
@@ -60,7 +60,8 @@
             android:scrollbars = "vertical"
             style="@style/Body2"
             />
-        <androidx.core.widget.NestedScrollView
+        <com.habitrpg.android.habitica.ui.views.login.LockableScrollView
+            android:id="@+id/main_scroll_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
@@ -70,12 +71,12 @@
                 android:layout_height="wrap_content"
                 android:paddingStart="@dimen/alert_side_padding"
                 android:paddingEnd="@dimen/alert_side_padding"/>
-        </androidx.core.widget.NestedScrollView>
+        </com.habitrpg.android.habitica.ui.views.login.LockableScrollView>
         <View
             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,20 +99,21 @@
             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>
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/close_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/close"
         android:background="@drawable/alert_dialog_background"
+        android:backgroundTint="@color/content_background"
         android:layout_marginTop="@dimen/spacing_large"
         android:visibility="gone"
         tools:visibility="visible"
diff --git a/Habitica/res/layout/dialog_habitica_primary_button.xml b/Habitica/res/layout/dialog_habitica_primary_button.xml
index 375baa4e5..e4668cc3f 100644
--- a/Habitica/res/layout/dialog_habitica_primary_button.xml
+++ b/Habitica/res/layout/dialog_habitica_primary_button.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="@style/HabiticaButton.Primary">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    style="@style/HabiticaButton.Primary"
+    tools:text="Test">
 </Button>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml b/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml
index 670a3f0aa..7c70142de 100644
--- a/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml
+++ b/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="48dp"
     style="@style/HabiticaButton.Red">
 </Button>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_habitica_secondary_button.xml b/Habitica/res/layout/dialog_habitica_secondary_button.xml
index 82aaffe5a..b8b9611ef 100644
--- a/Habitica/res/layout/dialog_habitica_secondary_button.xml
+++ b/Habitica/res/layout/dialog_habitica_secondary_button.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="48dp"
     style="@style/HabiticaButton.Borderless"
-    android:textColor="?colorAccent">
-
-</Button>
\ No newline at end of file
+    android:textColor="?colorAccent" />
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_hatch_pet_button.xml b/Habitica/res/layout/dialog_hatch_pet_button.xml
new file mode 100644
index 000000000..08a194429
--- /dev/null
+++ b/Habitica/res/layout/dialog_hatch_pet_button.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="60dp">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:letterSpacing="0.02"
+        android:fontFamily="@string/font_family_medium"
+        android:text="@string/hatch"
+        android:textColor="?attr/colorAccent"
+        android:layout_marginEnd="6dp"
+        />
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
+        android:id="@+id/currencyView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
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..7f4c374c8 100644
--- a/Habitica/res/layout/dialog_login_incentive.xml
+++ b/Habitica/res/layout/dialog_login_incentive.xml
@@ -16,8 +16,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="25dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
         android:id="@+id/you_earned_message"
         tools:text="You unlocked something"
         android:gravity="center_horizontal"
@@ -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_open_mysteryitem.xml b/Habitica/res/layout/dialog_open_mysteryitem.xml
new file mode 100644
index 000000000..3821f0ea3
--- /dev/null
+++ b/Habitica/res/layout/dialog_open_mysteryitem.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal">
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/icon_view"
+            android:layout_height="@dimen/shopitem_image_size"
+            android:layout_width="@dimen/shopitem_image_size"
+            app:actualImageScaleType="fitCenter" />
+    <TextView
+        android:id="@+id/title_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/SectionTitle"
+        android:gravity="center_horizontal"/>
+    <TextView
+        android:id="@+id/description_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Body2"
+        android:textColor="@color/text_ternary"
+        android:gravity="center_horizontal"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_pet_suggest_hatch.xml b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
index 12ca1906c..64059998a 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
@@ -30,7 +30,7 @@
             </FrameLayout>
             <TextView
                 android:id="@+id/egg_count_view"
-                android:layout_width="24dp"
+                android:layout_width="wrap_content"
                 android:layout_height="24dp"
                 style="@style/Pill"
                 android:padding="0dp"
@@ -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
@@ -72,7 +72,7 @@
             </FrameLayout>
             <TextView
                 android:id="@+id/potion_count_view"
-                android:layout_width="24dp"
+                android:layout_width="wrap_content"
                 android:layout_height="24dp"
                 android:padding="0dp"
                 android:gravity="center"
@@ -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..35c5ef1f4 100644
--- a/Habitica/res/layout/dialog_purchase_content_gear.xml
+++ b/Habitica/res/layout/dialog_purchase_content_gear.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
@@ -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_ternary"
         tools:text="These are the notes"
         android:gravity="center"/>
 
@@ -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..a4437c820 100644
--- a/Habitica/res/layout/dialog_purchase_content_item.xml
+++ b/Habitica/res/layout/dialog_purchase_content_item.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
@@ -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_ternary"
         tools:text="These are the notes"
         android:gravity="center"/>
 
@@ -46,7 +47,20 @@
         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"/>
+
+    <TextView
+        android:id="@+id/purchase_immediately_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="22dp"
+        android:paddingVertical="9dp"
+        android:text="@string/purchase_immediately_description"
+        android:textColor="@color/text_secondary"
+        android:background="@drawable/layout_rounded_bg_window"
+        android:layout_marginTop="20dp"
+        android:gravity="center"
+        style="@style/Caption2"/>
 </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..f55c00636 100644
--- a/Habitica/res/layout/dialog_purchase_content_quest.xml
+++ b/Habitica/res/layout/dialog_purchase_content_quest.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
@@ -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_ternary"
         tools:text="These are the notes"
         android:gravity="center"/>
 
@@ -61,8 +61,8 @@
                 android:layout_height="wrap_content"
                 style="@style/Body2"
                 android:textColor="@color/white"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"/>
             <TextView
@@ -87,8 +87,8 @@
                 android:layout_height="wrap_content"
                 style="@style/Body2"
                 android:textColor="@color/white"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"/>
             <TextView
@@ -110,8 +110,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Body2"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"/>
             <LinearLayout
@@ -137,15 +137,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/Pill"
-                    android:gravity="right"
+                    android:gravity="end"
                     android:paddingBottom="2dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
                     android:paddingTop="2dp"
                     android:text="@string/rage_meter"
                     android:visibility="gone"
                     tools:visibility="visible"
-                    android:layout_marginRight="8dp"/>
+                    android:layout_marginEnd="8dp"/>
             </LinearLayout>
         </TableRow>
     </TableLayout>
@@ -179,13 +179,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"/>
-    <TextView
-        android:id="@+id/amount_error_label"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:text="@string/purchase_amount_error"
-        android:textSize="12sp"
-        android:textColor="@color/gray_200"
-        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..0d92b8301 100644
--- a/Habitica/res/layout/dialog_purchase_gems.xml
+++ b/Habitica/res/layout/dialog_purchase_gems.xml
@@ -5,11 +5,11 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@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
@@ -30,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_ternary"
         tools:text="These are the notes"
         android:gravity="center"/>
 
@@ -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..06b572f86 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
@@ -6,9 +6,9 @@
     android:layout_width="wrap_content"
     android:layout_height="40dp"
     android:gravity="center"
-    android:background="@drawable/layout_rounded_bg_gray_700"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
+    android:background="@drawable/layout_rounded_bg_window"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
     <TextView
         android:id="@+id/buy_label"
         android:layout_width="wrap_content"
@@ -23,6 +23,5 @@
         tools:text="10"
         tools:textColor="@color/green_10"
         style="@style/Subheader1"
-        app:hasLightBackground="true"
         android:layout_marginStart="12dp"/>
 </LinearLayout>
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_header.xml b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
index 6c7dd1373..03a9d8c89 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_header.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
@@ -5,23 +5,33 @@
     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">
-        <Button
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:background="@color/window_background"
+        android:gravity="center_vertical">
+        <LinearLayout
             android:id="@+id/pin_button"
             android:layout_width="wrap_content"
             android:layout_height="52dp"
-            android:maxLines="1"
-            android:text="@string/pin"
-            android:background="@color/transparent"
-            android:layout_gravity="center_vertical"
-            android:gravity="start|center_vertical"/>
+            android:gravity="center_vertical"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp">
+            <ImageView
+                android:id="@+id/pin_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="6dp"/>
+            <TextView
+                android:id="@+id/pin_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="16sp"/>
+        </LinearLayout>
         <androidx.legacy.widget.Space
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -30,7 +40,6 @@
             android:id="@+id/currencyView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:hasLightBackground="true"
             android:paddingTop="12dp"
             android:paddingBottom="12dp"
             android:layout_gravity="center_vertical"/>
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 349e9ddeb..080d732a7 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -4,18 +4,9 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<View
-    android:layout_width="match_parent"
-    android:layout_height="2dp"
-    android:background="@color/pill_gray"
-        android:layout_marginTop="16dp"/>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
         android:layout_marginBottom="16dp"
         android:orientation="vertical">
         <TextView
@@ -28,7 +19,7 @@
         <RadioGroup
             android:id="@+id/task_filter_wrapper"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="40dp"
             android:orientation="horizontal"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="24dp">
@@ -46,8 +37,8 @@
                 android:layout_height="wrap_content"
                 android:text="@string/weak"
                 style="@style/TaskFilterRadioButton"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp" />
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp" />
             <RadioButton
                 android:id="@+id/third_task_filter"
                 android:layout_width="wrap_content"
@@ -57,8 +48,8 @@
         </RadioGroup>
         <View
             android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:background="@color/pill_gray" />
+            android:layout_height="1dp"
+            android:background="@color/separator" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -83,7 +74,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:text="@string/edit_tag_btn_edit"
-                    android:textColor="#6133b4"
+                    android:textColor="?colorPrimary"
                     android:textSize="16sp"
                     android:gravity="end|center_vertical"
                     android:paddingEnd="0dp"/>
@@ -103,9 +94,4 @@
         </ScrollView>
 
     </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="@color/pill_gray" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_won_challenge.xml b/Habitica/res/layout/dialog_won_challenge.xml
new file mode 100644
index 000000000..382743b05
--- /dev/null
+++ b/Habitica/res/layout/dialog_won_challenge.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal">
+<FrameLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:id="@+id/achievement_confetti_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:src="@drawable/challenge_won_gem_confetti" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="center"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/achievement_confetti_left"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/sparkles_left" />
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/achievement_view"
+            android:layout_width="48dp"
+            android:layout_height="52dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"/>
+        <ImageView
+            android:id="@+id/achievement_confetti_right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/sparkles_right" />
+    </LinearLayout>
+</FrameLayout>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/congratulations"
+        android:textColor="@color/text_primary"
+        android:textSize="17sp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="2dp"/>
+    <TextView
+        android:id="@+id/description_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/won_achievement_description_noname"
+        android:textColor="@color/text_ternary"
+        android:textSize="15sp"
+        android:gravity="center_horizontal"/>
+</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..ebf234050 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/content_background"/>
diff --git a/Habitica/res/layout/dialog_yesterdaily_task.xml b/Habitica/res/layout/dialog_yesterdaily_task.xml
index 60884e21a..68f7fc7ef 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"
@@ -17,22 +19,29 @@
         <FrameLayout
             android:id="@+id/checkBoxHolder"
             android:layout_width="@dimen/button_width"
-            android:layout_height="match_parent">
-
-            <CheckBox
-                android:id="@+id/checkBox"
-                android:layout_width="@dimen/checkbox_size"
-                android:layout_height="@dimen/checkbox_size"
+            android:layout_height="match_parent"
+            tools:background="@color/red_10">
+            <View
+                android:id="@+id/checkbox_background"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:gravity="center"
+                android:layout_gravity="center" />
+            <ImageView
+                android:id="@+id/checkmark"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
                 android:layout_gravity="center"
-                android:button="@drawable/daily_checkbox"
-                android:gravity="center" />
+                android:scaleType="center"
+                android:src="@drawable/checkmark" />
         </FrameLayout>
         <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/text_view"
             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..894696a72 100644
--- a/Habitica/res/layout/drawer_main.xml
+++ b/Habitica/res/layout/drawer_main.xml
@@ -83,7 +83,7 @@
                 android:gravity="center"
                 android:minWidth="20dp"
                 android:paddingTop="0dp"
-                android:textColor="#FFF"
+                android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:text="1"
@@ -116,7 +116,7 @@
                 android:gravity="center"
                 android:minWidth="20dp"
                 android:paddingTop="0dp"
-                android:textColor="#FFF"
+                android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:text="1"
@@ -148,7 +148,7 @@
                 android:gravity="center"
                 android:minWidth="20dp"
                 android:paddingTop="0dp"
-                android:textColor="#FFF"
+                android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:text="1"
@@ -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..9396c4a82 100644
--- a/Habitica/res/layout/drawer_main_item.xml
+++ b/Habitica/res/layout/drawer_main_item.xml
@@ -4,8 +4,8 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:paddingLeft="@dimen/drawer_padding"
-    android:paddingRight="@dimen/drawer_padding"
+    android:paddingStart="@dimen/drawer_padding"
+    android:paddingEnd="@dimen/drawer_padding"
     android:gravity="center_vertical">
     <LinearLayout
         android:layout_width="0dp"
@@ -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..da8bbd038 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:paddingLeft="@dimen/drawer_padding"
-    android:paddingRight="@dimen/drawer_padding"
+    android:layout_width="match_parent"
+    android:layout_height="22dp"
+    android:gravity="center_vertical"
+    android:paddingStart="@dimen/drawer_padding"
+    android:paddingEnd="@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/edit_tag_item.xml b/Habitica/res/layout/edit_tag_item.xml
index 406269da6..b6c060b06 100644
--- a/Habitica/res/layout/edit_tag_item.xml
+++ b/Habitica/res/layout/edit_tag_item.xml
@@ -5,20 +5,21 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical">
-    <Button
+    <ImageButton
         android:id="@+id/delete_button"
         android:layout_width="45dp"
         android:layout_height="wrap_content"
         android:padding="0dp"
-        android:drawableLeft="@drawable/ic_close_purple_300_36dp"
-        style="@style/Base.Widget.AppCompat.Button.Borderless"/>
+        android:src="@drawable/ic_close_purple_300_36dp"
+        android:tint="@color/color_accent"
+        android:background="@color/transparent"/>
     <EditText
         android:id="@+id/edit_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginLeft="8dp"
-        android:drawableRight="@drawable/ic_create_grey_400_18dp"
+        android:layout_marginStart="8dp"
+        android:drawableEnd="@drawable/ic_create_grey_400_18dp"
         tools:text="hello"
         style="@style/TagEditTextTheme"
         android:paddingBottom="14dp"
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/filter_menu_item.xml b/Habitica/res/layout/filter_menu_item.xml
index 2456ec557..f98d8e745 100644
--- a/Habitica/res/layout/filter_menu_item.xml
+++ b/Habitica/res/layout/filter_menu_item.xml
@@ -3,7 +3,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 xmlns:tools="http://schemas.android.com/tools"
-                android:layout_gravity="right|end"
+                android:layout_gravity="end"
         tools:background="?colorPrimary"
                 android:clickable="true">
 
@@ -17,7 +17,7 @@
             android:id="@+id/badge_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:padding="4dp"
             tools:text="99"
             android:textColor="@color/white"
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..5c371eebf 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"
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/see_what_s_new"
                 android:gravity="center"
-                android:textColor="@color/brand_300"
+                android:textColor="@color/text_brand"
                 />
         </LinearLayout>
 
@@ -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_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index e6e440e8c..f7fd6fdf5 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -11,7 +11,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/spacing_medium">
 
         <TextView
             android:layout_width="wrap_content"
@@ -20,10 +21,10 @@
             android:text="@string/avatar_body"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
+            android:background="@drawable/layout_rounded_bg_window"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/CardView.Default">
+            android:layout_height="wrap_content">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -40,10 +41,8 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginStart="@dimen/spacing_medium"
+                        android:layout_marginEnd="@dimen/spacing_medium"
                         android:text="@string/avatar_size"
                         android:gravity="center_vertical"
                         android:textStyle="bold" />
@@ -67,7 +66,7 @@
                     android:id="@+id/avatarSkinView"
                     app:equipmentTitle="@string/avatar_skin"/>
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -75,10 +74,10 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/CardView.Default">
+            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
@@ -118,7 +117,7 @@
                     android:id="@+id/avatar_headband_view"
                     app:equipmentTitle="@string/avatar_headband"/>
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -126,10 +125,10 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/CardView.Default">
+            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -162,7 +161,7 @@
                     android:id="@+id/avatarHairMustacheView"
                     app:equipmentTitle="@string/avatar_mustache" />
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
 
         <TextView
             android:layout_width="wrap_content"
@@ -171,10 +170,10 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/CardView.Default">
+            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -185,6 +184,6 @@
                     android:id="@+id/avatarBackgroundView"
                     app:equipmentTitle="@string/avatar_background" />
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 3df8e873e..1bb240dbe 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -18,8 +18,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
             <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/challenge_name"
                 android:layout_width="match_parent"
@@ -38,10 +38,10 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.5"
-                    android:background="@drawable/layout_rounded_bg"
+                    android:background="@drawable/layout_rounded_bg_window"
                     android:padding="@dimen/spacing_medium"
                     android:orientation="vertical"
-                    android:layout_marginRight="@dimen/spacing_medium">
+                    android:layout_marginEnd="@dimen/spacing_medium">
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -56,9 +56,9 @@
                             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"
+                            android:layout_marginStart="@dimen/spacing_small"
                             />
                     </LinearLayout>
                     <TextView
@@ -67,16 +67,16 @@
                         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"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.5"
-                    android:background="@drawable/layout_rounded_bg"
+                    android:background="@drawable/layout_rounded_bg_window"
                     android:padding="@dimen/spacing_medium"
                     android:orientation="vertical"
-                    android:layout_marginLeft="@dimen/spacing_medium">
+                    android:layout_marginStart="@dimen/spacing_medium">
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -91,9 +91,9 @@
                             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"
+                            android:layout_marginStart="@dimen/spacing_small"
                             />
                     </LinearLayout>
                     <TextView
@@ -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>
@@ -110,11 +110,11 @@
             android:id="@+id/join_button_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@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"
@@ -126,17 +126,16 @@
             android:id="@+id/challenge_creator_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@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"
                 android:layout_height="@dimen/avatar_chat_size"
                 android:clipChildren="true"
-                android:layout_marginRight="@dimen/spacing_medium"
                 android:layout_marginEnd="@dimen/spacing_medium"
                 android:background="@drawable/rounded_avatar_bg">
                 <com.habitrpg.android.habitica.ui.AvatarView
@@ -160,7 +159,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 +171,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"
@@ -195,8 +194,8 @@
             android:id="@+id/leave_button_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_medium"
             android:paddingBottom="@dimen/spacing_large">
             <Button
diff --git a/Habitica/res/layout/fragment_challengeslist.xml b/Habitica/res/layout/fragment_challengeslist.xml
index fb1348dcb..4f0cc63cb 100644
--- a/Habitica/res/layout/fragment_challengeslist.xml
+++ b/Habitica/res/layout/fragment_challengeslist.xml
@@ -1,10 +1,8 @@
 <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-
     android:id="@+id/refreshLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#fff"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
         <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
             android:id="@+id/recyclerView"
@@ -18,8 +16,8 @@
             android:id="@+id/emptyView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="48dp"
-            android:layout_marginRight="48dp"
+            android:layout_marginStart="48dp"
+            android:layout_marginEnd="48dp"
             android:layout_marginTop="32dp"
             android:orientation="vertical">
 
diff --git a/Habitica/res/layout/fragment_equipment_overview.xml b/Habitica/res/layout/fragment_equipment_overview.xml
index 0eabc7c09..5c62ec980 100644
--- a/Habitica/res/layout/fragment_equipment_overview.xml
+++ b/Habitica/res/layout/fragment_equipment_overview.xml
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equip_automatically"
                 android:layout_marginEnd="6dp"/>
-            <Switch
+            <com.google.android.material.switchmaterial.SwitchMaterial
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/autoEquipSwitch"/>
@@ -61,11 +61,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="6dp"
                 android:text="@string/wear_costume"/>
-            <Switch
+            <com.google.android.material.switchmaterial.SwitchMaterial
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/costumeSwitch"/>
-
         </LinearLayout>
         <com.habitrpg.android.habitica.ui.views.equipment.EquipmentOverviewView
             android:id="@+id/costume_view"
diff --git a/Habitica/res/layout/fragment_faq_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..053f182f9 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"
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         app:subtitle="HP"
         app:title="@string/health_points"
-        app:titleColor="@color/red_10"
+        app:titleColor="@color/text_red_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         app:subtitle="EXP"
         app:title="@string/experience_points"
-        app:titleColor="@color/yellow_50"
+        app:titleColor="@color/text_yellow_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         app:subtitle="MP"
         app:title="@string/mana_points"
-        app:titleColor="@color/blue_10"
+        app:titleColor="@color/text_blue_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -55,7 +55,7 @@
         android:layout_height="wrap_content"
         app:subtitle="@string/currency"
         app:title="@string/gold_capitalilzed"
-        app:titleColor="@color/orange_10"
+        app:titleColor="@color/text_orange_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -66,7 +66,7 @@
         android:layout_height="wrap_content"
         app:subtitle="@string/premium_currency"
         app:title="@string/gems"
-        app:titleColor="@color/green_10"
+        app:titleColor="@color/text_green_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -77,7 +77,7 @@
         android:layout_height="wrap_content"
         app:subtitle="@string/subscriber_currency"
         app:title="@string/mystic_hourglasses"
-        app:titleColor="@color/brand_300"
+        app:titleColor="@color/text_brand_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -88,7 +88,7 @@
         android:layout_height="wrap_content"
         app:subtitle="STR, CON, INT, PER"
         app:title="@string/stat_allocation"
-        app:titleColor="#7f3300"
+        app:titleColor="@color/text_brown_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -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..62ebb63a0 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -1,54 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     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"
         android:orientation="vertical">
-        <RelativeLayout
-            android:id="@+id/gift_subscription_container"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:background="@drawable/g1g1_box"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="10dp"
-            android:clipChildren="true"
-            android:clipToPadding="true">
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/presents1"
-                android:scaleType="center"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentBottom="false"/>
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/presents2"
-                android:scaleType="center"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gift_one_get_one_description"
-                android:layout_marginLeft="60dp"
-                android:layout_marginRight="60dp"
-                android:gravity="center_horizontal"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                android:fontFamily="@string/font_family_medium"
-                android:layout_marginBottom="12dp"
-                android:layout_centerInParent="true"/>
-        </RelativeLayout>
         <RelativeLayout
             android:id="@+id/promo_banner"
             android:layout_width="match_parent"
@@ -59,7 +21,9 @@
             android:layout_marginTop="10dp"
             android:clipChildren="true"
             android:clipToPadding="true"
-            android:visibility="gone">
+            android:clickable="true"
+            android:visibility="gone"
+            tools:visibility="visible">
             <ImageView
                 android:id="@+id/promo_banner_left_image"
                 android:layout_width="wrap_content"
@@ -85,18 +49,30 @@
                     android:id="@+id/promo_banner_title_image"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="2dp"/>
+                    android:layout_marginBottom="6dp"/>
+                <TextView
+                    android:id="@+id/promo_banner_title_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:layout_marginStart="84dp"
+                    android:layout_marginEnd="84dp"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:layout_marginBottom="6dp"/>
                 <TextView
                     android:id="@+id/promo_banner_duration_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/Subheader2"/>
+                    style="@style/Overline"/>
             </LinearLayout>
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="60dp"
-                android:layout_marginRight="60dp"
+                android:layout_marginStart="60dp"
+                android:layout_marginEnd="60dp"
                 android:gravity="center_horizontal"
                 android:textColor="@color/white"
                 android:textSize="16sp"
@@ -130,31 +106,31 @@
                 android:layout_marginStart="@dimen/spacing_large"
                 android:layout_marginEnd="@dimen/spacing_large" />
 
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:text="@string/gem_purchase_listitem1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItem"
                 />
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:text="@string/gem_purchase_listitem2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItem"
                 />
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:text="@string/gem_purchase_listitem3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItem"
                 />
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:text="@string/gem_purchase_listitem4"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItem"
                 />
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/no_billing_gems"
@@ -186,8 +162,7 @@
                         android:layout_weight="1"
                         app:gemAmount="4"
                         app:gemDrawable="@drawable/gems_4"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginEnd="@dimen/spacing_large"
                         />
                     <com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
                         android:id="@+id/gems_21_view"
@@ -211,8 +186,7 @@
                         android:layout_weight="1"
                         app:gemAmount="42"
                         app:gemDrawable="@drawable/gems_42"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginEnd="16dp" />
+                        android:layout_marginEnd="@dimen/spacing_large" />
                     <com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
                         android:id="@+id/gems_84_view"
                         android:layout_width="0dp"
@@ -228,16 +202,16 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:src="@drawable/gift_sub_gift"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="30dp"
                 android:layout_marginBottom="6dp" />
             <TextView
                 android:layout_width="match_parent"
                 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"
-                android:layout_marginRight="@dimen/spacing_large"/>
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"/>
             <Button
                 android:id="@+id/gift_gems_button"
                 android:layout_width="match_parent"
@@ -251,17 +225,17 @@
         <TextView android:id="@+id/supportTextView"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:paddingLeft="41dp"
-            android:paddingRight="41dp"
-            android:paddingBottom="14dp"
-            android:paddingTop="14dp"
+            android:paddingStart="41dp"
+            android:paddingEnd="41dp"
+            android:paddingBottom="20dp"
+            android:paddingTop="20dp"
             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..1a88b80e0 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,9 +38,9 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
             android:text="@string/gift_gems_balance_subtitle"
-            android:textColor="@color/gray_300"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:textColor="@color/text_quad"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             android:layout_marginBottom="@dimen/spacing_large"/>
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
@@ -55,8 +55,7 @@
                 android:id="@+id/gift_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="number"
-                android:paddingTop="@dimen/spacing_small"/>
+                android:inputType="number"/>
         </com.google.android.material.textfield.TextInputLayout>
         <TextView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_gift_gem_purchase.xml b/Habitica/res/layout/fragment_gift_gem_purchase.xml
index 22d720b7f..213587941 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,14 +38,15 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
             android:text="@string/gift_gems_subtitle"
-            android:textColor="@color/gray_300"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:textColor="@color/text_quad"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             android:layout_marginBottom="@dimen/spacing_large"/>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_marginHorizontal="@dimen/spacing_large">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -99,7 +100,8 @@
             android:gravity="center"
             android:layout_marginStart="@dimen/spacing_large"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:layout_marginBottom="@dimen/spacing_large"
+            android:layout_marginTop="@dimen/spacing_large"
+            android:layout_marginBottom="@dimen/spacing_xlarge"
             style="@style/Caption2"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index bed3ad46a..a6f38bef8 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/content_background">
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/gray_700">
+            android:background="@color/content_background">
             <TextView
                 android:id="@+id/title_view"
                 android:layout_width="match_parent"
@@ -34,12 +34,12 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="60dp"
-                    android:background="@drawable/layout_rounded_bg_white"
-                    android:layout_marginRight="@dimen/spacing_large"
+                    android:background="@drawable/layout_rounded_bg_window"
+                    android:layout_marginEnd="@dimen/spacing_large"
                     android:paddingTop="@dimen/spacing_small"
                     android:paddingBottom="@dimen/spacing_small"
-                    android:paddingLeft="@dimen/spacing_medium"
-                    android:paddingRight="@dimen/spacing_medium"
+                    android:paddingStart="@dimen/spacing_medium"
+                    android:paddingEnd="@dimen/spacing_medium"
                     android:orientation="vertical"
                     android:gravity="center">
                     <LinearLayout
@@ -50,7 +50,7 @@
                             android:id="@+id/guild_members_icon"
                             android:layout_width="23dp"
                             android:layout_height="23dp"
-                            android:layout_marginRight="@dimen/spacing_medium"/>
+                            android:layout_marginEnd="@dimen/spacing_medium"/>
                         <TextView
                             android:id="@+id/guild_members_text"
                             android:layout_width="wrap_content"
@@ -68,11 +68,11 @@
                     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_window"
                     android:paddingTop="@dimen/spacing_small"
                     android:paddingBottom="@dimen/spacing_small"
-                    android:paddingLeft="@dimen/spacing_medium"
-                    android:paddingRight="@dimen/spacing_medium"
+                    android:paddingStart="@dimen/spacing_medium"
+                    android:paddingEnd="@dimen/spacing_medium"
                     android:orientation="vertical"
                     android:gravity="center">
                     <LinearLayout
@@ -83,7 +83,7 @@
                             android:id="@+id/guild_bank_icon"
                             android:layout_width="23dp"
                             android:layout_height="23dp"
-                            android:layout_marginRight="@dimen/spacing_medium"/>
+                            android:layout_marginEnd="@dimen/spacing_medium"/>
                         <TextView
                             android:id="@+id/guild_bank_text"
                             android:layout_width="wrap_content"
@@ -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"
@@ -114,19 +114,20 @@
                     android:paddingEnd="@dimen/spacing_large"
                     android:paddingTop="12dp"
                     android:paddingBottom="12dp"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
                     <Button
                         android:id="@+id/invite_button"
                         android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:layout_height="@dimen/button_height"
+                        android:layout_height="wrap_content"
                         android:text="@string/invite_to_guild"
                         style="@style/HabiticaButton.Purple" />
                     <Button
                         android:id="@+id/join_button"
                         android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:layout_height="@dimen/button_height"
+                        android:layout_height="wrap_content"
                         android:text="@string/join_guild"
                         style="@style/HabiticaButton.Green"
                         android:layout_marginStart="@dimen/spacing_large"/>
@@ -135,7 +136,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"
@@ -148,7 +149,7 @@
                         android:layout_width="40dp"
                         android:layout_height="40dp"
                         android:clipChildren="true"
-                        android:layout_marginRight="@dimen/spacing_large"
+                        android:layout_marginEnd="@dimen/spacing_large"
                         android:background="@drawable/rounded_avatar_bg">
                         <com.habitrpg.android.habitica.ui.AvatarView
                             android:id="@+id/leader_avatar_view"
@@ -202,7 +203,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_guilds_overview.xml b/Habitica/res/layout/fragment_guilds_overview.xml
index e16c5052f..167a8eb73 100644
--- a/Habitica/res/layout/fragment_guilds_overview.xml
+++ b/Habitica/res/layout/fragment_guilds_overview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/refresh_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,32 +12,36 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/spacing_medium">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/SectionTitle"
                 android:text="@string/my_guilds"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
-            <androidx.cardview.widget.CardView
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/CardView.Default">
+                style="@style/FlatCardView">
                 <LinearLayout
                     android:id="@+id/my_guilds_listview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:divider="?android:listDivider"
+                    tools:layout_height="50dp"
                     android:showDividers="middle">
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
             <Button
                 android:id="@+id/publicGuildsButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/card_horizontal_padding"
-                android:text="@string/public_guilds" />
+                style="@style/HabiticaButton.Offset"
+                android:textColor="@color/text_primary"
+                android:text="@string/public_guilds"
+                android:layout_marginTop="@dimen/spacing_large"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_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_inbox_message_list.xml b/Habitica/res/layout/fragment_inbox_message_list.xml
index 1c2b18939..8ae0ae3f6 100644
--- a/Habitica/res/layout/fragment_inbox_message_list.xml
+++ b/Habitica/res/layout/fragment_inbox_message_list.xml
@@ -3,16 +3,11 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
         <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
     <com.habitrpg.android.habitica.ui.views.social.ChatBarView
         android:id="@+id/chatBarView"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index fe9c93314..1b6ba9193 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -10,13 +10,13 @@
         android:layout_height="wrap_content"
         style="@style/FragmentDialogTitle"
         android:id="@+id/titleTextView"
-        android:background="?colorPrimary"
-        android:textColor="@android:color/white" />
+        android:background="@color/window_background"
+        android:textColor="@color/text_primary" />
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         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"
@@ -27,8 +27,6 @@
                 android:scrollbarThumbVertical="@color/scrollbarThumb"
                 android:scrollbars="vertical" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_no_party.xml b/Habitica/res/layout/fragment_no_party.xml
index 241f4bf7c..cb300b5f2 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"
@@ -16,10 +16,10 @@
             android:orientation="vertical"
             android:paddingBottom="?android:actionBarSize">
 
-            <androidx.cardview.widget.CardView
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/CardView.Default"
+                style="@style/FlatCardView"
                 android:id="@+id/invitationWrapper">
 
                 <com.habitrpg.android.habitica.ui.views.social.InvitationsView
@@ -27,7 +27,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     style="@style/CardContent" />
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
             <LinearLayout
                 android:id="@+id/noPartyWrapper"
@@ -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,16 +73,15 @@
                         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"/>
+                        android:layout_marginStart="@dimen/spacing_large"
+                        android:layout_marginEnd="@dimen/spacing_large"/>
                     <Button
                         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.Gray"
                         android:text="@string/create_party"
                         android:layout_marginTop="@dimen/spacing_large"/>
                 </LinearLayout>
@@ -105,18 +104,17 @@
                         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:textColorLink="@color/text_brand_neon"
                         android:gravity="center"
-                        android:layout_marginLeft="@dimen/spacing_large"
-                        android:layout_marginRight="@dimen/spacing_large"/>
+                        android:layout_marginStart="@dimen/spacing_large"
+                        android:layout_marginEnd="@dimen/spacing_large"/>
 
                     <Button
                         android:id="@+id/username_textview"
                         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.Gray"
                         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..1d3c6a34a 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -13,10 +13,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             >
-            <androidx.cardview.widget.CardView
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/CardView.Default"
+                style="@style/FlatCardView"
                 android:id="@+id/party_invitation_wrapper">
 
                 <com.habitrpg.android.habitica.ui.views.social.InvitationsView
@@ -24,7 +24,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     style="@style/CardContent" />
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
             <TextView
                 android:id="@+id/title_view"
@@ -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
@@ -118,6 +118,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
+                        android:gravity="center_vertical"
                         android:visibility="gone">
 
                         <Button
diff --git a/Habitica/res/layout/fragment_party_invite.xml b/Habitica/res/layout/fragment_party_invite.xml
index b178867f4..a0db51860 100644
--- a/Habitica/res/layout/fragment_party_invite.xml
+++ b/Habitica/res/layout/fragment_party_invite.xml
@@ -19,14 +19,14 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:clickable="false"
-        android:layout_marginLeft="@dimen/row_padding"
-        android:layout_marginRight="@dimen/row_padding" />
+        android:layout_marginStart="@dimen/row_padding"
+        android:layout_marginEnd="@dimen/row_padding" />
 
     <Button
         android:id="@+id/addInviteButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:text="@string/add_invites"
         android:layout_margin="@dimen/row_padding" />
 </LinearLayout>
diff --git a/Habitica/res/layout/fragment_promo_info.xml b/Habitica/res/layout/fragment_promo_info.xml
index 2764d4d6f..f4ce57455 100644
--- a/Habitica/res/layout/fragment_promo_info.xml
+++ b/Habitica/res/layout/fragment_promo_info.xml
@@ -11,7 +11,7 @@
         <RelativeLayout
             android:id="@+id/promo_banner"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="103dp"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
             android:layout_marginBottom="16dp"
@@ -42,25 +42,35 @@
                     android:id="@+id/promo_banner_title_image"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="2dp"/>
+                    android:layout_marginBottom="6dp"/>
+                <TextView
+                    android:id="@+id/promo_banner_title_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    style="@style/Headline6"
+                    android:textColor="@color/white"
+                    android:layout_marginBottom="6dp"/>
                 <TextView
                     android:id="@+id/promo_banner_subtitle_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/Caption2"
+                    style="@style/Overline"
+                    android:textColor="@color/white"
                     android:textAllCaps="true"
+                    android:layout_marginBottom="4dp"
                     />
                 <TextView
                     android:id="@+id/promo_banner_duration_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/Subheader2"/>
+                    style="@style/Subheader1"/>
             </LinearLayout>
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="60dp"
-                android:layout_marginRight="60dp"
+                android:layout_marginStart="60dp"
+                android:layout_marginEnd="60dp"
                 android:gravity="center_horizontal"
                 android:textColor="@color/white"
                 android:textSize="16sp"
@@ -76,10 +86,12 @@
             android:textSize="15sp"
             android:fontFamily="@string/font_family_medium"
             android:layout_marginBottom="@dimen/spacing_large"/>
-        <Button
+        <TextView
             android:id="@+id/prompt_button"
             android:layout_width="match_parent"
-            android:layout_height="38dp" />
+            android:layout_height="38dp"
+            style="@style/Subheader1"
+            android:gravity="center" />
 
         <TextView
             android:id="@+id/instructions_title_view"
@@ -88,7 +100,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,8 +110,8 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textSize="15sp"
-            android:textColor="@color/gray_300"
-            android:lineSpacingExtra="2dp"/>
+            android:textColor="@color/text_quad"
+            android:lineSpacingExtra="3dp"/>
 
         <TextView
             android:id="@+id/limitations_title_view"
@@ -108,7 +120,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,8 +130,8 @@
             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"/>
+            android:lineSpacingExtra="3dp"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index 85ef37ffe..c1cfa082d 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -10,11 +10,11 @@
         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"
-            android:paddingRight="@dimen/content_border"
+            android:paddingStart="@dimen/content_border"
+            android:paddingEnd="@dimen/content_border"
             android:paddingTop="12dp"
             android:paddingBottom="12dp"
             >
@@ -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,13 +50,13 @@
             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"
             android:paddingTop="12dp"
-            android:paddingLeft="@dimen/content_border"
-            android:paddingRight="@dimen/content_border"
+            android:paddingStart="@dimen/content_border"
+            android:paddingEnd="@dimen/content_border"
             android:paddingBottom="12dp">
             <TextView
                 android:layout_width="match_parent"
@@ -87,8 +87,8 @@
                     android:layout_height="wrap_content"
                     style="@style/Body1"
                     tools:text="3"
-                    android:textColor="@color/gray_300"
-                    android:layout_marginLeft="6dp"/>
+                    android:textColor="@color/text_quad"
+                    android:layout_marginStart="6dp"/>
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/quest_participant_list"
@@ -106,6 +106,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:visibility="gone"
+            android:gravity="center_vertical"
             android:padding="@dimen/content_border">
 
             <Button
@@ -115,7 +116,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/quest_accept"
                 style="@style/HabiticaButton.Green"
-                android:layout_marginRight="16dp" />
+                android:layout_marginEnd="16dp" />
 
             <Button
                 android:id="@+id/quest_reject_button"
@@ -131,6 +132,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:visibility="gone"
+            android:gravity="center_vertical"
             android:padding="@dimen/content_border">
             <Button
                 android:id="@+id/quest_begin_button"
@@ -139,7 +141,15 @@
                 android:layout_height="wrap_content"
                 android:text="@string/quest_begin"
                 style="@style/HabiticaButton.Yellow"
-                android:layout_marginRight="16dp" />
+                android:layout_marginEnd="16dp" />
+            <Button
+                android:id="@+id/quest_leave_button"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp"
+                android:layout_height="wrap_content"
+                android:text="@string/leave"
+                style="@style/HabiticaButton.Red" />
 
             <Button
                 android:id="@+id/quest_cancel_button"
@@ -148,13 +158,6 @@
                 android:layout_height="wrap_content"
                 android:text="@string/quest_cancel"
                 style="@style/HabiticaButton.Red" />
-            <Button
-                android:id="@+id/quest_abort_button"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:text="@string/quest_abort"
-                style="@style/HabiticaButton.Red" />
         </LinearLayout>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
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_setup_avatar.xml b/Habitica/res/layout/fragment_setup_avatar.xml
index 8a962e994..a0cb1ecd7 100644
--- a/Habitica/res/layout/fragment_setup_avatar.xml
+++ b/Habitica/res/layout/fragment_setup_avatar.xml
@@ -9,11 +9,11 @@
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1" />
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/randomize_button"
         android:layout_width="wrap_content"
         android:text="@string/randomize"
-        style="@style/DiamondButton" />
+        style="@style/DiamondButton"/>
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -46,16 +46,14 @@
         android:layout_height="wrap_content"
         app:namePlate="Justin"
         app:npcDrawable="@drawable/justin_textbox"
-        android:layout_marginLeft="@dimen/content_inset"
-        android:layout_marginRight="@dimen/content_inset"
-        android:layout_above="@id/customization_drawer"
+        android:layout_marginStart="@dimen/content_inset"
+        android:layout_marginEnd="@dimen/content_inset"
         android:layout_marginBottom="12dp"/>
 
     <com.habitrpg.android.habitica.ui.views.setup.AvatarCustomizationDrawer
             android:id="@+id/customization_drawer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
             />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_setup_tasks.xml b/Habitica/res/layout/fragment_setup_tasks.xml
index 682141211..9d09bae62 100644
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@@ -45,8 +45,8 @@
         android:layout_height="wrap_content"
         app:namePlate="Justin"
         app:npcDrawable="@drawable/justin_textbox"
-        android:layout_marginLeft="@dimen/content_inset"
-        android:layout_marginRight="@dimen/content_inset"
+        android:layout_marginStart="@dimen/content_inset"
+        android:layout_marginEnd="@dimen/content_inset"
         android:layout_marginBottom="12dp"/>
     <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
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..d8d7bc6f9 100644
--- a/Habitica/res/layout/fragment_stats.xml
+++ b/Habitica/res/layout/fragment_stats.xml
@@ -4,11 +4,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical"
-    android:background="@color/white">
+    android:background="?attr/colorContentBackground">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -26,19 +25,21 @@
                 android:id="@+id/leftSparklesView"
                 android:layout_width="77dp"
                 android:layout_height="24dp"
-                android:scaleType="fitCenter"/>
+                android:scaleType="fitCenter"
+                android:contentDescription="@null" />
             <TextView
                 android:id="@+id/numberOfPointsTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="36dp"
-                android:layout_marginLeft="12dp"
-                android:layout_marginRight="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
                 android:gravity="center"/>
             <ImageView
                 android:id="@+id/rightSparklesView"
                 android:layout_width="77dp"
                 android:layout_height="24dp"
-                android:scaleType="fitCenter"/>
+                android:scaleType="fitCenter"
+                android:contentDescription="@null" />
         </LinearLayout>
         <TextView
             android:id="@+id/unlock_at_level"
@@ -53,48 +54,48 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:statsTitle="@string/strength"
-            app:titleBackgroundColor="@color/red_50"
-            app:statsColor="@color/red_10"
+            app:titleBackgroundColor="@color/background_red"
+            app:statsColor="@color/text_red"
             android:layout_marginBottom="12dp"/>
         <com.habitrpg.android.habitica.ui.views.stats.StatsView
             android:id="@+id/intelligenceStatsView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:statsTitle="@string/intelligence"
-            app:titleBackgroundColor="@color/blue_50"
-            app:statsColor="@color/blue_10"
+            app:titleBackgroundColor="@color/background_blue"
+            app:statsColor="@color/text_blue"
             android:layout_marginBottom="12dp"/>
         <com.habitrpg.android.habitica.ui.views.stats.StatsView
             android:id="@+id/constitutionStatsView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:statsTitle="@string/constitution"
-            app:titleBackgroundColor="@color/yellow_10"
-            app:statsColor="@color/yellow_5"
+            app:titleBackgroundColor="@color/background_yellow"
+            app:statsColor="@color/text_yellow"
             android:layout_marginBottom="12dp"/>
         <com.habitrpg.android.habitica.ui.views.stats.StatsView
             android:id="@+id/perceptionStatsView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:statsTitle="@string/perception"
-            app:titleBackgroundColor="@color/brand_300"
-            app:statsColor="@color/brand_300"
+            app:titleBackgroundColor="@color/background_brand"
+            app:statsColor="@color/text_brand"
             android:layout_marginBottom="12dp"/>
-        <Switch
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/automaticAllocationSwitch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/auto_allocate_points"
-            android:layout_marginLeft="@dimen/content_border"
-            android:layout_marginRight="@dimen/content_border"
+            android:layout_marginStart="@dimen/content_border"
+            android:layout_marginEnd="@dimen/content_border"
             android:layout_marginBottom="20dp"/>
         <LinearLayout
             android:id="@+id/autoAllocationModeWrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/content_border"
-            android:paddingRight="@dimen/content_border"
-            android:background="@color/gray_700"
+            android:paddingStart="@dimen/content_border"
+            android:paddingEnd="@dimen/content_border"
+            android:background="@color/window_background"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"
             android:orientation="vertical">
@@ -113,7 +114,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/transparent"
-                    android:layout_marginLeft="12dp"/>
+                    android:layout_marginStart="12dp"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -130,7 +131,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/transparent"
-                    android:layout_marginLeft="12dp"/>
+                    android:layout_marginStart="12dp"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -146,19 +147,19 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/transparent"
-                    android:layout_marginLeft="12dp"/>
+                    android:layout_marginStart="12dp"/>
             </LinearLayout>
         </LinearLayout>
         <View
             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"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/content_border"
-            android:layout_marginRight="@dimen/content_border"
+            android:layout_marginStart="@dimen/content_border"
+            android:layout_marginEnd="@dimen/content_border"
             android:orientation="vertical">
             <TextView
                 android:layout_width="match_parent"
@@ -172,12 +173,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 +191,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 +204,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 +217,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"
@@ -224,12 +225,12 @@
                 style="@style/Subheader3"
                 android:layout_marginBottom="8dp"
                 android:layout_marginTop="28dp"
-                android:textColor="@color/brand_300"/>
+                android:textColor="@color/text_brand"/>
             <TextView
                 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..977036d24 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -13,48 +13,78 @@
     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"
         android:orientation="vertical">
         <RelativeLayout
-            android:id="@+id/gift_subscription_container"
+            android:id="@+id/promo_banner"
             android:layout_width="match_parent"
             android:layout_height="80dp"
             android:background="@drawable/g1g1_box"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginTop="10dp"
             android:clipChildren="true"
-            android:clipToPadding="true">
+            android:clipToPadding="true"
+            android:clickable="true"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:layout_marginBottom="8dp">
             <ImageView
+                android:id="@+id/promo_banner_left_image"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/presents1"
+                android:layout_height="match_parent"
                 android:scaleType="center"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentBottom="false"/>
             <ImageView
+                android:id="@+id/promo_banner_right_image"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/presents2"
+                android:layout_height="match_parent"
                 android:scaleType="center"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true"/>
-                <TextView
+            <LinearLayout
+                android:layout_centerInParent="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical">
+                <ImageView
+                    android:id="@+id/promo_banner_title_image"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/gift_one_get_one_description"
-                    android:layout_marginLeft="60dp"
-                    android:layout_marginRight="60dp"
-                    android:gravity="center_horizontal"
+                    android:layout_marginBottom="6dp"/>
+                <TextView
+                    android:id="@+id/promo_banner_title_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    style="@style/Subheader1"
                     android:textColor="@color/white"
-                    android:textSize="16sp"
-                    android:fontFamily="@string/font_family_medium"
-                    android:layout_marginBottom="12dp"
-                    android:layout_centerInParent="true"/>
+                    android:layout_marginStart="84dp"
+                    android:layout_marginEnd="84dp"
+                    android:gravity="center"
+                    android:layout_marginBottom="6dp"/>
+                <TextView
+                    android:id="@+id/promo_banner_duration_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/Overline"/>
+            </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="60dp"
+                android:layout_marginEnd="60dp"
+                android:gravity="center_horizontal"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:fontFamily="@string/font_family_medium"
+                android:layout_marginBottom="12dp"
+                android:layout_centerInParent="true"/>
         </RelativeLayout>
 
         <LinearLayout
@@ -75,14 +105,15 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/subscriptionDetails"/>
 
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:id="@+id/subscribeBenefitsTitle"
                 android:layout_width="250dp"
                 android:layout_height="wrap_content"
                 android:text="@string/subscribe_prompt"
                 android:gravity="center"
                 style="@style/Subheader1"
-                android:textColor="@color/brand_300"
+                app:dayTextColor="@color/text_brand"
+                app:nightTextColor="@color/gray_400"
                 android:lineSpacingExtra="4dp"
                 android:layout_marginTop="8dp"
                 android:layout_gravity="center_horizontal"/>
@@ -114,13 +145,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 +174,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 +203,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 +233,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 +262,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>
@@ -286,7 +317,7 @@
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
                     style="@style/Subheader1"
-                    android:textColor="@color/brand_300"
+                    android:textColor="@color/text_brand"
                     android:text="@string/subscribe_options_title"
                     android:layout_marginBottom="20dp"/>
 
@@ -323,7 +354,7 @@
                 <Button
                     android:text="@string/subscribe"
                     android:layout_width="match_parent"
-                    android:layout_height="36dp"
+                    android:layout_height="wrap_content"
                     android:id="@+id/subscribeButton"
                     style="@style/HabiticaButton.Purple.Small"
                     android:textAllCaps="false"
@@ -339,35 +370,35 @@
             <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"
-                android:layout_marginRight="@dimen/spacing_large"/>
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"/>
             <Button
                 android:id="@+id/gift_subscription_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/gift_subscription"
                 android:background="@color/transparent"
-                android:textColor="?colorAccent"
+                android:textColor="@color/text_brand_neon"
                 android:textAllCaps="false"/>
         </LinearLayout>
         <LinearLayout
             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"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
                 android:paddingTop="16dp"
                 android:paddingBottom="16dp"
                 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..830f7d2cb 100644
--- a/Habitica/res/layout/fragment_support_bug_fix.xml
+++ b/Habitica/res/layout/fragment_support_bug_fix.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 <LinearLayout
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/content_background"
     android:layout_marginBottom="@dimen/spacing_large">
     <TextView
         android:layout_width="match_parent"
@@ -17,20 +18,41 @@
         style="@style/SectionHeaderCaps"
         />
 
+    <LinearLayout
+        android:id="@+id/known_issues_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/layout_rounded_bg_window"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:divider="?android:listDivider"
+        android:orientation="vertical"
+        android:showDividers="middle" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/common_fixes"
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginTop="@dimen/spacing_large"
+        android:layout_marginBottom="12dp"
+        style="@style/SectionHeaderCaps"
+        />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="19dp"
         android:orientation="vertical"
-        android:background="@drawable/layout_rounded_bg_gray_700"
-        android:layout_marginLeft="@dimen/spacing_medium"
-        android:layout_marginRight="@dimen/spacing_medium"
+        android:background="@drawable/layout_rounded_bg_window"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
         <TextView
             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,15 +66,15 @@
         android:layout_height="wrap_content"
         android:padding="19dp"
         android:orientation="vertical"
-        android:background="@drawable/layout_rounded_bg_gray_700"
-        android:layout_marginLeft="@dimen/spacing_medium"
-        android:layout_marginRight="@dimen/spacing_medium"
+        android:background="@drawable/layout_rounded_bg_window"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
         <TextView
             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,15 +88,15 @@
         android:layout_height="wrap_content"
         android:padding="19dp"
         android:orientation="vertical"
-        android:background="@drawable/layout_rounded_bg_gray_700"
-        android:layout_marginLeft="@dimen/spacing_medium"
-        android:layout_marginRight="@dimen/spacing_medium"
+        android:background="@drawable/layout_rounded_bg_window"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
         <TextView
             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
@@ -83,13 +105,14 @@
             android:text="@string/update_app_description"
             style="@style/Body2"/>
     </LinearLayout>
-    <TextView
+    <com.habitrpg.android.habitica.ui.views.DayNightTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/need_more_help"
         android:gravity="center"
         android:textStyle="bold"
-        android:textColor="@color/brand_300"
+        app:dayTextColor="@color/text_brand"
+        app:nightTextColor="@color/gray_400"
         android:textSize="16sp"
         android:layout_marginTop="@dimen/spacing_large"
         />
@@ -97,7 +120,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"
@@ -105,7 +128,7 @@
     <Button
         android:id="@+id/report_bug_button"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="wrap_content"
         style="@style/HabiticaButton.Purple"
         android:text="@string/report_bug"
         android:elevation="0dp"
diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
index 5d98b294c..970dfc43d 100644
--- a/Habitica/res/layout/fragment_support_main.xml
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -3,17 +3,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
     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 +23,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 +33,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 +41,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 +73,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 +83,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 +91,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 +121,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 +133,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 +141,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"
@@ -153,7 +152,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="38dp"
-                android:text="@string/contact_us"
+                android:text="@string/submit_feedback"
                 android:gravity="center"
                 android:layout_marginStart="@dimen/spacing_medium"
                 android:layout_marginEnd="@dimen/spacing_medium"
@@ -168,13 +167,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..444aed9f5 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -8,8 +8,9 @@
     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:id="@+id/shop_header"
         android:layout_marginBottom="@dimen/spacing_large"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"/>
@@ -49,7 +50,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..d260e6157 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -10,8 +10,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/spacing_large"
-    android:paddingRight="@dimen/spacing_large"
+    android:paddingStart="@dimen/spacing_large"
+    android:paddingEnd="@dimen/spacing_large"
     android:paddingTop="32dp"
     android:paddingBottom="16dp">
 
@@ -23,10 +23,11 @@
         android:layout_marginBottom="@dimen/spacing_large"
         />
 
-    <TextView
+    <com.habitrpg.android.habitica.ui.views.DayNightTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/brand_200"
+        app:dayTextColor="@color/brand_200"
+        app:nightTextColor="@color/brand_500"
         android:text="@string/welcomeNameTitle"
         android:gravity="center"
         android:textSize="16sp"
@@ -37,62 +38,62 @@
         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"
                 android:text="@string/display_name"
-                android:paddingLeft="@dimen/spacing_medium"
-                android:paddingRight="@dimen/spacing_medium"
-                android:layout_marginLeft="1dp"
+                android:paddingStart="@dimen/spacing_medium"
+                android:paddingEnd="@dimen/spacing_medium"
+                android:layout_marginStart="1dp"
                 android:background="@color/setup_label_background"
                 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"
                 android:background="@color/transparent"
                 android:layout_height="42dp"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
                 android:textSize="14sp"
                 android:lines="1"/>
         </TableRow>
         <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/setup_label_background"
                 android:layout_height="41dp"
-                android:paddingLeft="@dimen/spacing_medium"
-                android:paddingRight="@dimen/spacing_medium"
-                android:layout_marginLeft="1dp"
+                android:paddingStart="@dimen/spacing_medium"
+                android:paddingEnd="@dimen/spacing_medium"
+                android:layout_marginStart="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
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large">
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="@"
+                    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"
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="42dp"
-                    android:layout_marginLeft="@dimen/spacing_small"
+                    android:layout_marginStart="@dimen/spacing_small"
                     android:lines="1"
                     android:textSize="14sp"/>
             </LinearLayout>
diff --git a/Habitica/res/layout/gear_list_item.xml b/Habitica/res/layout/gear_list_item.xml
index 5e2927df8..dd246d56e 100644
--- a/Habitica/res/layout/gear_list_item.xml
+++ b/Habitica/res/layout/gear_list_item.xml
@@ -12,7 +12,7 @@
         android:id="@+id/gear_icon_background_view"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:layout_marginRight="@dimen/row_padding">
+        android:layout_marginEnd="@dimen/row_padding">
         <com.facebook.drawee.view.SimpleDraweeView
             android:layout_width="@dimen/gear_image_size"
             android:layout_height="@dimen/gear_image_size"
@@ -61,14 +61,14 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equipment_str"
                 android:textSize="14sp"
-                android:textColor="@color/gray_200"
-                android:layout_marginRight="5dp"/>
+                android:textColor="@color/text_ternary"
+                android:layout_marginEnd="5dp"/>
             <TextView
                 android:id="@+id/str_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+1"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/con_label"
@@ -76,14 +76,14 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equipment_con"
                 android:textSize="14sp"
-                android:textColor="@color/gray_200"
-                android:layout_marginRight="5dp"/>
+                android:textColor="@color/text_ternary"
+                android:layout_marginEnd="5dp"/>
             <TextView
                 android:id="@+id/con_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+1"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/int_label"
@@ -91,14 +91,14 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equipment_int"
                 android:textSize="14sp"
-                android:textColor="@color/gray_200"
-                android:layout_marginRight="5dp"/>
+                android:textColor="@color/text_ternary"
+                android:layout_marginEnd="5dp"/>
             <TextView
                 android:id="@+id/int_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+1"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/per_label"
@@ -106,14 +106,14 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equipment_per"
                 android:textSize="14sp"
-                android:textColor="@color/gray_200"
-                android:layout_marginRight="5dp"/>
+                android:textColor="@color/text_ternary"
+                android:layout_marginEnd="5dp"/>
             <TextView
                 android:id="@+id/per_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+1"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:textColor="@color/green_50"/>
         </com.nex3z.flowlayout.FlowLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index 09b64a062..ebae45ff3 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"
@@ -20,11 +20,15 @@
             android:id="@+id/btnPlusWrapper"
             android:layout_width="@dimen/button_width"
             android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/btnPlusIconView"
+            <View
+                android:id="@+id/button_plus_circle_view"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:layout_gravity="center"/>
+            <ImageView
+                android:id="@+id/btnPlusIconView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:scaleType="center"
                 android:layout_gravity="center"
                 android:src="@drawable/habit_plus" />
@@ -43,8 +47,8 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginRight="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
             style="@style/Widget.AppCompat.ProgressBar"/>
         <ImageButton
             android:id="@+id/error_icon"
@@ -53,20 +57,24 @@
             android:layout_gravity="center_vertical"
             android:background="@color/transparent"
             android:src="@drawable/ic_warning_black"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginRight="@dimen/spacing_small"/>
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"/>
         <FrameLayout
             android:id="@+id/btnMinusWrapper"
             android:layout_width="@dimen/button_width"
             android:layout_height="match_parent">
-            <ImageView
-                android:id="@+id/btnMinusIconView"
+            <View
+                android:id="@+id/button_minus_circle_view"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:layout_gravity="center"/>
+            <ImageView
+                android:id="@+id/btnMinusIconView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:scaleType="center"
-                android:background="@drawable/habit_circle"
-                android:src="@drawable/habit_minus" />
+                android:src="@drawable/habit_minus"/>
             <Button
                 android:id="@+id/btnMinus"
                 style="@style/HabitButton"
diff --git a/Habitica/res/layout/help_header.xml b/Habitica/res/layout/help_header.xml
index 45ab2fa0f..322510273 100644
--- a/Habitica/res/layout/help_header.xml
+++ b/Habitica/res/layout/help_header.xml
@@ -4,11 +4,11 @@
     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"
-    android:paddingRight="@dimen/spacing_large">
+    android:paddingStart="@dimen/spacing_large"
+    android:paddingEnd="@dimen/spacing_large">
 <TextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/item_inbox_overview.xml b/Habitica/res/layout/item_inbox_overview.xml
index c0374992c..16864d5ff 100644
--- a/Habitica/res/layout/item_inbox_overview.xml
+++ b/Habitica/res/layout/item_inbox_overview.xml
@@ -10,7 +10,6 @@
         android:layout_width="@dimen/avatar_chat_size"
         android:layout_height="@dimen/avatar_chat_size"
         android:clipChildren="true"
-        android:layout_marginRight="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:background="@drawable/rounded_avatar_bg">
         <com.habitrpg.android.habitica.ui.AvatarView
@@ -26,7 +25,7 @@
         android:layout_weight="1"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/spacing_medium">
+        android:paddingStart="@dimen/spacing_medium">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -44,7 +43,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..a237ebeae 100644
--- a/Habitica/res/layout/item_item.xml
+++ b/Habitica/res/layout/item_item.xml
@@ -11,7 +11,7 @@
         android:layout_width="@dimen/gear_image_size"
         android:layout_height="@dimen/gear_image_size"
         bind:actualImageScaleType="fitCenter"
-        android:layout_marginRight="@dimen/row_padding"/>
+        android:layout_marginEnd="@dimen/row_padding"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -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/known_issue.xml b/Habitica/res/layout/known_issue.xml
new file mode 100644
index 000000000..f82dd966e
--- /dev/null
+++ b/Habitica/res/layout/known_issue.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="@dimen/spacing_large"
+    android:paddingVertical="12dp"
+    android:textColor="@color/text_primary"
+    tools:text="Test name" />
\ 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..d6572f3e0 100644
--- a/Habitica/res/layout/main_navigation_view.xml
+++ b/Habitica/res/layout/main_navigation_view.xml
@@ -6,34 +6,36 @@
     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"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignTop="@id/item_wrapper">
+        android:layout_alignTop="@id/item_wrapper"
+        android:layoutDirection="ltr">
         <View
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
             android:background="?barColor" />
         <LinearLayout
+            android:id="@+id/cutout_wrapper"
             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"
@@ -45,44 +47,55 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="48dp"
-        android:layout_alignParentBottom="true"
-        android:paddingTop="@dimen/spacing_small"
-        android:paddingBottom="@dimen/spacing_small">
+        android:layout_alignParentBottom="true">
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
-            android:id="@+id/tab_habits"
+            android:id="@+id/habits_tab"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             app:title="@string/habits"
-            app:iconDrawable="@drawable/icon_habits_selected"/>
+            app:iconDrawable="@drawable/icon_habits"
+            app:selectedIconDrawable="@drawable/icon_habits_selected"
+            android:paddingTop="@dimen/spacing_small"
+            android:paddingBottom="@dimen/spacing_small"/>
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
             android:layout_width="0dp"
-            android:id="@+id/tab_dailies"
+            android:id="@+id/dailies_tab"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             app:title="@string/dailies"
-            app:iconDrawable="@drawable/icon_dailies_selected"/>
+            app:iconDrawable="@drawable/icon_dailies"
+            app:selectedIconDrawable="@drawable/icon_dailies_selected"
+            android:paddingTop="@dimen/spacing_small"
+            android:paddingBottom="@dimen/spacing_small"/>
         <androidx.legacy.widget.Space
+            android:id="@+id/cutout_space"
             android:layout_width="50dp"
             android:layout_height="wrap_content" />
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
-            android:id="@+id/tab_todos"
+            android:id="@+id/todos_tab"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             app:title="@string/todos"
-            app:iconDrawable="@drawable/icon_todos_selected"/>
+            app:iconDrawable="@drawable/icon_todos"
+            app:selectedIconDrawable="@drawable/icon_todos_selected"
+            android:paddingTop="@dimen/spacing_small"
+            android:paddingBottom="@dimen/spacing_small"/>
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
-            android:id="@+id/tab_rewards"
+            android:id="@+id/rewards_tab"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             app:title="@string/rewards"
-            app:iconDrawable="@drawable/icon_rewards_selected"/>
+            app:iconDrawable="@drawable/icon_rewards"
+            app:selectedIconDrawable="@drawable/icon_rewards_selected"
+            android:paddingTop="@dimen/spacing_small"
+            android:paddingBottom="@dimen/spacing_small"/>
     </LinearLayout>
 
     <FrameLayout
-        android:id="@+id/add_wrapper"
+        android:id="@+id/add_button_background"
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_centerHorizontal="true"
@@ -90,7 +103,7 @@
         android:layout_marginTop="-39dp"
         android:background="@drawable/fab_background">
         <ImageButton
-            android:id="@+id/add"
+            android:id="@+id/add_button"
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:src="@drawable/fab_plus"
@@ -101,7 +114,7 @@
         android:id="@+id/submenu_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/add_wrapper"
+        android:layout_above="@id/add_button_background"
         android:orientation="vertical"
         android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
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/no_notifications.xml b/Habitica/res/layout/no_notifications.xml
index 1e14fd4cd..1e43abf54 100644
--- a/Habitica/res/layout/no_notifications.xml
+++ b/Habitica/res/layout/no_notifications.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="@dimen/spacing_large"
-    android:baselineAligned="false">
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/spacing_medium"
-        android:paddingTop="44dp"
-        android:paddingRight="@dimen/spacing_medium">
-
+    android:layout_weight="1"
+    android:orientation="vertical"
+    android:paddingStart="@dimen/spacing_medium"
+    android:paddingTop="44dp"
+    android:paddingEnd="@dimen/spacing_medium">
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -27,9 +20,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="40dp"
+            android:paddingStart="40dp"
             android:paddingTop="26dp"
-            android:paddingRight="40dp">
+            android:paddingEnd="40dp">
 
             <TextView
                 style="@style/SectionTitle"
@@ -46,7 +39,4 @@
                 android:paddingTop="16dp"
                 android:text="@string/no_notifications_text" />
         </LinearLayout>
-
-    </LinearLayout>
-
 </LinearLayout>
diff --git a/Habitica/res/layout/notification_item.xml b/Habitica/res/layout/notification_item.xml
index 26a6827df..ed380b90a 100644
--- a/Habitica/res/layout/notification_item.xml
+++ b/Habitica/res/layout/notification_item.xml
@@ -3,18 +3,18 @@
     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:paddingStart="20dp"
     android:paddingTop="10dp"
-    android:paddingRight="20dp"
+    android:paddingEnd="20dp"
     android:paddingBottom="10dp">
 
     <ImageView
         android:id="@+id/notification_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:background="@color/transparent"
         android:visibility="gone" />
 
@@ -32,7 +32,7 @@
         android:id="@+id/dismiss_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:background="@color/transparent"
         android:clickable="true"
         android:focusable="true"
diff --git a/Habitica/res/layout/notification_item_actionable.xml b/Habitica/res/layout/notification_item_actionable.xml
index 89efb25f3..fbb2bc48e 100644
--- a/Habitica/res/layout/notification_item_actionable.xml
+++ b/Habitica/res/layout/notification_item_actionable.xml
@@ -4,11 +4,11 @@
     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:paddingStart="20dp"
     android:paddingTop="10dp"
-    android:paddingRight="20dp"
+    android:paddingEnd="20dp"
     android:paddingBottom="10dp">
 
     <TextView
@@ -41,7 +41,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginEnd="8dp"
                 android:layout_marginBottom="4dp"
                 android:textStyle="bold"
                 tools:text="Collect:" />
@@ -65,7 +65,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginEnd="8dp"
                 android:layout_marginBottom="4dp"
                 android:textStyle="bold"
                 tools:text="Difficulty:" />
@@ -100,7 +100,7 @@
             style="@style/HabiticaButton.Red.Small"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
             android:layout_weight="1"
             android:text="@string/quest_reject" />
 
diff --git a/Habitica/res/layout/notifications_header.xml b/Habitica/res/layout/notifications_header.xml
index a03897f70..07095b0f6 100644
--- a/Habitica/res/layout/notifications_header.xml
+++ b/Habitica/res/layout/notifications_header.xml
@@ -3,11 +3,11 @@
     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:paddingStart="20dp"
     android:paddingTop="10dp"
-    android:paddingRight="20dp">
+    android:paddingEnd="20dp">
 
     <LinearLayout
         android:layout_width="0dp"
@@ -26,18 +26,18 @@
             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
             android:id="@+id/notifications_title_badge"
             android:layout_width="wrap_content"
             android:layout_height="24dp"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             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>
@@ -48,6 +48,6 @@
         android:layout_height="wrap_content"
         android:background="@color/transparent"
         android:text="@string/dismiss_all"
-        android:textColor="?colorAccent" />
+        android:textColor="@color/text_brand" />
 
 </LinearLayout>
diff --git a/Habitica/res/layout/overlay_tutorial.xml b/Habitica/res/layout/overlay_tutorial.xml
index 659d1e526..3105a033c 100644
--- a/Habitica/res/layout/overlay_tutorial.xml
+++ b/Habitica/res/layout/overlay_tutorial.xml
@@ -12,13 +12,13 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:paddingBottom="24dp"
         android:layout_alignParentBottom="true"
                 android:layout_marginBottom="?actionBarSize">
         <com.habitrpg.android.habitica.ui.SpeechBubbleView
-            android:id="@+id/speech_bubble"
+            android:id="@+id/speech_bubble_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:namePlate="Justin"
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index d97072e71..a2115232a 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -37,9 +37,16 @@
                 android:id="@+id/more_button"
                 android:src="@drawable/ic_more_horiz_black_18dp"
                 android:background="@color/transparent"
+                android:tint="?textColorPrimary"
                 android:layout_width="30dp"
                 android:layout_height="20dp"
-                android:layout_gravity="right"/>
+                android:layout_gravity="end"/>
+            <TextView
+                android:id="@+id/you_pill"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Pill"
+                android:text="@string/you"/>
         </LinearLayout>
         <TableLayout
             android:layout_width="match_parent"
@@ -77,16 +84,16 @@
                 <com.habitrpg.android.habitica.ui.views.HabiticaProgressBar
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:layout_height="13dp"
+                    android:layout_height="@dimen/bar_size"
                     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>
@@ -95,16 +102,16 @@
                 <com.habitrpg.android.habitica.ui.views.HabiticaProgressBar
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:layout_height="13dp"
+                    android:layout_height="@dimen/bar_size"
                     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>
@@ -113,16 +120,16 @@
                 <com.habitrpg.android.habitica.ui.views.HabiticaProgressBar
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:layout_height="13dp"
+                    android:layout_height="@dimen/bar_size"
                     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..fdc32e531 100644
--- a/Habitica/res/layout/preference_category.xml
+++ b/Habitica/res/layout/preference_category.xml
@@ -21,8 +21,8 @@
     android:textAllCaps="true"
     android:textSize="12sp"
     android:background="@color/transparent"
-    android:textColor="@color/gray_300"
-    android:paddingLeft="32dip"
-    android:paddingRight="32dip"
+    android:textColor="@color/text_quad"
+    android:paddingStart="32dip"
+    android:paddingEnd="32dip"
     android:paddingTop="16dip"
     tools:text="Title" />
\ No newline at end of file
diff --git a/Habitica/res/layout/preference_child_summary.xml b/Habitica/res/layout/preference_child_summary.xml
index 394259e73..1705c06be 100644
--- a/Habitica/res/layout/preference_child_summary.xml
+++ b/Habitica/res/layout/preference_child_summary.xml
@@ -8,16 +8,16 @@
     android:baselineAligned="false"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingRight="16dip"
-    android:paddingLeft="16dip"
+    android:paddingEnd="16dip"
+    android:paddingStart="16dip"
     android:orientation="horizontal">
 
 <RelativeLayout
     android:layout_width="0dip"
     android:layout_height="wrap_content"
     android:layout_marginBottom="6dip"
-    android:layout_marginLeft="16dip"
-    android:layout_marginRight="6dip"
+    android:layout_marginStart="16dip"
+    android:layout_marginEnd="6dip"
     android:layout_marginTop="6dip"
     android:layout_weight="1" >
 
@@ -29,14 +29,14 @@
         android:fadingEdge="horizontal"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/black"
+        android:textColor="@color/text_primary"
         tools:text="Title"/>
 
     <TextView
         android:id="@android:id/summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@android:id/title"
+        android:layout_alignStart="@android:id/title"
         android:layout_below="@android:id/title"
         android:maxLines="4"
         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -47,5 +47,5 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingLeft="16dp" />
+        android:paddingStart="16dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/preference_child_summary_error.xml b/Habitica/res/layout/preference_child_summary_error.xml
index 924677962..ded60fe4e 100644
--- a/Habitica/res/layout/preference_child_summary_error.xml
+++ b/Habitica/res/layout/preference_child_summary_error.xml
@@ -7,16 +7,16 @@
     android:baselineAligned="false"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingRight="16dip"
-    android:paddingLeft="16dip"
+    android:paddingEnd="16dip"
+    android:paddingStart="16dip"
     android:orientation="horizontal">
 
     <RelativeLayout
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_marginBottom="6dip"
-        android:layout_marginLeft="15dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_weight="1" >
 
@@ -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
@@ -45,5 +45,5 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingLeft="16dp" />
+        android:paddingStart="16dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/profile_achievement_category.xml b/Habitica/res/layout/profile_achievement_category.xml
index 375dea27c..e1f9948f2 100644
--- a/Habitica/res/layout/profile_achievement_category.xml
+++ b/Habitica/res/layout/profile_achievement_category.xml
@@ -9,8 +9,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:layout_marginLeft="@dimen/section_leftright_padding"
-        android:layout_marginRight="@dimen/section_leftright_padding"
+        android:layout_marginStart="@dimen/section_leftright_padding"
+        android:layout_marginEnd="@dimen/section_leftright_padding"
         android:layout_weight="1"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index ef6bab6f1..6203d005c 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:fresco="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_margin="10dp"
-              android:orientation="vertical">
-
+    android:layout_height="wrap_content"
+    android:layout_margin="10dp"
+    android:orientation="vertical">
     <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal">
-
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/achievement_drawee"
-
-            android:layout_width="36dp"
-            android:layout_height="39dp"
-            android:layout_marginRight="3dp" />
-
+            android:layout_width="64dp"
+            android:layout_height="56dp"
+            app:actualImageScaleType="fitCenter"
+            android:layout_marginEnd="3dp" />
         <TextView
             android:id="@+id/achievement_count_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             tools:text="2"
-            android:background="@drawable/layout_rounded_bg_primary"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
+            android:background="@drawable/achievement_badge_bg"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
             android:textSize="12sp"
-            android:textColor="#ffffff" />
+            android:textColor="@color/white" />
     </FrameLayout>
 
     <TextView
@@ -39,5 +36,4 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="2dp"
         android:gravity="center" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/profile_new_message_dialog.xml b/Habitica/res/layout/profile_new_message_dialog.xml
index 4fd0e13e6..ca6c045c5 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"
@@ -27,7 +27,7 @@
             android:layout_weight="1"
             app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
-            <net.pherth.android.emoji_library.EmojiEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/edit_new_message_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/progress_bar.xml b/Habitica/res/layout/progress_bar.xml
index 095f1b3ae..1caf7118a 100644
--- a/Habitica/res/layout/progress_bar.xml
+++ b/Habitica/res/layout/progress_bar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
@@ -10,10 +11,11 @@
         android:layout_height="match_parent"
         android:orientation="horizontal"
         android:weightSum="1">
-        <View
+        <ImageView
             android:id="@+id/pendingBar"
             android:layout_width="0dip"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:src="@drawable/layout_rounded_bg" />
 
         <View
             android:id="@+id/pendingEmptyBarSpace"
@@ -25,13 +27,12 @@
         android:layout_height="match_parent"
         android:orientation="horizontal"
         android:weightSum="1">
-        <View
+        <ImageView
             android:id="@+id/bar"
             android:layout_width="0dip"
-            android:layout_height="match_parent" />
-
-
-        <View
+            android:layout_height="match_parent"
+            android:src="@drawable/layout_rounded_bg"/>
+        <ImageView
             android:id="@+id/emptyBarSpace"
             android:layout_width="0dip"
             android:layout_height="match_parent" />
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..91ceac078 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,8 +25,8 @@
             android:id="@+id/title_text_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray_100"
-            android:textSize="14sp"
+            android:textColor="@color/white"
+            android:textSize="16sp"
             android:textStyle="bold"/>
         <ImageView
             android:id="@+id/description_image_view"
@@ -36,17 +36,21 @@
             android:id="@+id/description_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray_100"
+            android:textColor="@color/white"
+            style="@style/Body1"
             android:textSize="12sp"
+            android:lineSpacingExtra="4dp"
+            android:letterSpacing="0.015"
             android:textAlignment="center"
             android:maxWidth="240dp"/>
         <Button
             android:id="@+id/button"
             android:layout_width="wrap_content"
-            android:layout_height="32dp"
+            android:layout_height="42dp"
             android:minWidth="110dp"
             style="@style/HabiticaButton.Purple"
-            android:layout_marginTop="14dp"/>
+            android:textSize="14sp"
+            android:layout_marginTop="4dp"/>
     </LinearLayout>
     <ImageView
         android:id="@+id/left_image_view"
diff --git a/Habitica/res/layout/promo_subscription_buy_gems.xml b/Habitica/res/layout/promo_subscription_buy_gems.xml
index 36842d3aa..37eaeb43d 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,24 +21,24 @@
         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"/>
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
-        android:layout_height="32dp"
+        android:layout_height="40dp"
         android:minWidth="110dp"
         android:text="@string/subscribe"
-        style="@style/HabiticaButton.Purple"
+        style="@style/HabiticaButton.Purple.Small"
         android:layout_marginTop="14dp"/>
 </LinearLayout>
     <ImageView
diff --git a/Habitica/res/layout/purchase_gem_view.xml b/Habitica/res/layout/purchase_gem_view.xml
index b02ee12fd..f5a7bc9f4 100644
--- a/Habitica/res/layout/purchase_gem_view.xml
+++ b/Habitica/res/layout/purchase_gem_view.xml
@@ -1,11 +1,13 @@
 <?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:orientation="vertical" android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/gem_view_background"
+    android:background="@drawable/layout_rounded_bg_window"
     android:gravity="center"
-              android:padding="14dp">
+    android:padding="14dp">
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="65dp"
@@ -15,43 +17,73 @@
         android:contentDescription="@string/gems"
         android:layout_marginTop="20dp"/>
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/amount_text_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <ImageView
-            android:id="@+id/amount_background"
-            android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center">
+        <FrameLayout
+            android:layout_width="30dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"/>
-    <TextView
-        android:layout_width="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginEnd="8dp"
+            android:clipChildren="true"
+            android:clipToPadding="true">
+            <ImageView
+                android:id="@+id/amount_background_left"
+                android:layout_width="132dp"
+                android:layout_height="35dp"
+                android:layout_gravity="start"
+                />
+        </FrameLayout>
+    <com.habitrpg.android.habitica.ui.views.DayNightTextView
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/gem_amount"
-        android:textColor="@color/blue_10"
+        app:dayTextColor="@color/blue_10"
+        app:nightTextColor="@color/white"
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="36sp"
         tools:text="21" />
-    </FrameLayout>
+        <FrameLayout
+            android:layout_width="30dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="8dp"
+            android:clipChildren="true"
+            android:clipToPadding="true">
+            <ImageView
+                android:id="@+id/amount_background_right"
+                android:layout_width="132dp"
+                android:layout_height="35dp"
+                android:layout_gravity="end"
+                />
+        </FrameLayout>
+    </LinearLayout>
 
-    <TextView
+    <com.habitrpg.android.habitica.ui.views.DayNightTextView
         android:id="@+id/gems_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/gems"
-        android:textColor="@color/blue_10"
+        app:dayTextColor="@color/blue_10"
+        app:nightTextColor="@color/white"
         android:gravity="center"
         android:layout_marginBottom="14dp" />
 
-    <Button
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="38dp"
         android:id="@+id/purchase_button"
         android:background="@drawable/purchase_button_background"
-        android:layout_marginHorizontal="8dp"
         android:textColor="@color/white"
-        style="@style/Body1"
+        android:gravity="center"
+        android:textSize="16sp"
+        android:letterSpacing="0.02"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_small"
         tools:text="$ 4.99"/>
     <TextView
         android:id="@+id/footer_text_view"
@@ -59,7 +91,6 @@
         android:layout_height="wrap_content"
         android:textColor="#CAC7CE"
         android:visibility="gone"
-        android:layout_marginTop="2dp"
         android:layout_marginBottom="4dp"
         android:layout_gravity="center"
         android:gravity="center"
diff --git a/Habitica/res/layout/purchase_subscription_view.xml b/Habitica/res/layout/purchase_subscription_view.xml
index b0446b472..6daa2009e 100644
--- a/Habitica/res/layout/purchase_subscription_view.xml
+++ b/Habitica/res/layout/purchase_subscription_view.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:background="@drawable/subscription_box_bg"
     android:gravity="center"
-    android:minHeight="80dp"
+    android:minHeight="106dp"
     android:layout_marginBottom="8dp">
 
     <FrameLayout
@@ -38,8 +38,8 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:id="@+id/priceLabel"
-                android:textColor="@color/gray_50"
-                android:textSize="24sp"
+                android:textColor="@color/text_primary"
+                android:textSize="20sp"
                 android:fontFamily="@string/font_family_medium"
                 tools:text="$ 21" />
             <ImageView
diff --git a/Habitica/res/layout/quest_menu_view.xml b/Habitica/res/layout/quest_menu_view.xml
index 597fc5bc5..ff35b61e5 100644
--- a/Habitica/res/layout/quest_menu_view.xml
+++ b/Habitica/res/layout/quest_menu_view.xml
@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="120dp"
         android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:background="@color/red_10"
         android:layout_marginTop="-30dp"
         />
@@ -19,8 +19,8 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true">
         <LinearLayout
             android:id="@+id/topView"
@@ -28,8 +28,8 @@
             android:layout_height="wrap_content"
             android:minHeight="40dp"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_medium"
             android:paddingBottom="@dimen/spacing_medium">
             <ImageButton
@@ -39,12 +39,12 @@
                 app:srcCompat="@drawable/ic_close_white_24dp"
                 android:background="@color/transparent"
                 android:contentDescription="@string/hide_boss_art"
-                android:layout_gravity="right"/>
+                android:layout_gravity="end"/>
             <TextView
                 android:id="@+id/bossNameView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:textColor="@color/white"
                 android:textSize="14sp"
                 android:textStyle="bold"
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/world_boss"
-                android:layout_gravity="right|center_vertical"
+                android:layout_gravity="end|center_vertical"
                 android:textColor="@color/white"
                 android:textSize="12sp"/>
         </LinearLayout>
@@ -66,13 +66,13 @@
             android:gravity="center_vertical"
             android:orientation="horizontal"
             tools:background="?colorPrimaryDark"
-            android:paddingLeft="@dimen/spacing_medium"
-            android:paddingRight="@dimen/spacing_large">
+            android:paddingStart="@dimen/spacing_medium"
+            android:paddingEnd="@dimen/spacing_large">
             <ImageView
                 android:id="@+id/heartIconView"
                 android:layout_width="@dimen/icon_size"
                 android:layout_height="@dimen/icon_size"
-                android:layout_marginRight="@dimen/spacing_small"/>
+                android:layout_marginEnd="@dimen/spacing_small"/>
             <com.habitrpg.android.habitica.ui.views.HabiticaProgressBar
                 android:id="@+id/healthBarView"
                 android:layout_width="0dp"
@@ -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..b051afc45 100644
--- a/Habitica/res/layout/quest_progress.xml
+++ b/Habitica/res/layout/quest_progress.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="4dp"
-    android:paddingRight="4dp"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp"
     android:paddingTop="4dp"
     android:paddingBottom="8dp">
     <LinearLayout
@@ -15,8 +15,8 @@
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/spacing_large"
         android:paddingBottom="@dimen/spacing_large"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="12dp"
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="12dp"
         android:gravity="center_vertical">
         <TextView
             android:layout_width="0dp"
@@ -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"
@@ -53,8 +53,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_large"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:layout_gravity="center_horizontal" />
         <com.habitrpg.android.habitica.ui.views.WrapContentDraweeView
             android:id="@+id/questFlourishesImageView"
@@ -62,16 +62,16 @@
             android:layout_height="219dp"
             android:layout_marginTop="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_large"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:layout_gravity="center_horizontal" />
     </FrameLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/spacing_medium"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="@dimen/spacing_large"
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large"
         android:layout_marginTop="@dimen/spacing_large">
         <TextView
             android:id="@+id/bossNameView"
@@ -85,7 +85,7 @@
             android:id="@+id/pendingDamageIconView"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
-            android:layout_marginRight="@dimen/spacing_small"/>
+            android:layout_marginEnd="@dimen/spacing_small"/>
         <TextView
             android:id="@+id/pendingDamageTextView"
             android:layout_width="wrap_content"
@@ -99,19 +99,19 @@
         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"
-        android:paddingRight="@dimen/spacing_large" />
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large" />
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/spacing_medium"
         android:layout_marginTop="@dimen/spacing_large"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="@dimen/spacing_large">
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large">
 
         <TextView
             android:layout_width="wrap_content"
@@ -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,32 +134,38 @@
         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"
-        android:paddingRight="@dimen/spacing_large"
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large"
         android:layout_marginBottom="@dimen/spacing_large"/>
     <LinearLayout
         android:id="@+id/collectionContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="@dimen/spacing_large"/>
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large"/>
+    <TextView
+        android:id="@+id/collectedItemsNumberView"
+        android:layout_width="match_parent"
+        android:gravity="end"
+        android:layout_height="wrap_content"
+        tools:text="+N items found"/>
     <TextView
         android:id="@+id/rageStrikeDescriptionView"
         android:layout_width="match_parent"
         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"
         android:textColor="@color/orange_500"
-        android:layout_marginLeft="@dimen/spacing_large"
-        android:layout_marginRight="@dimen/spacing_large"/>
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"/>
     <LinearLayout
         android:id="@+id/rageStrikeContainer"
         android:layout_width="wrap_content"
@@ -174,7 +180,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/quest_progress_old.xml b/Habitica/res/layout/quest_progress_old.xml
index 56070eb1b..fc3b14751 100644
--- a/Habitica/res/layout/quest_progress_old.xml
+++ b/Habitica/res/layout/quest_progress_old.xml
@@ -36,4 +36,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"/>
+    <TextView
+        android:id="@+id/collectedItemsNumberView"
+        android:layout_width="match_parent"
+        android:gravity="end"
+        android:layout_height="wrap_content"
+        tools:text="+N items found"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 32987d455..fd123d459 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"
@@ -24,8 +24,8 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginRight="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
             style="@style/Widget.AppCompat.ProgressBar"/>
         <ImageButton
             android:id="@+id/error_icon"
@@ -34,8 +34,8 @@
             android:layout_gravity="center_vertical"
             android:background="@color/transparent"
             android:src="@drawable/ic_warning_black"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginRight="@dimen/spacing_small"/>
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"/>
         <LinearLayout
             android:id="@+id/buyButton"
             android:layout_width="56dp"
diff --git a/Habitica/res/layout/row_quest_reward.xml b/Habitica/res/layout/row_quest_reward.xml
index 8474a4646..23b6bad57 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">
 
@@ -11,7 +11,7 @@
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         android:scaleType="center"
         app:actualImageScaleType="fitCenter"/>
 
@@ -19,5 +19,5 @@
         android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"/>
+        android:layout_marginEnd="16dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/row_quest_reward_imageview.xml b/Habitica/res/layout/row_quest_reward_imageview.xml
index 9453a8aca..95c72b29f 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">
 
@@ -11,12 +11,12 @@
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         android:scaleType="center" />
 
     <TextView
         android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"/>
+        android:layout_marginEnd="16dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index 158cb0a2b..bbfb27cfe 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -3,9 +3,8 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:clickable="true"
-                android:background="@color/white"
+                android:background="@color/content_background"
                 android:focusable="true">
     <LinearLayout
         android:id="@+id/container"
@@ -33,10 +32,9 @@
                 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"
                 android:textSize="15sp" />
             <TextView
                 android:id="@+id/unlockLabel"
@@ -46,9 +44,9 @@
                 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"
+                android:paddingEnd="2dp"
                 />
         </LinearLayout>
     </LinearLayout>
@@ -58,7 +56,7 @@
         android:layout_height="@dimen/shopitem_status_size"
         android:visibility="gone"
         tools:visibility="visible"
-        android:layout_alignLeft="@id/container"
+        android:layout_alignStart="@id/container"
         android:layout_alignTop="@id/container"
         android:gravity="center"
         android:scaleType="center"
@@ -67,11 +65,11 @@
         android:id="@+id/item_detail_indicator"
         android:layout_width="@dimen/shopitem_status_size"
         android:layout_height="@dimen/shopitem_status_size"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:visibility="gone"
-        android:layout_alignRight="@id/container"
+        android:layout_alignEnd="@id/container"
         android:gravity="center"
         android:textColor="@color/white"
-        android:layout_marginRight="-4dp"
+        android:layout_marginEnd="-4dp"
         android:textSize="12sp" />
 </RelativeLayout>
diff --git a/Habitica/res/layout/setup_customization_item.xml b/Habitica/res/layout/setup_customization_item.xml
index d4a2a2be2..ea9132a66 100644
--- a/Habitica/res/layout/setup_customization_item.xml
+++ b/Habitica/res/layout/setup_customization_item.xml
@@ -4,8 +4,8 @@
               android:layout_height="match_parent"
               xmlns:tools="http://schemas.android.com/tools"
               android:gravity="center_vertical"
-              android:paddingLeft="6dp"
-              android:paddingRight="6dp"
+              android:paddingStart="6dp"
+              android:paddingEnd="6dp"
         tools:background="?colorPrimaryOffset">
     <ImageView
             android:id="@+id/imageView"
@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="Slim"
-            android:layout_marginLeft="6dp"
+            android:layout_marginStart="6dp"
             android:textColor="@color/white_50_alpha"
             android:textSize="16sp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml
index cc63e3840..4af51548f 100644
--- a/Habitica/res/layout/shop_header.xml
+++ b/Habitica/res/layout/shop_header.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:fresco="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -27,15 +26,15 @@
         android:background="@drawable/name_plate"
         android:gravity="center_vertical"
         android:textColor="@color/white"
-        android:layout_marginLeft="45dp"
+        android:layout_marginStart="45dp"
         android:layout_marginTop="83dp"
         android:textStyle="bold" />
     <TextView
         android:id="@+id/descriptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="120dp"
         android:layout_marginBottom="4dp"
         style="@style/Body1"
diff --git a/Habitica/res/layout/shop_section_header.xml b/Habitica/res/layout/shop_section_header.xml
index f2f774896..558f280a2 100644
--- a/Habitica/res/layout/shop_section_header.xml
+++ b/Habitica/res/layout/shop_section_header.xml
@@ -22,8 +22,8 @@
             android:layout_weight="1"
             style="@style/Overline"
             tools:text="Section Header"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp" />
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp" />
         <Spinner
             android:id="@+id/classSelectionSpinner"
             android:layout_width="wrap_content"
@@ -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..6e3d86832 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"
@@ -21,13 +21,13 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"/>
+            android:layout_marginStart="8dp"/>
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:orientation="vertical"
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index dd66c4bd7..df5d2b96f 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">
@@ -16,9 +16,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_centerVertical="true"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingEnd="16dp"
+                android:paddingStart="@dimen/spacing_large"
+                android:paddingEnd="@dimen/spacing_large"
                 android:paddingBottom="20dp"
                 android:paddingTop="20dp">
                 <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
@@ -39,7 +38,6 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true" />
         </RelativeLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/snackbar_view.xml b/Habitica/res/layout/snackbar_view.xml
index e7d87bc7e..77132f4d2 100644
--- a/Habitica/res/layout/snackbar_view.xml
+++ b/Habitica/res/layout/snackbar_view.xml
@@ -64,8 +64,8 @@
             android:layout_height="match_parent"
             android:gravity="center_vertical"
             android:background="@drawable/snackbar_right_bg"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:layout_marginEnd="1dp"
             android:layout_marginTop="1dp"
             android:layout_marginBottom="1dp"
diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml
index e7e5ff79c..b8db0b087 100644
--- a/Habitica/res/layout/speechbubble.xml
+++ b/Habitica/res/layout/speechbubble.xml
@@ -11,17 +11,17 @@
             android:layout_height="wrap_content"
             tools:src="@drawable/justin_textbox"
             android:layout_gravity="right"
-            android:layout_marginRight="30dp"/>
+            android:layout_marginEnd="30dp"/>
 
     <LinearLayout
         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"
-        android:paddingRight="21dp"
+        android:paddingStart="21dp"
+        android:paddingEnd="21dp"
         android:paddingTop="24dp"
         android:layout_marginBottom="10dp">
 
@@ -80,7 +80,7 @@
             android:background="@drawable/name_plate"
             android:gravity="center_vertical"
             android:textColor="@color/white"
-            android:layout_marginLeft="21dp"
+            android:layout_marginStart="21dp"
             android:layout_marginTop="32dp"
             android:textStyle="bold" />
 </FrameLayout>
\ No newline at end of file
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..d8a3f2521 100644
--- a/Habitica/res/layout/stats_view.xml
+++ b/Habitica/res/layout/stats_view.xml
@@ -4,9 +4,9 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:background="@drawable/layout_rounded_bg_gray_700"
-              android:layout_marginLeft="16dp"
-              android:layout_marginRight="16dp">
+              android:background="@drawable/layout_rounded_bg_window"
+              android:layout_marginStart="16dp"
+              android:layout_marginEnd="16dp">
     <LinearLayout
         android:id="@+id/titleWrapper"
         android:layout_width="match_parent"
@@ -21,7 +21,7 @@
             android:gravity="center_vertical"
             style="@style/Headline"
             android:textColor="@color/white"
-            android:layout_marginLeft="12dp"/>
+            android:layout_marginStart="12dp"/>
 
         <TextView
             android:id="@+id/totalValueTextView"
@@ -32,7 +32,7 @@
             style="@style/Headline"
             android:textStyle="bold"
             android:textColor="@color/white"
-            android:layout_marginRight="12dp"/>
+            android:layout_marginEnd="12dp"/>
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
@@ -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..a75136aa7 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"
@@ -217,7 +217,7 @@
         <Button
             android:id="@+id/change_subscription_button"
             android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="wrap_content"
             android:text="@string/visit_website"
             android:layout_gravity="center"
             style="@style/HabiticaButton.Purple"
diff --git a/Habitica/res/layout/support_collapsible_section.xml b/Habitica/res/layout/support_collapsible_section.xml
index db70187a9..f6c353652 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>
@@ -40,12 +40,13 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content" />
+
         <ImageView
             android:id="@+id/caret_view"
-            android:layout_width="wrap_content"
+            android:layout_width="14dp"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
-            android:layout_marginEnd="@dimen/spacing_large"/>
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:src="@drawable/ic_keyboard_arrow_down_black_24dp" />
     </LinearLayout>
     <TextView android:id="@+id/description_view"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/support_faq_item.xml b/Habitica/res/layout/support_faq_item.xml
index 8d78e746b..ff6961e59 100644
--- a/Habitica/res/layout/support_faq_item.xml
+++ b/Habitica/res/layout/support_faq_item.xml
@@ -10,16 +10,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/support_faq"
-        android:layout_marginLeft="26dp"
-        android:layout_marginRight="29dp"/>
+        android:layout_marginStart="26dp"
+        android:layout_marginEnd="29dp"/>
     <TextView
         android:id="@+id/text_view"
         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_marginEnd="@dimen/spacing_large"
         android:layout_marginTop="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
         />
diff --git a/Habitica/res/layout/system_chat_message.xml b/Habitica/res/layout/system_chat_message.xml
index bd0fda0bb..17c4fa78f 100644
--- a/Habitica/res/layout/system_chat_message.xml
+++ b/Habitica/res/layout/system_chat_message.xml
@@ -4,11 +4,11 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="55dp"
-    android:paddingRight="@dimen/chat_horizontal_inset"
+    android:paddingStart="55dp"
+    android:paddingEnd="@dimen/chat_horizontal_inset"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
-    android:background="@color/gray_700">
+    android:background="@color/window_background">
     <TextView
         android:background="@drawable/system_chat_background"
         android:id="@+id/text_view"
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="@dimen/spacing_large"
-        android:textColor="@color/brand_300"
+        android:textColor="@color/text_brand_neon"
         tools:text="System message"
         style="@style/Body1"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/task_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..95c8a1c53 100644
--- a/Habitica/res/layout/task_main_content.xml
+++ b/Habitica/res/layout/task_main_content.xml
@@ -9,16 +9,17 @@
     android:layout_gravity="center_vertical"
     android:paddingTop="@dimen/task_top_bottom_padding"
     android:paddingBottom="@dimen/task_top_bottom_padding"
-    android:paddingEnd="@dimen/task_text_padding"
-    android:paddingStart="@dimen/task_text_padding">
+    android:layout_marginEnd="@dimen/task_text_padding"
+    android:layout_marginStart="@dimen/task_text_padding">
         <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"
             android:textSize="15sp"
+            android:letterSpacing="0.025"
             tools:text="Habit Title" />
 
         <com.habitrpg.android.habitica.ui.views.EllipsisTextView
@@ -26,15 +27,18 @@
             style="@style/Caption2.Regular"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textColor="@color/text_ternary"
             android:maxLines="3"
             android:ellipsize="end"
-            android:textSize="11sp"
-            tools:text="Notes"/>
+            android:textSize="13sp"
+            tools:text="Notes"
+            android:layout_marginTop="1dp"
+            android:layout_marginBottom="7dp"/>
 
         <Button
             android:id="@+id/expand_notes_button"
             android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="28dp"
             style="@style/Base.Widget.AppCompat.Button.Borderless"
             android:textSize="11sp"
             android:text="@string/expand_notes"
@@ -46,41 +50,62 @@
             android:layout_height="wrap_content"
             style="@style/Caption4"
             android:text="@string/pending_approval"
+            android:textColor="@color/text_quad"
             />
-        <Space
-            android:layout_width="wrap_content"
-            android:layout_height="7dp" />
         <LinearLayout
             android:id="@+id/taskIconWrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/iconViewTeamTask"
+                android:layout_width="@dimen/task_icon_size"
+                android:layout_height="@dimen/task_icon_size"
+                android:scaleType="center"
+                app:srcCompat="@drawable/task_icon_team"
+                android:layout_marginEnd="12dp"
+                app:tint="@color/text_ternary"
+                android:alpha="0.25"
+                android:visibility="gone"
+                app:tintMode="multiply"/>
             <ImageView
                 android:id="@+id/iconViewCalendar"
                 android:layout_width="@dimen/task_icon_size"
                 android:layout_height="@dimen/task_icon_size"
                 android:scaleType="center"
                 app:srcCompat="@drawable/task_icon_calendar"
-                android:layout_marginEnd="2dp"/>
+                android:layout_marginEnd="2dp"
+                app:tint="@color/text_ternary"
+                android:alpha="0.25"
+                app:tintMode="multiply"/>
             <TextView
                 android:id="@+id/specialTaskText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textColor="@color/task_secondary_text"
                 android:visibility="invisible"
                 style="@style/Caption3"
                 tools:visibility="visible"
+                android:textColor="@color/text_ternary"
                 tools:text="special"  />
-
+            <ImageView
+                android:id="@+id/iconViewStreak"
+                android:layout_width="@dimen/task_icon_size"
+                android:layout_height="@dimen/task_icon_size"
+                android:scaleType="center"
+                app:srcCompat="@drawable/task_icon_streak"
+                android:layout_marginStart="@dimen/task_icon_space"
+                android:layout_marginEnd="2dp"
+                app:tint="@color/text_ternary"
+                android:alpha="0.25"
+                android:visibility="gone"
+                app:tintMode="multiply"/>
             <TextView
                 android:id="@+id/streakTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/task_icon_size"
-                android:layout_marginStart="@dimen/task_icon_space"
-                android:drawableStart="@drawable/task_icon_streak"
-                android:drawablePadding="2dp"
-                android:textColor="@color/task_secondary_text"
+                android:textColor="@color/text_quad"
                 tools:text="10"
                 android:gravity="center_vertical"
                 style="@style/Caption3" />
@@ -92,7 +117,10 @@
                 android:layout_marginStart="@dimen/task_icon_space"
                 android:contentDescription="@string/belongs_to_challenge"
                 android:scaleType="center"
-                app:srcCompat="@drawable/task_megaphone" />
+                app:srcCompat="@drawable/task_megaphone"
+                app:tint="@color/text_ternary"
+                android:alpha="0.25"
+                app:tintMode="multiply" />
             <ImageView
                 android:id="@+id/iconviewReminder"
                 android:layout_width="@dimen/task_icon_size"
@@ -100,12 +128,15 @@
                 android:layout_marginStart="@dimen/task_icon_space"
                 android:contentDescription="@string/has_reminder"
                 android:scaleType="center"
-                app:srcCompat="@drawable/task_icon_reminder" />
+                app:srcCompat="@drawable/task_icon_reminder"
+                app:tint="@color/text_ternary"
+                android:alpha="0.25"
+                app:tintMode="multiply"/>
             <TextView
                 android:id="@+id/reminder_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/task_secondary_text"
+                android:textColor="@color/text_quad"
                 style="@style/Caption3" />
         </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/task_setup_item.xml b/Habitica/res/layout/task_setup_item.xml
index 9953cf875..b42f69f5f 100644
--- a/Habitica/res/layout/task_setup_item.xml
+++ b/Habitica/res/layout/task_setup_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatButton xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/textView"
         android:layout_height="36dp"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/tavern_chat_intro_item.xml b/Habitica/res/layout/tavern_chat_intro_item.xml
new file mode 100644
index 000000000..9dd30971e
--- /dev/null
+++ b/Habitica/res/layout/tavern_chat_intro_item.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="200dp"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <com.habitrpg.android.habitica.ui.AvatarView
+        android:id="@+id/avatar_view"
+        android:layout_width="87dp"
+        android:layout_height="69dp"
+        android:layout_gravity="center_horizontal|top"
+        android:visibility="visible"
+        app:showBackground="false"
+        app:showMount="false"
+        app:showPet="false"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/filler_1"
+        android:layout_width="match_parent"
+        android:layout_height="16dp"
+        android:layout_gravity="bottom|center_horizontal"
+        android:ellipsize="end"
+        android:lines="1"
+        android:singleLine="true"
+        android:textAlignment="center"
+        android:textColor="@color/gray_300"
+        android:textSize="12sp" />
+
+    <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
+        android:id="@+id/display_name_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        android:baselineAligned="false"
+        android:clipToPadding="false"
+        android:textAlignment="center"
+        android:visibility="visible" />
+
+    <TextView
+        android:id="@+id/subline_textview"
+        android:layout_width="match_parent"
+        android:layout_height="24dp"
+        android:layout_gravity="center_horizontal"
+        android:ellipsize="end"
+        android:lines="1"
+        android:singleLine="true"
+        android:textAlignment="center"
+        android:textColor="@color/gray_300"
+        android:textSize="12sp"
+        tools:text="@Username" />
+
+    <TextView
+        android:id="@+id/filler_2"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:layout_gravity="bottom|center_horizontal"
+        android:ellipsize="end"
+        android:lines="1"
+        android:singleLine="true"
+        android:textAlignment="center"
+        android:textColor="@color/gray_300"
+        android:textSize="12sp" />
+
+    <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+        android:id="@+id/message_text"
+        android:layout_width="348dp"
+        android:layout_height="42dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:lineSpacingMultiplier="1.0"
+        android:text="Start chatting below! Remember to be friendly and follow the Community Guidelines."
+        android:textAlignment="center"
+        android:textColor="@color/gray_300"
+        tools:text="Start chatting below! Remember to be friendly and follow the Community Guidelines." />
+
+</LinearLayout>
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 963544f5f..abdf51e61 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="?attr/colorContentBackground"
     android:foreground="?selectableItemBackground"
     android:orientation="vertical">
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/main_task_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -14,12 +15,8 @@
         android:layout_marginVertical="@dimen/task_spacing_vertical"
         android:background="@drawable/task_background"
         android:clipChildren="true"
-        android:minHeight="@dimen/task_min_height">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+        android:minHeight="@dimen/task_min_height"
+        android:orientation="vertical">
             <LinearLayout
                 android:id="@+id/card_view"
                 android:layout_width="match_parent"
@@ -30,14 +27,32 @@
                 <FrameLayout
                     android:id="@+id/checkBoxHolder"
                     android:layout_width="@dimen/button_width"
-                    android:layout_height="match_parent">
-                    <CheckBox
-                        android:id="@+id/checkBox"
-                        android:layout_width="@dimen/checkbox_size"
-                        android:layout_height="@dimen/checkbox_size"
+                    android:layout_height="match_parent"
+                    tools:background="@color/red_10">
+                    <View
+                        android:id="@+id/checkBoxBackground"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:gravity="center"
+                        android:background="@drawable/todo_unchecked"
+                        android:layout_gravity="center" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"/>
+                    <ImageView
+                        android:id="@+id/checkmark"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
                         android:layout_gravity="center"
-                        android:button="@drawable/todo_checkbox"
-                        android:gravity="center" />
+                        android:scaleType="center"
+                        android:src="@drawable/checkmark" />
+                    <ImageView
+                        android:id="@+id/lock_view"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_gravity="center"
+                        android:scaleType="center"
+                        android:src="@drawable/checkmark" />
                 </FrameLayout>
                 <include layout="@layout/task_main_content" />
                 <ProgressBar
@@ -45,8 +60,8 @@
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="@dimen/spacing_small"
-                    android:layout_marginRight="@dimen/spacing_small"
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:layout_marginEnd="@dimen/spacing_small"
                     style="@style/Widget.AppCompat.ProgressBar"/>
                 <ImageButton
                     android:id="@+id/error_icon"
@@ -55,8 +70,8 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/transparent"
                     android:src="@drawable/ic_warning_black"
-                    android:layout_marginLeft="@dimen/spacing_small"
-                    android:layout_marginRight="@dimen/spacing_small"/>
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:layout_marginEnd="@dimen/spacing_small"/>
                 <include layout="@layout/checklist_indicator" />
             </LinearLayout>
             <LinearLayout
@@ -64,6 +79,5 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
-        </LinearLayout>
-    </FrameLayout>
-</LinearLayout>
+    </LinearLayout>
+</FrameLayout>
diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index dbc7eada3..396900ad6 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -7,7 +7,7 @@
                 android:orientation="horizontal">
 
     <ImageView
-            android:id="@+id/ic_header"
+            android:id="@+id/icon_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/progressBar"
@@ -20,7 +20,7 @@
             android:id="@+id/progressBar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bar_size"
-            android:layout_toEndOf="@id/ic_header"
+            android:layout_toEndOf="@id/icon_view"
             android:orientation="horizontal"/>
 
     <LinearLayout
@@ -28,7 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/progressBar"
-            android:layout_toEndOf="@id/ic_header"
+            android:layout_toEndOf="@id/icon_view"
             android:paddingTop="2dp">
 
         <ImageView
@@ -39,7 +39,7 @@
                 android:visibility="gone"/>
 
         <TextView
-                android:id="@+id/valueLabel"
+                android:id="@+id/value_text_view"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -47,14 +47,14 @@
                 tools:text="50/50"/>
 
         <ImageView
-                android:id="@+id/descriptionIconView"
+                android:id="@+id/description_icon_view"
                 android:layout_width="@dimen/icon_size"
                 android:layout_height="@dimen/icon_size"
                 android:layout_marginEnd="@dimen/spacing_small"
                 android:visibility="gone"/>
 
         <TextView
-                android:id="@+id/descriptionLabel"
+                android:id="@+id/description_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center|end"
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
index 0b5a9d6f7..0a62d984b 100644
--- a/Habitica/res/layout/view_collapsible_section.xml
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -9,12 +9,13 @@
         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:id="@+id/section_title_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="32dp"
         android:gravity="center_vertical">
         <TextView
             android:id="@+id/titleTextView"
@@ -23,14 +24,14 @@
             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"
             android:layout_weight="1"
             android:layout_height="18dp"
-            android:layout_marginLeft="@dimen/spacing_medium"
-            android:layout_marginRight="@dimen/spacing_medium">
+            android:layout_marginStart="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium">
             <ImageView
                 android:id="@+id/infoIconView"
                 android:layout_width="18dp"
@@ -41,7 +42,6 @@
             android:id="@+id/caretView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="center"
-            android:paddingEnd="32dp" />
+            android:scaleType="center" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/view_invitation.xml b/Habitica/res/layout/view_invitation.xml
index 1c5a58274..be782544d 100644
--- a/Habitica/res/layout/view_invitation.xml
+++ b/Habitica/res/layout/view_invitation.xml
@@ -4,17 +4,16 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.cardview.widget.CardView
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/CardView.Default"
+        style="@style/FlatCardView"
         android:id="@+id/party_invitation_wrapper">
         <LinearLayout
             android:orientation="horizontal"
             android:layout_gravity="center_vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            style="@style/CardContent">
+            android:layout_height="match_parent">
 
             <com.habitrpg.android.habitica.ui.RoundedFrameLayout
                 android:layout_width="@dimen/party_invite_avatar"
@@ -38,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/party_invite_separator"
-                android:text="@string/invitation_title" />
+                android:text="@string/invitation_title_no_leader" />
 
             <Space
                 android:layout_width="0dp"
@@ -52,20 +51,22 @@
                 android:layout_marginEnd="@dimen/party_invite_separator"
                 android:layout_gravity="end|center_vertical|fill_horizontal">
 
-                <Button
+                <ImageButton
                     android:id="@+id/accept_button"
-                    android:layout_width="@dimen/party_invite_button"
-                    android:layout_height="@dimen/party_invite_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/party_accept_button_start_margin"
-                    android:background="@drawable/party_invite_accept" />
+                    android:src="@drawable/party_invite_accept"
+                    android:background="@color/transparent" />
 
-                <Button
+                <ImageButton
                     android:id="@+id/reject_button"
-                    android:layout_width="@dimen/party_invite_button"
-                    android:layout_height="@dimen/party_invite_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/party_accept_button_start_margin"
-                    android:background="@drawable/party_invite_reject" />
+                    android:src="@drawable/party_invite_reject"
+                    android:background="@color/transparent" />
             </LinearLayout>
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/widget_dailies_list_row.xml b/Habitica/res/layout/widget_dailies_list_row.xml
index ddffc1a59..fcd676cf1 100644
--- a/Habitica/res/layout/widget_dailies_list_row.xml
+++ b/Habitica/res/layout/widget_dailies_list_row.xml
@@ -28,8 +28,6 @@
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/task_top_bottom_compact_padding"
             android:paddingEnd="@dimen/task_text_padding"
-            android:paddingLeft="@dimen/task_text_padding"
-            android:paddingRight="@dimen/task_text_padding"
             android:paddingStart="@dimen/task_text_padding"
             android:paddingTop="@dimen/task_top_bottom_compact_padding"
             android:textColor="@color/primary_text_light" />
diff --git a/Habitica/res/layout/widget_habit_button.xml b/Habitica/res/layout/widget_habit_button.xml
index 8bb98bf1f..63adf9e2f 100644
--- a/Habitica/res/layout/widget_habit_button.xml
+++ b/Habitica/res/layout/widget_habit_button.xml
@@ -27,6 +27,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@drawable/selection_highlight_brand"
+                android:textSize="24sp"
                 />
         </FrameLayout>
         <FrameLayout
@@ -45,6 +46,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@drawable/selection_highlight_brand"
+                android:textSize="24sp"
                 />
         </FrameLayout>
     </LinearLayout>
@@ -52,8 +54,8 @@
         android:id="@+id/habit_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:layout_marginTop="6dp"
         android:layout_marginBottom="12dp"
         android:textColor="@color/white_75_alpha"
diff --git a/Habitica/res/layout/widget_task_list.xml b/Habitica/res/layout/widget_task_list.xml
index f33c97d3c..1f049fa73 100644
--- a/Habitica/res/layout/widget_task_list.xml
+++ b/Habitica/res/layout/widget_task_list.xml
@@ -14,8 +14,8 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp">
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp">
     <ListView
         android:id="@+id/list_view"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/widget_todo_list_row.xml b/Habitica/res/layout/widget_todo_list_row.xml
index b2c2a0510..623688968 100644
--- a/Habitica/res/layout/widget_todo_list_row.xml
+++ b/Habitica/res/layout/widget_todo_list_row.xml
@@ -28,8 +28,6 @@
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/task_top_bottom_compact_padding"
             android:paddingEnd="@dimen/task_text_padding"
-            android:paddingLeft="@dimen/task_text_padding"
-            android:paddingRight="@dimen/task_text_padding"
             android:paddingStart="@dimen/task_text_padding"
             android:paddingTop="@dimen/task_top_bottom_compact_padding"
             android:textColor="@color/primary_text_light" />
diff --git a/Habitica/res/layout/world_boss_description_view.xml b/Habitica/res/layout/world_boss_description_view.xml
index 202dafccb..cc4045095 100644
--- a/Habitica/res/layout/world_boss_description_view.xml
+++ b/Habitica/res/layout/world_boss_description_view.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/spacing_large"
-    android:paddingRight="@dimen/spacing_large">
+    android:paddingStart="@dimen/spacing_large"
+    android:paddingEnd="@dimen/spacing_large">
 <TextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/Habitica/res/menu/inbox.xml b/Habitica/res/menu/inbox.xml
index a2c69decb..cc5a6df23 100644
--- a/Habitica/res/menu/inbox.xml
+++ b/Habitica/res/menu/inbox.xml
@@ -4,7 +4,6 @@
     tools:context="com.habitrpg.android.habitica.TaskActivity">
 
     <item android:id="@+id/send_message"
-        android:icon="@drawable/menu_messages"
         android:title="@string/send_message"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/Habitica/res/menu/menu_challenge_details.xml b/Habitica/res/menu/menu_challenge_details.xml
index 8dc0d1443..33ad438bb 100644
--- a/Habitica/res/menu/menu_challenge_details.xml
+++ b/Habitica/res/menu/menu_challenge_details.xml
@@ -4,7 +4,13 @@
     tools:context="com.habitrpg.android.habitica.TaskActivity">
     <item
         android:id="@+id/action_edit"
-        android:title="@string/action_edit" />
+        android:title="@string/action_edit"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_end_challenge"
+        android:title="@string/action_end_challenge"
+        app:showAsAction="never"
+        />
     <item
         android:id="@+id/action_share"
         android:title="@string/share"/>
diff --git a/Habitica/res/menu/menu_create_refresh.xml b/Habitica/res/menu/menu_create_refresh.xml
new file mode 100644
index 000000000..4a5396631
--- /dev/null
+++ b/Habitica/res/menu/menu_create_refresh.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu 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">
+    <item android:id="@+id/menu_create_item"
+        android:title="@string/create"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/menu_refresh"
+        android:orderInCategory="1"
+        app:showAsAction="never"
+        android:title="@string/action_refresh" />
+</menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/menu_list_challenges.xml b/Habitica/res/menu/menu_list_challenges.xml
index d826b3520..5ad31dec2 100644
--- a/Habitica/res/menu/menu_list_challenges.xml
+++ b/Habitica/res/menu/menu_list_challenges.xml
@@ -11,8 +11,7 @@
         android:id="@+id/action_reload"
         android:icon="@drawable/ic_refresh_white"
         android:title="@string/action_refresh"
-        app:showAsAction="never"
-        android:actionViewClass="android.widget.ImageButton"/>
+        app:showAsAction="never" />
 
     <item android:id="@+id/action_search"
         android:icon="@drawable/ic_action_filter_list"
diff --git a/Habitica/res/menu/menu_team_board.xml b/Habitica/res/menu/menu_team_board.xml
new file mode 100644
index 000000000..132073bf9
--- /dev/null
+++ b/Habitica/res/menu/menu_team_board.xml
@@ -0,0 +1,19 @@
+<menu 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"
+    tools:context="com.habitrpg.android.habitica.TaskActivity">
+    <item android:id="@+id/action_team_info"
+        android:title="@string/team_information"
+        android:icon="@drawable/team_info_icon"
+        app:showAsAction="collapseActionView|always" />
+    <item android:id="@+id/action_search"
+        android:title="@string/search"
+        android:icon="@drawable/ic_search"
+        app:showAsAction="collapseActionView|always"
+        app:actionLayout="@layout/toolbar_search" />
+
+    <item android:id="@+id/action_filter"
+        android:icon="@drawable/ic_action_filter_list"
+        android:title="@string/filter"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 4a3af252c..fb00f0e0c 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -107,15 +107,6 @@
             android:id="@+id/openChallengeDetail"
             app:destination="@id/challengeDetailFragment" />
     </fragment>
-    <fragment
-        android:id="@+id/shopsFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment"
-        android:label="@string/sidebar_shops" >
-        <argument
-            android:name="selectedTab"
-            app:argType="integer"
-            android:defaultValue="0" />
-    </fragment>
     <fragment
         android:id="@+id/avatarOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment"
@@ -159,11 +150,6 @@
             app:argType="boolean"
             android:defaultValue="true" />
     </activity>
-    <activity
-        android:id="@+id/giftOneGetOneInfoActivity"
-        android:name="com.habitrpg.android.habitica.ui.activities.GiftOneGetOneInfoActivity"
-        android:label="@string/gift_one_get_one" >
-    </activity>
     <activity
         android:id="@+id/gemPurchaseActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity"
@@ -218,7 +204,16 @@
         android:label="@string/sidebar_help" >
         <argument
             android:name="position"
-            app:argType="integer" />
+            app:argType="integer"
+            android:defaultValue="0"/>
+        <argument
+            android:name="question"
+            app:argType="string"
+            app:nullable="true"/>
+        <argument
+            android:name="answer"
+            app:argType="string"
+            app:nullable="true"/>
     </fragment>
     <fragment
         android:id="@+id/aboutFragment"
@@ -434,5 +429,13 @@
     <fragment
         android:id="@+id/promoInfoFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment"
-        android:label="PromoInfoFragment" />
+        android:label="" />
+    <fragment
+        android:id="@+id/teamBoardFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.tasks.TeamBoardFragment"
+        android:label="TeamBoardFragment" >
+        <argument
+            android:name="teamID"
+            app:argType="string" />
+    </fragment>
 </navigation>
\ No newline at end of file
diff --git a/Habitica/res/values-be/strings.profile.xml b/Habitica/res/values-be/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-be/strings.profile.xml
+++ b/Habitica/res/values-be/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-be/strings.sidebar.xml b/Habitica/res/values-be/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-be/strings.sidebar.xml
+++ b/Habitica/res/values-be/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-be/strings.tutorial.xml b/Habitica/res/values-be/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-be/strings.tutorial.xml
+++ b/Habitica/res/values-be/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-be/strings.xml b/Habitica/res/values-be/strings.xml
index e21d72c94..73d79c395 100755
--- a/Habitica/res/values-be/strings.xml
+++ b/Habitica/res/values-be/strings.xml
@@ -9,9 +9,7 @@
   <string name="pref_reminder_checkbox">Актываваць напамін</string>
   <string name="pref_reminder_picker">Наладзіць час напаміну</string>
   <!--Adding tasks-->
-  <string name="task_value">Вартасьць</string>
   <string name="action_edit">Рэдагаваць</string>
-  <string name="action_delete">Выдаліць</string>
   <string name="action_cancel">Адмяніць</string>
   <string name="login_btn">Падлучыцца</string>
   <string name="register_btn">Зарэгістравацца</string>
@@ -21,14 +19,12 @@
   <string name="emailAddress">Электронная пошта</string>
   <string name="confirmpassword">Пацьвердзіць пароль</string>
   <string name="logout">Выйсьці</string>
-  <string name="string_revive">Адрадзіцца</string>
   <string name="about.title">Інфармацыя</string>
   <string name="about.rate_our_app">Ацаніце нашу прыладу</string>
   <!--Network Errors-->
   <string name="network_error_no_network_body">Вы не падлучаныя да інтэрнэту.</string>
   <string name="authentication_error_body">Ваша імя карыстальніка і/альбо пароль былі ўведзеныя не правільна.</string>
   <string name="save_changes">Захаваць</string>
-  <string name="frequency_daily">Што X дзён</string>
   <string name="monday">Панядзелак</string>
   <string name="tuesday">Аўторак</string>
   <string name="wednesday">Серада</string>
@@ -36,19 +32,13 @@
   <string name="friday">Пятніца</string>
   <string name="saturday">Субота</string>
   <string name="sunday">Нядзеля</string>
-  <string name="levelup_button">Ура!</string>
   <string name="faint_subtitle">Не адчайвайцеся!</string>
-  <string name="add_checklist_item">Дадаць</string>
-  <string name="coming_soon">Неўзабаве</string>
-  <string name="flag_confirm">Паскардзіцца на паведамленьне</string>
   <string name="reward.dialog.buy">Набыць</string>
   <string name="chat">Чат</string>
   <string name="members">Удзельнікі</string>
   <string name="habits">Звычкі</string>
   <string name="dailies">Штодзённыя заданьні</string>
   <string name="rewards">Узнагароды</string>
-  <string name="taskform.delete.title">Дакладна?</string>
-  <string name="taskform.delete.message">Вы напраўду хочаце выдаліць?</string>
   <string name="yes">Так</string>
   <string name="no">Не</string>
   <string name="quest">Квэст</string>
@@ -56,7 +46,6 @@
   <string name="avatar_hair">Валасы</string>
   <string name="avatar_shirt">Цішотка</string>
   <string name="avatar_skin">Скура</string>
-  <string name="avatar_ears">Зьвярыныя вушы</string>
   <string name="avatar_base">Аснова</string>
   <string name="avatar_color">Колер</string>
   <string name="avatar_beard">Барада</string>
@@ -72,10 +61,6 @@
   <string name="quest.reject">Адмовіцца</string>
   <string name="quest.begin">Пачаць квэст</string>
   <string name="quest.cancel">Адмяніць запрашэньне</string>
-  <string name="quest.leave">Пакінуць квэст</string>
-  <string name="quest.accepted">Згадзіліся</string>
-  <string name="quest.rejected">Адмовіліся</string>
-  <string name="quest.participants">Удзельнікі</string>
   <string name="complete_tutorial">Ясна!</string>
   <string name="dismiss_tutorial">Напомніць мне яшчэ раз</string>
   <string name="skip_button">Прапусьціць</string>
@@ -91,10 +76,7 @@
   <string name="guild">Гільдыя</string>
   <string name="leave">Выйсьці</string>
   <string name="join">Далучыцца</string>
-  <string name="leader">Лідэр</string>
   <string name="gems">Каштоўныя камяні</string>
-  <string name="send_pm">Даслаць прыватнае паведамленьне</string>
-  <string name="flag">Паскардзіцца</string>
   <string name="delete">Выдаліць</string>
   <string name="name">Імя</string>
   <string name="description">Апісаньне</string>
diff --git a/Habitica/res/values-bg/strings.sidebar.xml b/Habitica/res/values-bg/strings.sidebar.xml
index 4e20255b3..67dc9a364 100644
--- a/Habitica/res/values-bg/strings.sidebar.xml
+++ b/Habitica/res/values-bg/strings.sidebar.xml
@@ -6,7 +6,6 @@
   <string name="sidebar_inbox">Съобщения</string>
   <string name="sidebar_tavern">Кръчма</string>
   <string name="sidebar_party">Група</string>
-  <string name="sidebar_purchaseGems">Купуване на диаманти</string>
   <string name="sidebar_guilds">Гилдии</string>
   <string name="sidebar_challenges">Предизвикателства</string>
   <string name="sidebar_section_inventory">Инвентар</string>
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index e5fe7e6bb..a167d00aa 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -379,6 +379,9 @@
     <string name="remove_tasks">Премахване</string>
     <string name="keep_tasks">Задържане</string>
     <string name="my_challenges">Моите предизвикателства</string>
+  <string name="remove_tasks">Премахване</string>
+  <string name="keep_tasks">Задържане</string>
+  <string name="my_challenges">Моите предизвикателства</string>
     <string name="daily">Ежедневно</string>
     <string name="habit">Навик</string>
     <string name="reward">Награда</string>
@@ -687,4 +690,3 @@
     <string name="invited_to_private_guild"><![CDATA[Получихте покана за присъединяване към частната гилдия <b>%1$s</b>]]></string>
     <string name="invited_to_public_guild"><![CDATA[Получихте покана за присъединяване към гилдията <b>%1$s</b>]]></string>
     <string name="invited_to_quest"><![CDATA[Получихте покана за присъединяване в мисията <b>%1$s</b>]]></string>
-</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ca/strings.profile.xml b/Habitica/res/values-ca/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-ca/strings.profile.xml
+++ b/Habitica/res/values-ca/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-ca/strings.sidebar.xml b/Habitica/res/values-ca/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-ca/strings.sidebar.xml
+++ b/Habitica/res/values-ca/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-ca/strings.tutorial.xml b/Habitica/res/values-ca/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-ca/strings.tutorial.xml
+++ b/Habitica/res/values-ca/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-ca/strings.xml b/Habitica/res/values-ca/strings.xml
index 4e0b4744f..cfaf26383 100755
--- a/Habitica/res/values-ca/strings.xml
+++ b/Habitica/res/values-ca/strings.xml
@@ -4,17 +4,14 @@
   <string name="XP_default">Experiència</string>
   <string name="HP_default">Salut</string>
   <string name="MP_default">Mannà</string>
-  <string name="ERR_pb_barcode">No s\'han pogut carregar les preferències a partir de codi de barres</string>
   <!--Prefs-->
   <string name="PS_settings_title">Configuració</string>
-  <string name="SP_address_hint">El teu servidor personalitzat</string>
   <string name="SP_userID_title">ID d\'usuari</string>
   <string name="SP_userID_summary">El teu ID d\'usuari</string>
   <string name="SP_APIToken_title">Token d\'API</string>
   <string name="SP_APIToken_summary">El teu token d\'API</string>
   <string name="Language_title">Idioma</string>
   <string name="Language_summary">Canvia l\'idioma d\'Habitica</string>
-  <string name="SP_user_qr_code">El teu codi QR</string>
   <string name="PS_contact_title">Contacta\'m</string>
   <string name="pref_account_header">Compte</string>
   <string name="pref_first_day_of_the_week_title">Primer dia de la setmana</string>
@@ -23,7 +20,6 @@
   <string name="pref_reminder_checkbox">Activar recordatori</string>
   <string name="pref_reminder_picker">Establir hora de recordatori</string>
   <string name="pref_cds_header">Inici del dia personalitzat</string>
-  <string name="pref_cds_picker">Personalitza l\'hora d\'inici del dia</string>
   <string name="pref_push_notifications_checkbox">Notificacions automàtiques d\'usuari</string>
   <string name="push_notifications">Notificacions automàtiques</string>
   <string name="push_notifications_sum">Configura les notificacions automàtiques</string>
@@ -36,9 +32,7 @@
   <string name="preference_push_your_quest_has_begun">La teva Missió ha començat</string>
   <string name="preference_push_invited_to_quest">Convidat a una Missió</string>
   <!--Adding tasks-->
-  <string name="task_value">Valor</string>
   <string name="action_edit">Editar</string>
-  <string name="action_delete">Eliminar</string>
   <string name="action_cancel">Cancelar</string>
   <string name="login_btn">Iniciar sessió</string>
   <string name="register_btn">Registrar-se</string>
@@ -49,20 +43,15 @@
   <string name="confirmpassword">Confirmar contrasenya </string>
   <string name="logout">Tancar sessió </string>
   <string name="logout_description">Tanca la sessió del teu compte</string>
-  <string name="account_details">Detalls del compte</string>
   <string name="LoginActivityName">Benvingut</string>
-  <string name="string_revive">Reviure</string>
-  <string name="please_connect">Si us plau connectat a través de la aplicació abans d\'utilitzar un widget</string>
   <string name="about.title">Informació</string>
   <string name="about.libraries">Biblioteca</string>
-  <string name="about.versionhistory">Historials de versions</string>
   <string name="about.habitica_open_source">Habitica està disponible com a software de codi obert en Github</string>
   <string name="about.rate_our_app">Califica la nostra aplicació</string>
   <string name="about.give_us_feedback">Envia\'ns els teus comentaris!</string>
   <string name="about.bugreport">Notificar un error</string>
   <string name="about.source_code">Codi font</string>
   <!--Network Errors-->
-  <string name="network_error_title">Error de connexió </string>
   <string name="network_error_no_network_body">No estàs connectat a internet.</string>
   <string name="internal_error_api">Sembla que hi ha un problema amb el servidor. Torna-ho a intentar més tard.</string>
   <string name="authentication_error_title">Error d\'autenticació 
@@ -73,7 +62,6 @@
   <string name="save_changes">Guardar</string>
   <string name="copy">Copiar</string>
   <string name="notes">Notes</string>
-  <string name="text">Text</string>
   <string name="difficulty">Dificultat</string>
   <string name="tags">Etiquetes</string>
   <string name="trivial">Trivial</string>
@@ -85,11 +73,7 @@
   <string name="negative_habit_form">Negatiu ( - )</string>
   <string name="checklist">Llistat</string>
   <string name="reminders">Recordatoris</string>
-  <string name="actions">Accions</string>
   <string name="attributes">Atributs</string>
-  <string name="frequency">Freqüència </string>
-  <string name="frequency_weekly">Certs dies de la setmana</string>
-  <string name="frequency_daily">Cada X dies </string>
   <string name="monday">Dilluns</string>
   <string name="tuesday">Dimarts</string>
   <string name="wednesday">Dimecres</string>
@@ -97,23 +81,14 @@
   <string name="friday">Divendres</string>
   <string name="saturday">Dissabte</string>
   <string name="sunday">Diumenge </string>
-  <string name="levelup_button">Hurra!</string>
   <string name="faint_subtitle">No desesperis!</string>
   <string name="faint_header">T\'has quedat sense salut!</string>
   <string name="faint_button">Reomplir la salut i intentar un altre cop</string>
   <string name="filter">Filtrar</string>
-  <string name="profile_image">Imatge de perfil</string>
-  <string name="mana_price_button">%d PM</string>
-  <string name="used_skill">Has usat %1$s per %2$d de manà.</string>
   <string name="used_skill_without_mana">Has emprat %1$s.</string>
   <string name="new_checklist_item">Nou element de la llista</string>
-  <string name="add_checklist_item">Afegir</string>
   <string name="skill_progress_title">Utilitzant l\'habilitat</string>
-  <string name="coming_soon">Pròximament </string>
-  <string name="chat_flag_confirmation">Estàs segur que vols denunciar aquest missatge per incomplir les normes?</string>
-  <string name="flag_confirm">Marcar missatge</string>
   <string name="unlock_lvl_11">Es desbloqueja al nivell 11</string>
-  <string name="no_party_message">No estàs en un grup. Per unir-te a un grup, si us plau visita la pàgina web. </string>
   <string name="forgot_pw_btn">M\'he oblidat de la contrasenya </string>
   <string name="tavern.inn.checkOut">Reactiva les tasques diàries</string>
   <string name="tavern.inn.rest">Pausa les tasques diàries</string>
@@ -126,8 +101,6 @@
   <string name="dailies">Tasques diàries</string>
   <string name="todos">Tasques pendents</string>
   <string name="rewards">Recompenses </string>
-  <string name="taskform.delete.title">Estàs segur?</string>
-  <string name="taskform.delete.message">Segur que vols esborrar-ho?</string>
   <string name="yes">Sí</string>
   <string name="no">No</string>
   <string name="quest">Missió</string>
@@ -135,14 +108,12 @@
   <string name="avatar_hair">Cabell </string>
   <string name="avatar_shirt">Samarreta</string>
   <string name="avatar_skin">Pell</string>
-  <string name="avatar_ears">Orelles d\'animals</string>
   <string name="avatar_base">Base</string>
   <string name="avatar_color">Color</string>
   <string name="avatar_beard">Barba</string>
   <string name="avatar_mustache">Bigoti </string>
   <string name="avatar_flower">Flor</string>
   <string name="avatar_bangs">Serrells</string>
-  <string name="avatar_nothing">Res seleccionat</string>
   <string name="avatar_size">Mida</string>
   <string name="avatar_size_slim">Prim</string>
   <string name="avatar_size_broad">Ample</string>
@@ -157,21 +128,13 @@
   <string name="quest.begin">Començar Missió</string>
   <string name="quest.cancel">Cancel·lar Invitació </string>
   <string name="quest.abort">Avortar Missió</string>
-  <string name="quest.leave">Abandonar Missió</string>
-  <string name="quest.pending">Pendent</string>
-  <string name="quest.accepted">Acceptat</string>
-  <string name="quest.rejected">Rebutjat</string>
-  <string name="quest.participants">Participants</string>
   <string name="version_info">Versió %1$s (%2$d)</string>
   <string name="sidebar_help">Ajuda &amp; FAQ</string>
   <string name="complete_tutorial">D\'acord!</string>
   <string name="dismiss_tutorial">Recorda\'m altre cop</string>
   <string name="intro_3_description">No perdis de vista els teus objectius amb l\'ajuda dels teus amics. Doneu-vos suport mutu en la vida i en la batalla mentre milloreu junts!</string>
-  <string name="previous_button">Anterior</string>
   <string name="next_button">Següent</string>
   <string name="skip_button">Saltar </string>
-  <string name="setup_welcome_description">Benvingut a Habitica, on avançar en el joc millorarà la teva vida real! Mentre aconsegueixes objectius del món real, desbloquejaràs equipament, mascotes, missions i més.</string>
-  <string name="setup_welcome_title">Benvingut </string>
   <string name="setup_group_work">Feina</string>
   <string name="setup_group_exercise">Exercici </string>
   <string name="setup_group_school">Escola </string>
@@ -199,26 +162,18 @@
   <string name="setup_task_creativity_1">Estudiar fins a dominar la tècnica </string>
   <string name="setup_task_creativity_2">Treballar en projecte creatiu</string>
   <string name="setup_task_creativity_3">Acabar projecte creatiu</string>
-  <string name="gem.purchase.support">Vols ajudar-nos a mantenir Habitica funcionant? Pots donar suport als desenvolupadors comprant gemmes! \n\nLes Gemmes et permeten comprar articles addicionals pel teu compte, incloent: \n\n - Fantàstics vestits per el teu personatge\n - Increïbles fons\n - Divertides missions que et recompensen amb mascotes\n - L\'habilitat de canviar de classe abans del nivell 100\n\nMoltes gràcies per ajudar-nos a fer Habitica el millor possible. El teu suport significa molt per nosaltres!</string>
   <string name="my_guilds">Els meus Gremis</string>
   <string name="public_guilds">Gremis Publics</string>
   <string name="guild">Gremi</string>
   <string name="leave">Abandonar</string>
   <string name="join">Unir-se</string>
-  <string name="leader">Líder</string>
   <string name="gems">Gemmes</string>
-  <string name="send_pm">Envia PM</string>
-  <string name="flag">Marcar</string>
   <string name="delete">Eliminar</string>
   <string name="name">Nom</string>
   <string name="description">Descripció</string>
   <string name="privacy">Privacitat</string>
   <string name="write_message">Escriu Missatge</string>
-  <string name="post">Publica</string>
   <string name="guild_search_hint">Cercar Gremis</string>
-  <string name="todo_due">Caduca: %s</string>
-  <string name="daily_streak">ratxa actual: %d</string>
-  <string name="todo_has_duedate">La tasca te data de caducitat</string>
   <string name="battle_gear">Roba de batalla</string>
   <string name="costume">Vestit</string>
   <string name="outfit_head">Cap</string>
@@ -232,8 +187,6 @@
   <string name="wear_costume">Disfressa\'t</string>
   <string name="equipped">Equipat</string>
   <string name="quest_cancel_message">Estàs segur que vols cancel·lar aquesta missió? No es recuperarà cap invitació acceptada. El propietari de la Missió mantindrà el rotlle de la Missió.</string>
-  <string name="quest.invitation">Invitació a una missió</string>
-  <string name="quest.invitation.text">T\'han invitat a participar en una missió!</string>
   <string name="today">Avui</string>
   <string name="sidebar_items">Objectes</string>
   <string name="eggs">Ous</string>
@@ -245,12 +198,8 @@
   <string name="armoireEquipment">Has trobat una peça d\'equipament rar a l\'Armari: %s! Genial!</string>
   <string name="armoireFood">Rebusques a l\'Armari i trobes %1$s %2$s. Què fa això aquí?</string>
   <string name="armoireExp">Et baralles amb l\'Armari i ganes experiència. Va!</string>
-  <string name="armoireNotesFull">Obre l\'armari per rebre equipament especial, experiència o menjar! Peces d\'equipament restants: %d</string>
-  <string name="armoireLastItem">Has trobat l\'última peça d\'equipament rar a l\'armari encantat.</string>
-  <string name="armoireNotesEmpty">L\'armari tindrà equipament nou a la primera setmana de cada mes. Fins aleshores, segueix fent clic per experiència i menjar!</string>
   <string name="sell">Ven (%d Or)</string>
   <string name="hatch_with_potion">Eclosione-ho amb una poció</string>
-  <string name="feed_to_pet">Alimenta la mascota</string>
   <string name="hatch_egg">Eclosione-ho amb un ou</string>
   <string name="invite_party">Invitar grup</string>
   <string name="dialog_feeding">Alimenta el %s amb:</string>
@@ -274,7 +223,6 @@
   <string name="healer_description">Els curadors són resistents al dany, i extenen aquella protecció a altres. Les tasques diàries fallades i els mals hàbits no els molesten massa, i tenen maneres de recuperar salut del fracàs. Juga com a curador si gaudeixes ajudant a altres al teu grup, o si la idea de burlar la Mort amb treball dur t\'inspira!</string>
   <string name="select_class">Selecciona Classe</string>
   <string name="opt_out_class">No optar per res</string>
-  <string name="opt_out_description">No t\'identifiques amb cap classe? Vols escollir més tard? Pots no optar res - seràs un guerrer sense habilitats especials. Pots llegir sobre el sistema de classes més tard a la wiki i activar-les a qualsevol moment.</string>
   <string name="class_confirmation">Segur que vols ser un %s?</string>
   <string name="class_changed">Ara ets un %s!</string>
   <string name="class_changed_description">Tens un nou Equip de Batalla per defecte que pots canviar a Equipament.</string>
@@ -288,12 +236,9 @@
   <string name="invite_existing_users">Invita usuaris existents</string>
   <string name="send">Envia</string>
   <string name="invite">Invita amics</string>
-  <string name="invite_id_description">Si tens amics que ja utilitzen Habitica, invita\'ls amb la ID d\'usuari aquí.</string>
   <string name="invite_email_description">Si un amic es registra a Habitica a través del teu email, seran invitats a la teva colla automàticament!</string>
   <string name="add_invites">Afegir invitacions</string>
-  <string name="user_id">ID d\'usuari</string>
   <string name="email">Correu electrònic</string>
-  <string name="invite_users">Invita a la colla</string>
   <string name="share_using">Compartir ús</string>
   <string name="share_levelup">He arribat al nivell %d a Habitica millorant els meus hàbits de la vida real!</string>
   <string name="share_hatched">He fet sortir de l\'ou a una mascota %1$s %2$s  a Habitica completant les meves tasques de la vida real!</string>
@@ -301,42 +246,19 @@
   <string name="open_in_store">Obrir a la play store</string>
   <string name="change_class_confirmation">Estàs segur que vols canviar de classe? Això et costarà 3 gemmes.</string>
   <string name="change_class_equipment_warning">Advertència: Ja no podràs comprar més equip per a la classe %s.</string>
-  <string name="leaderMessage">Missatge de %1$s</string>
-  <string name="leaderName">Líder: %1$s</string>
   <string name="confirm">Confirmar</string>
   <string name="market">Mercat</string>
   <string name="timeTravelers">Viatgers del Temps</string>
   <string name="seasonalShop">Botiga Estacional</string>
   <string name="party_invite">Desbloquejar convidant a amics</string>
-  <string name="no_gold">No tens suficient or</string>
-  <string name="no_potion">No necessites comprar una poció de salut</string>
-  <string name="purchase_confirmation_title">Comfirmar compra</string>
-  <string name="confirm_purchase_text">Comprar %1$s per %2$s %3$s</string>
-  <string name="gem">gemma</string>
-  <string name="hourglass">rellotge de sorra</string>
-  <string name="hourglasses">rellotges de sorra</string>
-  <string name="gold_singular">or</string>
   <string name="gold_plural">or</string>
   <string name="chat_message_copied">Missatge copiat al porta-retalls</string>
-  <string name="copy_chat_message">Copiar al porta-retalls</string>
-  <string name="edit_tag_title">Modificar etiqueta</string>
   <string name="edit_tag_btn_edit">Editar</string>
-  <string name="edit_tag_btn_done">Fet</string>
-  <string name="edit_tag_btn_delete">Esborrar</string>
   <string name="confirm_delete_tag_title">Estàs segur?</string>
   <string name="confirm_delete_tag_message">Segur que vols esborrar-ho?</string>
-  <string name="filter_drawer_edit_tags">Modificar etiquetes</string>
-  <string name="filter_drawer_filter_tags">Filtrar per etiquetes</string>
   <!--QR Strings-->
-  <string name="qr_section_title">Fes que et convidin amb aquest codi QR</string>
-  <string name="qr_save_message">Codi QR guardat a</string>
-  <string name="qr_dialogue_title">El teu codi QR</string>
-  <string name="download">Descarrega</string>
-  <string name="send_new_message">Envia un nou missatge</string>
   <string name="choose_recipient_title">Escull el receptor del missatge</string>
   <string name="action_continue">Continua</string>
-  <string name="scan_qr_code">Escaneja el codi QR</string>
-  <string name="enter_recipient_uuid">Escriu l\'ID d\'usuari del receptor</string>
   <string name="invited_to_party">T\'han convidat a unir-te a una colla!</string>
   <string name="stats_widget_label">Estadístiques d\'Habitica</string>
   <string name="add_task">Afegir Tasca</string>
@@ -347,7 +269,6 @@
   <string name="all_dailies_completed">Has completat totes les teves tasques diàries. Ben fet!</string>
   <string name="widget_habit_button">Habitica Marca l\'Hàbit</string>
   <string name="widget_dailies">Habitica Tasques Diaries</string>
-  <string name="widget_add_task">Habitica Afegir Tasca</string>
   <string name="google_services_missing">No s\'han trobat els serveis de Google Play.</string>
   <string name="gem.purchase.toolbartitle">Comprar</string>
   <string name="gem.purchase.title">Comprar gemmes dóna suport als desenvolupadors i ajuda a que Habitica segueixi funcionant</string>
@@ -403,37 +324,23 @@
   <string name="twelve_months">12 mesos</string>
   <string name="subscribe_prompt_thanks">Estàs rebent aquests útils beneficis per haver-te subscrit:</string>
   <string name="subscription_status">Estat de la subscripció</string>
-  <string name="byLeader">per %s </string>
-  <string name="challenge_details">Detalls del Repte</string>
   <string name="challenge_leave_title">Abandonar Repte</string>
-  <string name="challenge_leave_text">Estàs segur que vols deixar el Repte \"%s\"?</string>
   <string name="my_challenges">Els meus Reptes</string>
-  <string name="public_challenges">Públic</string>
-  <string name="challenges">Reptes</string>
   <string name="daily">Tasca Diària</string>
   <string name="habit">Hàbit</string>
   <string name="reward">Recompensa</string>
   <string name="todo">Tasca Pendent</string>
   <string name="official">Oficial</string>
-  <string name="participating">Participant</string>
   <string name="challenge">Repte</string>
-  <string name="go_to_challenge">Ves al Repte</string>
   <string name="not_part_of_a_challenge">Ara mateix no formes part de cap Repte!</string>
   <string name="join_a_challenge">Uneix-te a un Repte per a afegir un selecte grup de tasques a la teva llista, i després competeix contra altres Habiticans per a guanyar fites i, fins i tot, gemmes!</string>
   <string name="check_the_public_challenge_tab">Ves a la pestanya \"Públic\" per a trobar els Reptes, creats per usuàris, que s\'adapten millor a tu!</string>
-  <string name="add_reminder">Afegeix un Recordatori</string>
-  <string name="warning">Advertència</string>
-  <string name="open_settings">Obre la Configuració</string>
-  <string name="dont_keep_activities_warning">Sembla que tens l\'opció de desenvolupador \\"No mantenir Activitats\\" activada. Actualment, aquesta opció causa problemes amb l\'applicació d\'habitica, així que et suggerim que la desactivis.</string>
-  <string name="FAQ">Preguntes Freqüents</string>
   <string name="special">Especial</string>
   <string name="gem_for_gold_description">Com que estàs subscrit a Habitica, pots comprar un cert nombre de Gemmes cada mes emprant Or.</string>
-  <string name="limited_count">queden %d</string>
   <string name="gem_shop">Gemma</string>
   <string name="mystery_item">Objecte Misteriós</string>
   <string name="myster_item_notes">Cada mes, els subscriptors rebràn un objecte misteriós. Normalment es publica una setmana abans de la fi del mes. </string>
   <string name="open">Obrir</string>
-  <string name="notification_mystery_item">Obres la capsa i hi trobes %s!</string>
   <string name="checkInRewardEarned">Has guanyat un/a %1$s com a recompensa per a la teva devoció per millorar la teva vida.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">El pròxim premi es desbloquejarà d\'aquí a %1$d inicis de sessió</string>
 </resources>
diff --git a/Habitica/res/values-cs/strings.profile.xml b/Habitica/res/values-cs/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-cs/strings.profile.xml
+++ b/Habitica/res/values-cs/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-cs/strings.sidebar.xml b/Habitica/res/values-cs/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-cs/strings.sidebar.xml
+++ b/Habitica/res/values-cs/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-cs/strings.tutorial.xml b/Habitica/res/values-cs/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-cs/strings.tutorial.xml
+++ b/Habitica/res/values-cs/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-cs/strings.xml b/Habitica/res/values-cs/strings.xml
index fcc2b7abd..057605c66 100755
--- a/Habitica/res/values-cs/strings.xml
+++ b/Habitica/res/values-cs/strings.xml
@@ -4,19 +4,15 @@
     <string name="XP_default">Zkušenosti</string>
     <string name="HP_default">Zdraví</string>
     <string name="MP_default">Mana</string>
-    <string name="ERR_pb_barcode">Preference nebylo možné načíst z čárového kódu.</string>
     <!--Prefs-->
     <string name="PS_settings_title">Nastavení</string>
-    <string name="SP_address_hint">Vlastní server</string>
     <string name="SP_userID_title">Uživatelské ID</string>
     <string name="SP_userID_summary">Tvoje uživatelské ID</string>
     <string name="SP_APIToken_title">API Token</string>
     <string name="SP_APIToken_summary">Tvůj API Token</string>
     <string name="Language_title">Jazyk</string>
     <string name="Language_summary">Změnit jazyk v Habitica</string>
-    <string name="SP_user_qr_code">Tvůj QR kód</string>
     <string name="PS_contact_title">Kontaktovat mě</string>
-    <string name="unknown_error">Došlo k chybě...</string>
     <string name="pref_account_header">Účet</string>
     <string name="pref_first_day_of_the_week_title">První den v týdnu</string>
     <string name="pref_first_day_of_the_week_summary">První den v týdnu ve všech kalendářích</string>
@@ -24,7 +20,6 @@
     <string name="pref_reminder_checkbox">Aktivovat připomínku</string>
     <string name="pref_reminder_picker">Nastavit čas připomínky</string>
     <string name="pref_cds_header">Vlastní začátek dne</string>
-    <string name="pref_cds_picker">Nastavit vlastní začátek dne</string>
     <string name="pref_push_notifications_checkbox">Uživatelské oznámení</string>
     <string name="push_notifications">Oznámen</string>
     <string name="push_notifications_sum">Nastav si notifikace</string>
@@ -37,13 +32,7 @@
     <string name="preference_push_your_quest_has_begun">Tvoje výprava začala</string>
     <string name="preference_push_invited_to_quest">Pozván na výpravu</string>
     <!--Adding tasks-->
-    <string name="task_value">Hodnota</string>
-    <string name="new_todo">Nový úkol</string>
-    <string name="new_reward">Nová odměna</string>
-    <string name="new_daily">Nový denní úkol</string>
-    <string name="new_habit">Nový zvyk</string>
     <string name="action_edit">Upravit</string>
-    <string name="action_delete">Smazat</string>
     <string name="action_cancel">Zrušit</string>
     <string name="login_btn">Přihlásit</string>
     <string name="register_btn">Registrovat</string>
@@ -54,21 +43,8 @@
     <string name="confirmpassword">Heslo ještě jednou</string>
     <string name="logout">Odhlásit</string>
     <string name="logout_description">Odhlásit se z tvého účtu</string>
-    <string name="account_details">Detaily účtu</string>
     <string name="LoginActivityName">Vítej</string>
-    <string name="string_revive">Oživit</string>
-    <string name="please_connect">Nejdříve se připoj v aplikaci, než použiješ widget.</string>
-    <string name="about.title">O nás</string>
-    <string name="about.libraries">Knihovny</string>
-    <string name="about.versionhistory">Historie verzí</string>
-    <string name="about.habitica_open_source">Habitica je dostupná jako open source software na Github</string>
-    <string name="about.rate_our_app">Ohodnoťte tuto aplikaci</string>
-    <string name="about.give_us_feedback">Napište nám svůj názor!</string>
-    <string name="about.bugreport">Ohlaste chybu</string>
-    <string name="about.source_code">Zdrojový kód</string>
-    <string name="repeatEvery">Opakovat každý</string>
     <!--Network Errors-->
-    <string name="network_error_title">Chyba připojení</string>
     <string name="network_error_no_network_body">Nejste připojeni k internetu.</string>
     <string name="internal_error_api">Bylo přerušeno spojení se serverem</string>
     <string name="authentication_error_title">Chyba přihlášení</string>
@@ -78,7 +54,6 @@
     <string name="save_changes">Uložit</string>
     <string name="copy">Zkopírovat</string>
     <string name="notes">Poznámky</string>
-    <string name="text">Text</string>
     <string name="difficulty">Obtížnost</string>
     <string name="tags">Štítky</string>
     <string name="trivial">Velmi lehké</string>
@@ -90,18 +65,7 @@
     <string name="negative_habit_form">Záporné ( - )</string>
     <string name="checklist">Seznam</string>
     <string name="reminders">Připomínky</string>
-    <string name="actions">Akce</string>
     <string name="attributes">Vlastnosti</string>
-    <string name="physical">Síla</string>
-    <string name="mental">Inteligence</string>
-    <string name="social">Obrana</string>
-    <string name="other">Vnímání</string>
-    <string name="frequency">Četnost</string>
-    <string name="frequency_weekly">Některé dny v týdnu</string>
-    <string name="frequency_daily">Každých X dní</string>
-    <string name="repeatables_summary_title">Shrnutí</string>
-    <string name="repeatables_title">Opakuje</string>
-    <string name="repeatables_on_title">Opakuje se</string>
     <string name="repeatables_frequency_daily">Denně</string>
     <string name="repeatables_frequency_weekly">Týdně</string>
     <string name="repeatables_frequency_monthly">Měsíčně</string>
@@ -115,30 +79,17 @@
     <string name="friday">Pátek</string>
     <string name="saturday">Sobota</string>
     <string name="sunday">Neděle</string>
-    <string name="levelup_button">Jupí!</string>
     <string name="faint_subtitle">Nezoufejte!</string>
     <string name="faint_penalty_body">Ztratil jsi úroveň, zlato a kousek vybavení, ale můžeš je získat zpět když se budeš dost snažit! Hodně štěstí--Ať se ti daří.</string>
     <string name="faint_header">Došlo ti zdraví!</string>
     <string name="faint_button">Doplnit zdraví &amp; a zkusit to znovu</string>
     <string name="filter">Filtr</string>
-    <string name="profile_image">Profilový obrázek</string>
-    <string name="mana_price_button">%d MP</string>
-    <string name="used_skill">Použil/a jsi %1$s za %2$d many.</string>
     <string name="used_skill_without_mana">použil jsi %1$s.</string>
     <string name="new_checklist_item">nová položka v seznamu</string>
-    <string name="add_checklist_item">Přidat</string>
     <string name="reminder_title">Nezapomeň si zkontrolovat svoje úkoly</string>
     <string name="skill_progress_title">Použití Dovednosti</string>
-    <string name="coming_soon">Již Brzy</string>
-    <string name="chat_flag_confirmation">Jste si jisti, že chcete nahlásit tuto zprávu pro porušení pravidel?</string>
-    <string name="flag_confirm">Nahlásit zprávu</string>
     <string name="unlock_lvl_11">Odemknutí na úrovni 11</string>
-    <string name="no_party_message">Nejsi ve skupině. Pro přidání se do skupiny, prosím, navštiv webovou stránku.</string>
     <string name="forgot_pw_btn">Zapomenuté heslo</string>
-    <string name="tavern.inn.checkOut">Odejít z hostince</string>
-    <string name="tavern.inn.rest">Odpočinout si od tvých povinností</string>
-    <string name="reward.dialog.buy">Koupit</string>
-    <string name="reward.dialog.dismiss">Opustit</string>
     <string name="party">Skupina</string>
     <string name="chat">Chat</string>
     <string name="members">Členové</string>
@@ -146,8 +97,6 @@
     <string name="dailies">Každodenní</string>
     <string name="todos">Úkoly</string>
     <string name="rewards">Odměny</string>
-    <string name="taskform.delete.title">Určitě?</string>
-    <string name="taskform.delete.message">Určitě smazat?</string>
     <string name="yes">Ano</string>
     <string name="no">Ne</string>
     <string name="quest">Skupinový cíl</string>
@@ -155,14 +104,12 @@
     <string name="avatar_hair">Vlasy</string>
     <string name="avatar_shirt">Svršek</string>
     <string name="avatar_skin">Kůže</string>
-    <string name="avatar_ears">Zvířecí uši</string>
     <string name="avatar_base">Zadní</string>
     <string name="avatar_color">Barva</string>
     <string name="avatar_beard">Vousy</string>
     <string name="avatar_mustache">Knír</string>
     <string name="avatar_flower">Květina</string>
     <string name="avatar_bangs">Přední</string>
-    <string name="avatar_nothing">Nic vybraného</string>
     <string name="avatar_size">Velikost</string>
     <string name="avatar_size_slim">Štíhlý</string>
     <string name="avatar_size_broad">Široký</string>
@@ -172,22 +119,11 @@
     <string name="purchase_button">Koupit</string>
     <string name="purchase_set_title">Koupit sadu %s</string>
     <string name="due_date">Termín do</string>
-    <string name="quest.accept">Příjmout</string>
-    <string name="quest.reject">Odmítnout</string>
-    <string name="quest.begin">Začít úkol</string>
-    <string name="quest.cancel">Zrušit pozvánku</string>
-    <string name="quest.abort">Vzdát úkol</string>
-    <string name="quest.leave">Opustit úkol</string>
-    <string name="quest.pending">Nevyřízené</string>
-    <string name="quest.accepted">Příjmuto</string>
-    <string name="quest.rejected">Odmítnuto</string>
-    <string name="quest.participants">Účastníci</string>
     <string name="version_info">Verze %1$s (%2$d)</string>
     <string name="sidebar_help">Pomoc &amp; FAQ</string>
     <string name="complete_tutorial">Rozumím!</string>
     <string name="dismiss_tutorial">Připomenout později</string>
     <string name="intro_1_subtitle">Vítej v</string>
-    <string name="intro_1_title">Habitica</string>
     <string name="intro_2_subtitle">Pokrok ve hře</string>
     <string name="intro_2_title">Pokrok v životě</string>
     <string name="intro_2_description">Odemkni herní prvky plněním svých reálných úkolů. Získej brnění, mazlíčky, a mnohem více jako odměny za dosažení svých cílů.</string>
@@ -195,11 +131,8 @@
     <string name="intro_3_title">Najdi nové přátele</string>
     <string name="intro_3_description">Mějte přehled o svých cílech s pomocí svých přátel. Podporujte se navzájem v životě i v boji a zlepšujte se společně!</string>
     <string name="intro_finish_button">Pojďme začít!</string>
-    <string name="previous_button">Předchozí</string>
     <string name="next_button">Další</string>
     <string name="skip_button">Přeskočit</string>
-    <string name="setup_welcome_description">Vítejte v Habitice, kde postup ve hře zlepší Váš život! Dosažením cílů v reálném světě odemykejte brnění, mazlíčky, skupinové cíle a mnohem víc.</string>
-    <string name="setup_welcome_title">Vítej</string>
     <string name="avatar_setup_description">Takže, jak by jsi chtěl vypadat? Neboj se, tohle můžeš později změnit.</string>
     <string name="task_setup_description">Skvělé! Teď, na čem máš zájem pracovat po celou tuto cestu?</string>
     <string name="setup_group_work">Práce</string>
@@ -230,28 +163,19 @@
     <string name="setup_task_creativity_1">Vypracovat předlohu</string>
     <string name="setup_task_creativity_2">Pracovat na kreativním projektu</string>
     <string name="setup_task_creativity_3">Dokončit kreativní projekt</string>
-    <string name="gem.purchase.support">Chceš pomoci udržet Habiticu v provozu? Můžeš podpořit vývojáře koupí drahokamů!\n\nDrahokamy ti umožňují kupovat zábavné doplňky, včetně: \n\n - Parádní kostýmy pro tvého avatara\n - Úžasná pozadí\n - Zábavné skupinové cíle, které tě odmění mazlíčky\n - Možnost změnit své zaměření před úrovní 100\n\nMockrát děkujeme, že pomáháte Habitice být co možná nejlepší. Tvá podpora pro nás hodně znamená!</string>
     <string name="my_guilds">Moje cechy</string>
     <string name="public_guilds">Veřejné cechy</string>
     <string name="guild">Cech</string>
     <string name="leave">Odejít</string>
     <string name="join">Připojit se</string>
-    <string name="leader">Vůdce</string>
     <string name="gems">Drahokamy</string>
-    <string name="copy_as_todo">Kopírovat jako Úkol</string>
-    <string name="send_pm">Poslat soukromou zprávu.</string>
-    <string name="flag">Vlajka</string>
     <string name="delete">Smazat</string>
     <string name="name">Jméno</string>
     <string name="description">Popis</string>
     <string name="add_tag">Přidat nový Štítek</string>
     <string name="privacy">Soukromí</string>
     <string name="write_message">Napsat zprávu</string>
-    <string name="post">Zveřejnit</string>
     <string name="guild_search_hint">Hledat gildy</string>
-    <string name="todo_due">Do: %s</string>
-    <string name="daily_streak">Momentální combo: %d</string>
-    <string name="todo_has_duedate">Úkol má termín </string>
     <string name="battle_gear">Zbroj</string>
     <string name="costume">Kostým</string>
     <string name="outfit_head">Hlava</string>
@@ -265,8 +189,6 @@
     <string name="wear_costume">Obléct si kostým</string>
     <string name="equipped">Nasazeno</string>
     <string name="quest_cancel_message">Jsi si jistý že chceš tento úkol zrušit? Všechy příjmuté žádosti budou ztraceny. Majitel úkolu si ponechá jeho svitek.</string>
-    <string name="quest.invitation">Pozvánka k úkolu</string>
-    <string name="quest.invitation.text">Byl jsi pozván k účasti v úkolu</string>
     <string name="ago_1day">Před 1 dnem</string>
     <string name="ago_1Minute">Před 1 minutou</string>
     <string name="ago_minutes">Před %dminutama</string>
@@ -283,12 +205,8 @@
     <string name="armoireEquipment">Našel jsi kousek vzácného vybavení v Airmoire: %s! Super!</string>
     <string name="armoireFood">Prohrabeš Armoire a nalézáš %1$s %2$s. Co to tu dělá?</string>
     <string name="armoireExp">Biješ se s Airmoire a získáváš zkušenosti. Vem si je!</string>
-    <string name="armoireNotesFull">Otevři Airmoire aby jsi dostal buď speciální vybavení, zkušenosti, nebo jídlo! Zbývá ti %d částí vybavení</string>
-    <string name="armoireLastItem">Našel jsi poslední kousek vzácného vybavení v čarovné Airmoire.</string>
-    <string name="armoireNotesEmpty">Airmoire bude mít každý první týden v měsíci nové vybavení. Do té doby, klikej a získávej zkušenosti a jídlo.</string>
     <string name="sell">Prodat (%dZlata)</string>
     <string name="hatch_with_potion">Vylíhnout pomocí lektvaru</string>
-    <string name="feed_to_pet">Nakrmit mazlíčka</string>
     <string name="hatch_egg">Vylíhnout s vejcem</string>
     <string name="invite_party">Pozvat skupinu</string>
     <string name="dialog_feeding">Nakrmit %s:</string>
@@ -299,16 +217,7 @@
     <string name="close">Zavřít</string>
     <string name="share">Sdílet</string>
     <string name="notification_pet_fed">Nakrmil jsi své zvíře %s</string>
-    <string name="notification_purchase">Koupil jsi %s</string>
     <string name="notification_purchase_reward">Koupil jsi odměnu</string>
-    <string name="sectionpets">Standardní</string>
-    <string name="sectionpremiumPets">Magický lektvar</string>
-    <string name="sectionquestPets">Výprava</string>
-    <string name="sectionspecialPets">Vzácný</string>
-    <string name="sectionmounts">Standardní</string>
-    <string name="sectionpremiumMounts">Magický lektvar</string>
-    <string name="sectionquestMounts">Výprava</string>
-    <string name="sectionspecialMounts">Vzácný</string>
     <string name="world_quest">Celosvětový úkol</string>
     <string name="inn_description">Potřebuješ pauzu? Přihlaš se do Danielovy krčmy pro pozastavení některých z těžších herních mechanismů Habitici:\n\n
 • Nesplněný denní úkol ti neublíží\n
@@ -327,7 +236,6 @@
     <string name="healer_description">Lékaři stojí proti poškození a přenáší jejich ochranu na ostatní. Vynechané denní úkoly a špatné návyky je nějak nevytrhnou a mají vždy možnosti jak si obnovit zdraví ze selhání. Hraj za lékaře když tě baví pomáhat ostatním ve tvé družině nebo tě myšlenka obelstění smrti pomocí těžké práce inspiruje!</string>
     <string name="select_class">Vybrat třìdu</string>
     <string name="opt_out_class">Neúčastnit se</string>
-    <string name="opt_out_description">Nemůžeš být obtěžovám povoláním? chceš si vybrat později? Neúčastni se - bude bojovní bez žádných speciálních schopností. Můžeš si přečíst s systému povolání pozdějí na wiki a zapnout systém povolání kdykoli chceš</string>
     <string name="class_confirmation">Opravdu chceš být %s?</string>
     <string name="class_changed">Nyní jsi %s!</string>
     <string name="class_changed_description">Máš novou výchozí Bojovou výzbroj, kterou si můžeš změnit ve Vybavení!</string>
@@ -342,12 +250,9 @@
     <string name="invite_existing_users">Pozvat existující uživatele</string>
     <string name="send">Odeslat</string>
     <string name="invite">Pozvat přátele</string>
-    <string name="invite_id_description">Jestli máš přátele kteří již používají Habiticu, pozvi je pomocí uživatelského ID zde.</string>
     <string name="invite_email_description">Když se přítel připojí k Habitice pomocí tvého e-mailu automaticky budou pozvání do tvé družiny!</string>
     <string name="add_invites">Přidat pozvánky</string>
-    <string name="user_id">Uživatelské ID</string>
     <string name="email">E-mail</string>
-    <string name="invite_users">Pozvat do družiny</string>
     <string name="share_using">Sdílet pomocí</string>
     <string name="share_levelup">Získal jsem úroveň %d v Habitice díky zlepšování mých zvyků v reálném životě!</string>
     <string name="share_hatched">Zrovna jsem vylíhl mazlíčka, %1$s %2$s , v Habitice pomocí dělání mých úkolů v reálném životě. </string>
@@ -355,8 +260,6 @@
     <string name="open_in_store">Otevřít v obchodě Play</string>
     <string name="change_class_confirmation">Jsi si jist, že chceš změnit povolání? Stojí to 3 diamanty.</string>
     <string name="change_class_equipment_warning">Varování: Nadále si nebudeš moct koupit výbavu z %s povolání.</string>
-    <string name="leaderMessage">Zpráva od %1$s</string>
-    <string name="leaderName">Vůdce: %1$s</string>
     <string name="confirm">Potvrdit</string>
     <string name="market">Obchod</string>
     <string name="timeTravelers">Cestovatelé časem</string>
@@ -365,36 +268,15 @@
     <string name="party_invite">Odemčít pomocí pozvání přátel</string>
     <string name="login_incentive">Odemkni pravidelným přihlašováním se do appky Habitica</string>
     <string name="create_account">Odemkni vytvořením účtu</string>
-    <string name="no_gold">Nemáš dostatek Zlata</string>
-    <string name="no_potion">Nepotřebuješ si koupit lektvar zdraví.</string>
     <string name="successful_purchase">Koupeno %1$s</string>
-    <string name="purchase_confirmation_title">Potvrdit koupi</string>
-    <string name="confirm_purchase_text">Koupit %1$s za %2$s %3$s</string>
-    <string name="gem">Diamant</string>
-    <string name="hourglass">Přesýpací hodiny</string>
-    <string name="hourglasses">Přesýpací hodiny</string>
-    <string name="gold_singular">Zlato</string>
     <string name="gold_plural">Zlato</string>
     <string name="chat_message_copied">Zpráva zkopírována do schránky</string>
-    <string name="copy_chat_message">Zkopírovat do schránky</string>
-    <string name="edit_tag_title">Upravit štítek</string>
     <string name="edit_tag_btn_edit">Upravit</string>
-    <string name="edit_tag_btn_done">Hotovo</string>
-    <string name="edit_tag_btn_delete">Smazat</string>
     <string name="confirm_delete_tag_title">Jsi si jist?</string>
     <string name="confirm_delete_tag_message">Opravdu to chceš vymazat?</string>
-    <string name="filter_drawer_edit_tags">Upravit štítky</string>
-    <string name="filter_drawer_filter_tags">Filtrovat pomocí štítků</string>
     <!--QR Strings-->
-    <string name="qr_section_title">Ať tě někdo pozve pomocí tohoto QR kódu</string>
-    <string name="qr_save_message">GR kód uložen v</string>
-    <string name="qr_dialogue_title">Tvůj QR kód</string>
-    <string name="download">Stáhnout</string>
-    <string name="send_new_message">Odeslat novou zprávu</string>
     <string name="choose_recipient_title">Vyber příjemce zprávy</string>
     <string name="action_continue">Pokračovat</string>
-    <string name="scan_qr_code">Skenovat QR kód</string>
-    <string name="enter_recipient_uuid">Zadej uživatelské ID příjemce</string>
     <string name="invited_to_party">Byl si pozván k družině!</string>
     <string name="stats_widget_label">Habitica statistiky</string>
     <string name="add_task">Přidat úkol</string>
@@ -406,7 +288,6 @@
     <string name="widget_habit_button">Habitica Zvyky</string>
     <string name="widget_dailies">Habitica Denní úkoly</string>
     <string name="widget_todo_list">Habitica Úkolníček</string>
-    <string name="widget_add_task">Habitica přidat úkol</string>
     <string name="google_services_missing">Služba Google play nebyla nalezena.</string>
     <string name="gem.purchase.toolbartitle">Koupit</string>
     <string name="gem.purchase.title">Zakoupením drahokamů podpoříš vývojáře a pomůžeš Habitice dál fungovat</string>
@@ -457,48 +338,33 @@
     <string name="twelve_months">12 měsíců</string>
     <string name="subscribe_prompt_thanks">Za předplatné obdržuješ tyto užitečné benefity:</string>
     <string name="subscription_status">Status předplatného</string>
-    <string name="byLeader">o %s</string>
-    <string name="challenge_details">Detaily výzvy</string>
     <string name="challenge_leave_title">Opustit výzvu</string>
-    <string name="challenge_leave_text">Jsi si jistý, že chceš opustit výzvu \"%s\"?</string>
-    <string name="challenge_remove_tasks_title">Odstranit úkoly</string>
-    <string name="challenge_remove_tasks_text">Chceš odstranit úkoly?</string>
     <string name="remove_tasks">Odstranit</string>
     <string name="keep_tasks">Ponechat</string>
     <string name="my_challenges">Moje výzvy</string>
-    <string name="public_challenges">Veřejné</string>
-    <string name="challenges">Výzvy</string>
     <string name="daily">Denně</string>
     <string name="habit">Zvyk</string>
     <string name="reward">Odměna</string>
     <string name="todo">Úkol</string>
     <string name="official">Oficiální</string>
-    <string name="participating">Účastnící se</string>
     <string name="challenge">Výzva</string>
-    <string name="warning">Varování</string>
     <string name="inbox">Zprávy</string>
-    <string name="FAQ">Často kladené otázky</string>
     <string name="special">Speciální</string>
     <string name="gem_for_gold_description">Protože si předplácíš program Habitica, tak můžeš koupit několik drahokamů každý měsíc za zlaťáky.</string>
-    <string name="limited_count">%d zbývá</string>
     <string name="gem_shop">Drahokam</string>
     <string name="mystery_item">Záhadný předmět</string>
     <string name="myster_item_notes">Každý měsíc předplatitelé získají záhadný předmět. Ten je obvykle vypuštěn kolem posledního týdne v měsíci.</string>
     <string name="open">Otevřít</string>
-    <string name="notification_mystery_item">Otevřel jsi krabici a našel jsi %s!</string>
     <string name="checkInRewardEarned">Získal jsi %1$s jako odměnu za tvoje odhodlání zlepšit si svůj život.</string>
     <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Tvá další odměna se odemkne za %1$d přihlášení</string>
     <string name="pending_approval">čeká na schválení</string>
     <string name="filters">Filtry</string>
     <string name="done">Hotovo</string>
-    <string name="group_tasks_edit_description">Skupinové úkoly nemohou být upravovány.</string>
-    <string name="group_tasks_edit_title">Nemůžeš upravit tento úkol</string>
     <string name="groups">Skupiny</string>
     <string name="all">Všechny</string>
     <string name="none">Žádné</string>
     <string name="owned">Vlastněno</string>
     <string name="not_owned">Nevlastněno</string>
-    <string name="new_game">Nová\nHra</string>
     <string name="login_btn_fb">Přihlásit se pomocí Facebooku</string>
     <string name="login_btn_google">Přihlásit se pomocí Google</string>
     <string name="action_back">Zpět</string>
@@ -561,6 +427,6 @@
     <string name="subscribe1month_gemcap">Limit 25 drahokamů</string>
     <string name="subscribe_listitem5_description">Objev ještě více předmětů v Habitica s 2x větším denním limitem na kořist.</string>
     <string name="subscribe_listitem4_description">Získáš královského fialového Zajdalena jako mazlíčka, jakmile se staneš novým/ou předplatitelem/kou.</string>
-    <string name="subscribe_listitem3_description_new">Staň se předplatitelem/kou nyní a získej tuto sadu: %@, a každý měsíc obdržíš nové předměty!</string>
+    <string name="subscribe_listitem3_description_new">Staň se předplatitelem/kou nyní a získej tuto sadu: %s, a každý měsíc obdržíš nové předměty!</string>
     <string name="subscribe_listitem3_description">Staň se předplatitelem/kou nyní a získej exkluzivní sadu a každý měsíc obdržíš nové předměty!</string>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-da/strings.profile.xml b/Habitica/res/values-da/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-da/strings.profile.xml
+++ b/Habitica/res/values-da/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-da/strings.sidebar.xml b/Habitica/res/values-da/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-da/strings.sidebar.xml
+++ b/Habitica/res/values-da/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-da/strings.tutorial.xml b/Habitica/res/values-da/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-da/strings.tutorial.xml
+++ b/Habitica/res/values-da/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-da/strings.xml b/Habitica/res/values-da/strings.xml
index c3d630f32..50ac70be5 100755
--- a/Habitica/res/values-da/strings.xml
+++ b/Habitica/res/values-da/strings.xml
@@ -1,402 +1,281 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="action_refresh">Opdater</string>
-    <string name="XP_default">Erfaring</string>
-    <string name="HP_default">Liv</string>
-    <string name="MP_default">Mana</string>
-    <!--Prefs-->
-    <string name="PS_settings_title">Indstillinger</string>
-    <string name="SP_userID_title">Bruger ID</string>
-    <string name="SP_userID_summary">Dit Bruger ID</string>
-    <string name="SP_APIToken_title">API Nøgle</string>
-    <string name="SP_APIToken_summary">Din API Nøgle</string>
-    <string name="Language_title">Sprog</string>
-    <string name="Language_summary">Skift Habiticas sprog</string>
-    <string name="SP_user_qr_code">Din QR Kode</string>
-    <string name="PS_contact_title">Kontakt mig</string>
-    <string name="unknown_error">Der opstod en fejl...</string>
-    <string name="pref_account_header">Konto</string>
-    <string name="pref_first_day_of_the_week_title">Første dag af ugen</string>
-    <string name="pref_first_day_of_the_week_summary">Første dag af ugen i alle kalendere</string>
-    <string name="pref_reminder_header">Daglig Påmindelse</string>
-    <string name="pref_reminder_checkbox">Aktiver Påmindelser</string>
-    <string name="pref_reminder_picker">Sæt Påmidelses Tid</string>
-    <string name="pref_cds_header">Brugerdefineret Dagstart</string>
-    <string name="pref_cds_picker">Sæt Brugerdefineret Dagstart</string>
-    <string name="pref_push_notifications_checkbox">Brug push-notifikationer</string>
-    <string name="push_notifications">Push-Notifikationer</string>
-    <string name="push_notifications_sum">Ændre dine push-notifikationer indstillinger</string>
-    <string name="preference_push_you_won_challenge">Du vandt en udfordring!</string>
-    <string name="preference_push_received_a_private_message">Modtog en Privatbesked</string>
-    <string name="preference_push_gifted_gems">Ædelstensgave</string>
-    <string name="preference_push_gifted_subscription">Abonnementsgave</string>
-    <string name="preference_push_invited_to_party">Inviteret til Gruppe</string>
-    <string name="preference_push_invited_to_guild">Inviteret til Klan</string>
-    <string name="preference_push_your_quest_has_begun">Din quest er startet</string>
-    <string name="preference_push_invited_to_quest">Inviteret til Quest</string>
-    <!--Adding tasks-->
-    <string name="task_value">Værdi</string>
-    <string name="new_todo">Ny To Do</string>
-    <string name="new_reward">Ny Belønning</string>
-    <string name="new_daily">Ny Daglig Opgave</string>
-    <string name="new_habit">Ny Vane</string>
-    <string name="action_edit">Ret</string>
-    <string name="action_delete">Slet</string>
-    <string name="action_cancel">Afbryd</string>
-    <string name="login_btn">Log ind</string>
-    <string name="register_btn">Registrer</string>
-    <string name="username">Brugernavn</string>
-    <string name="email_username">Email eller Brugernavn</string>
-    <string name="password">Kodeord</string>
-    <string name="emailAddress">Email adresse</string>
-    <string name="confirmpassword">Bekræft kodeord</string>
-    <string name="logout">Log ud</string>
-    <string name="logout_description">Log ud af din konto</string>
-    <string name="account_details">Konto Detaljer</string>
-    <string name="LoginActivityName">Velkommen</string>
-    <string name="string_revive">Genopliv</string>
-    <string name="please_connect">Forbind venligst gennem applikationen før du bruger en widget</string>
-    <string name="about.title">Om</string>
-    <string name="about.libraries">Biblioteker</string>
-    <string name="about.versionhistory">Udgave Historie</string>
-    <string name="about.habitica_open_source">Habitica er tilgængelig som open source software på GitHub</string>
-    <string name="about.rate_our_app">Bedøm vores App</string>
-    <string name="about.give_us_feedback">Send us Feedback!</string>
-    <string name="about.bugreport">Rapportér en fejl</string>
-    <string name="about.source_code">Kilde Kode</string>
-    <string name="repeatEvery">Gentag Hver</string>
-    <!--Network Errors-->
-    <string name="network_error_title">Forbindelsesfejl</string>
-    <string name="network_error_no_network_body">Du er ikke forbundet til internettet.</string>
-    <string name="internal_error_api">Der er problemer med serveren. Prøv igen senere.</string>
-    <string name="authentication_error_title">Godkendelsesfejl</string>
-    <string name="authentication_error_body">Dit Brugernavn og/eller Kodeord var forkert.</string>
-    <string name="login_validation_error_title">Bekræftigelsesfejl</string>
-    <string name="login_validation_error_fieldsmissing">Du skal udfylde alle felter.</string>
-    <string name="save_changes">Gem</string>
-    <string name="copy">Kopier</string>
-    <string name="notes">Noter</string>
-    <string name="text">Tekst</string>
-    <string name="difficulty">Sværhedsgrad</string>
-    <string name="tags">Tags</string>
-    <string name="trivial">Triviel</string>
-    <string name="easy">Let</string>
-    <string name="medium">Medium</string>
-    <string name="hard">Hård</string>
-    <string name="start_date">Start Dato</string>
-    <string name="positive_habit_form">Positiv ( + )</string>
-    <string name="negative_habit_form">Negativ ( - )</string>
-    <string name="checklist">Tjekliste</string>
-    <string name="reminders">Påmindelser</string>
-    <string name="actions">Handlinger</string>
-    <string name="attributes">Attributter</string>
-    <string name="frequency">Frekvens</string>
-    <string name="frequency_weekly">På specifikke ugedage</string>
-    <string name="frequency_daily">Hver X dage</string>
-    <string name="repeatables_summary_title">Resumé</string>
-    <string name="repeatables_title">Gentagelser</string>
-    <string name="repeatables_on_title">Gentages På</string>
-    <string name="repeatables_frequency_daily">Daglig</string>
-    <string name="repeatables_frequency_weekly">Ugentlig</string>
-    <string name="repeatables_frequency_monthly">Månedlig</string>
-    <string name="repeatables_frequency_yearly">Årlig</string>
-    <string name="repeatables_frequency_day_of_month">Dag i Måneden</string>
-    <string name="repeatables_frequency_day_of_week">Ugedag</string>
-    <string name="monday">Mandag</string>
-    <string name="tuesday">Tirsdag</string>
-    <string name="wednesday">Onsdag</string>
-    <string name="thursday">Torsdag</string>
-    <string name="friday">Fredag</string>
-    <string name="saturday">Lørdag</string>
-    <string name="sunday">Søndag</string>
-    <string name="levelup_button">Hurra!</string>
-    <string name="faint_subtitle">Frygt ikke!</string>
-    <string name="faint_header">Du løb tør for liv!</string>
-    <string name="faint_button">Genfyld Liv &amp; Prøv igen</string>
-    <string name="filter">Filter</string>
-    <string name="profile_image">Profil Billede</string>
-    <string name="mana_price_button">%d MP</string>
-    <string name="used_skill">Du har brugt %1$s til %2$d mana.</string>
-    <string name="used_skill_without_mana">Du har brugt %1$s.</string>
-    <string name="new_checklist_item">nyt tjekliste punkt</string>
-    <string name="add_checklist_item">Tilføj</string>
-    <string name="skill_progress_title">Brug Evne</string>
-    <string name="coming_soon">Kommer Snart</string>
-    <string name="chat_flag_confirmation">Er du sikker på, at du vil rapporterer denne overtrædelse?</string>
-    <string name="flag_confirm">Anmeld Besked</string>
-    <string name="unlock_lvl_11">Låses op for ved niv. 11</string>
-    <string name="no_party_message">Du er ikke i en gruppe. For at blive medlem af en gruppe, gå venligst til hjemmesiden.</string>
-    <string name="forgot_pw_btn">Glemt kodeord</string>
-    <string name="tavern.inn.checkOut">Genaktiver dine Daglige</string>
-    <string name="tavern.inn.rest">Sæt dine Daglige på pause</string>
-    <string name="reward.dialog.buy">Køb</string>
-    <string name="reward.dialog.dismiss">Afsked</string>
-    <string name="party">Gruppe</string>
-    <string name="chat">Chat</string>
-    <string name="members">Medlemmer</string>
-    <string name="habits">Vaner</string>
-    <string name="dailies">Daglige</string>
-    <string name="todos">To Do\'s</string>
-    <string name="rewards">Belønninger</string>
-    <string name="taskform.delete.title">Er du sikker?</string>
-    <string name="taskform.delete.message">Vil du virkelig slette?</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nej</string>
-    <string name="quest">Quest</string>
-    <string name="avatar_body">Krop</string>
-    <string name="avatar_hair">Hår</string>
-    <string name="avatar_shirt">Trøje</string>
-    <string name="avatar_skin">Hud</string>
-    <string name="avatar_ears">Dyre-øre</string>
-    <string name="avatar_base">Base</string>
-    <string name="avatar_color">Farve</string>
-    <string name="avatar_beard">Skæg</string>
-    <string name="avatar_mustache">Overskæg</string>
-    <string name="avatar_flower">Blomst</string>
-    <string name="avatar_bangs">Pandehår</string>
-    <string name="avatar_nothing">Intet sæt</string>
-    <string name="avatar_size">Størrelse</string>
-    <string name="avatar_size_slim">Tynd</string>
-    <string name="avatar_size_broad">Bred</string>
-    <string name="avatar_background">Baggrund</string>
-    <string name="purchase_customization">Køb Brugerdefinering</string>
-    <string name="purchase_set_button">Lås op for sættet for %d Ædelsten</string>
-    <string name="purchase_button">Køb</string>
-    <string name="purchase_set_title">Køb sæt %s</string>
-    <string name="due_date">Forfaldsdato</string>
-    <string name="quest.accept">Accepter</string>
-    <string name="quest.reject">Afvis</string>
-    <string name="quest.begin">Start Quest</string>
-    <string name="quest.cancel">Aflys Invitation</string>
-    <string name="quest.abort">Afbryd Quest</string>
-    <string name="quest.leave">Forlad Quest</string>
-    <string name="quest.pending">Afventer</string>
-    <string name="quest.accepted">Accepteret</string>
-    <string name="quest.rejected">Afvist</string>
-    <string name="quest.participants">Deltagere</string>
-    <string name="version_info">Version %1$s (%2$d)</string>
-    <string name="sidebar_help">Hjælp &amp; OSS</string>
-    <string name="complete_tutorial">Forstået!</string>
-    <string name="dismiss_tutorial">Påmind mig igen</string>
-    <string name="intro_1_subtitle">Velkommen til</string>
-    <string name="intro_1_title">Habitica</string>
-    <string name="intro_2_subtitle">Fremskridt i spillet</string>
-    <string name="intro_2_title">Fremskridt i livet</string>
-    <string name="intro_finish_button">Lad os starte!</string>
-    <string name="previous_button">Tidligere</string>
-    <string name="next_button">Næste</string>
-    <string name="skip_button">Spring over</string>
-    <string name="setup_welcome_title">Velkommen</string>
-    <string name="setup_group_work">Arbejde</string>
-    <string name="setup_group_exercise">Motion</string>
-    <string name="setup_group_health">Liv</string>
-    <string name="setup_group_school">Skole</string>
-    <string name="setup_group_teams">Hold</string>
-    <string name="setup_group_chores">Pligter</string>
-    <string name="setup_group_creativity">Kreativitet</string>
-    <string name="setup_task_work_2">Mest vigtige opgave</string>
-    <string name="setup_task_work_3">Arbejdsprojekt</string>
-    <string name="setup_task_exercise_1">10 minutters konditionstræning</string>
-    <string name="setup_task_exercise_2">Udstrækning</string>
-    <string name="setup_task_exercise_3">Opret træningsprogram</string>
-    <string name="setup_task_healthWellness_1">Spis sundt / junk food</string>
-    <string name="setup_task_healthWellness_2">Brug tandtråd</string>
-    <string name="setup_task_healthWellness_3">Planlæg check-up</string>
-    <string name="setup_task_school_1">Studere/Udsætte</string>
-    <string name="setup_task_school_2">Lav lektier</string>
-    <string name="setup_task_chores_1">10 minutters rengøring</string>
-    <string name="setup_task_chores_2">Vask op</string>
-    <string name="setup_task_chores_3">Organiser skab</string>
-    <string name="setup_task_creativity_2">Arbejd på et kreativt projekt</string>
-    <string name="setup_task_creativity_3">Færdiggør et kreativt projekt</string>
-    <string name="my_guilds">Mine klaner</string>
-    <string name="public_guilds">Offentlige klaner</string>
-    <string name="guild">Klan</string>
-    <string name="leave">Forlad</string>
-    <string name="leader">Leder</string>
-    <string name="gems">Ædelsten</string>
-    <string name="send_pm">Send PM</string>
-    <string name="flag">Anmeld</string>
-    <string name="delete">Slet</string>
-    <string name="name">Navn</string>
-    <string name="description">Beskrivelse</string>
-    <string name="privacy">Privatliv</string>
-    <string name="write_message">Skriv besked</string>
-    <string name="guild_search_hint">Søg efter klaner</string>
-    <string name="todo_due">Due: %s</string>
-    <string name="daily_streak">nuværende stribe: %d</string>
-    <string name="todo_has_duedate">Opgaven har en forfaldsdato</string>
-    <string name="battle_gear">Kampudstyr</string>
-    <string name="costume">Kostume</string>
-    <string name="outfit_head">Hoved</string>
-    <string name="outfit_headAccessory">Hoved Udstyr</string>
-    <string name="outfit_armor">Rustning</string>
-    <string name="outfit_back">Ryg</string>
-    <string name="outfit_body">Krop</string>
-    <string name="outfit_shield">Sekundær hånd</string>
-    <string name="outfit_weapon">Sværdhånden</string>
-    <string name="wear_costume">Bær Kostume</string>
-    <string name="quest.invitation">Quest Invitation</string>
-    <string name="quest.invitation.text">Du er blevet inviteret til, at deltage i en quest!</string>
-    <string name="today">I dag</string>
-    <string name="sidebar_items">Ting</string>
-    <string name="eggs">Æg</string>
-    <string name="hatching_potions">Udrugningseliksir</string>
-    <string name="food">Mad</string>
-    <string name="quests">Quests</string>
-    <string name="pets">Kæledyr</string>
-    <string name="mounts">Ridedyr</string>
-    <string name="armoireEquipment">Du har fundet et stykke sjældent udstyr i Armoire: %s! Fedt!</string>
-    <string name="armoireFood">Du roder rundt i Armoire og finder %1$s %2$s. Hvad laver det her?</string>
-    <string name="armoireExp">Du kæmper med Armoire og får Erfaring. Tag den!</string>
-    <string name="sell">Sælg (%d Guld)</string>
-    <string name="hatch_with_potion">Udrug med eliksir</string>
-    <string name="hatch_egg">Udrug med æg</string>
-    <string name="invite_party">Inviter gruppe</string>
-    <string name="dialog_feeding">Foder %s med:</string>
-    <string name="use_animal">Brug</string>
-    <string name="feed">Foder</string>
-    <string name="hatch_with">Udrug kæledyr med %s</string>
-    <string name="hatched_pet_title">Du har udruget en/et %1$s %2$s!</string>
-    <string name="close">Luk</string>
-    <string name="share">Del</string>
-    <string name="notification_pet_fed">Du har fodret din %s!</string>
-    <string name="world_quest">Verdensquest</string>
-    <string name="empty_items">Du have ingen %s</string>
-    <string name="user_level">Niv. %d</string>
-    <string name="user_level_with_class">Niv. %1$d %2$s</string>
-    <string name="warrior">Kriger</string>
-    <string name="rogue">Slyngel</string>
-    <string name="mage">Magiker</string>
-    <string name="healer">Helbreder</string>
-    <string name="select_class">Vælg Klasse</string>
-    <string name="opt_out_class">Fravælg</string>
-    <string name="class_confirmation">Er du sikker på, at du vil være en %s?</string>
-    <string name="class_changed">Du er nu en %s!</string>
-    <string name="choose_class">Vælg Klasse</string>
-    <string name="dialog_go_back">Gå tilbage</string>
-    <string name="opt_out_confirmation">Er du sikker på, at du vil fravælge?</string>
-    <string name="change_class">Ændre din Klasse</string>
-    <string name="enable_class">Aktiver Klassesystem</string>
-    <string name="user_id">Bruger ID</string>
-    <string name="email">E-mail</string>
-    <string name="open_in_store">Åben i play store</string>
-    <string name="leaderMessage">Besked fra %1$s</string>
-    <string name="leaderName">Leder: %1$s</string>
-    <string name="confirm">Bekræft</string>
-    <string name="market">Marked</string>
-    <string name="timeTravelers">Tidsrejsende</string>
-    <string name="no_gold">Ikke nok Guld</string>
-    <string name="no_potion">Du behøver ikke at købe en en livseliksir</string>
-    <string name="gem">ædelsten</string>
-    <string name="hourglass">timeglas</string>
-    <string name="hourglasses">timeglas</string>
-    <string name="gold_singular">guld</string>
-    <string name="gold_plural">guld</string>
-    <string name="edit_tag_btn_edit">Ret</string>
-    <string name="edit_tag_btn_done">Færdig</string>
-    <string name="edit_tag_btn_delete">Slet</string>
-    <string name="confirm_delete_tag_title">Er du sikker?</string>
-    <string name="confirm_delete_tag_message">Vil du virkelig slette?</string>
-    <!--QR Strings-->
-    <string name="add_task">Tilføj Opgave</string>
-    <string name="add_habit">Tilføj Vane</string>
-    <string name="add_daily">Tilføj Daglig Opgave</string>
-    <string name="add_todo">Tilføj To Do</string>
-    <string name="add_reward">Tilføj Belønning</string>
-    <string name="widget_dailies">Habitica Daglige Opgaver</string>
-    <string name="widget_todo_list">Habitica To Do Liste</string>
-    <string name="widget_add_task">Habitica Tilføj Opgave</string>
-    <string name="gem.purchase.toolbartitle">Køb</string>
-    <!--Login Incentives-->
-    <string name="subscription_hourglasses">+%d Mystisk Timeglas</string>
-    <string name="payment_method">Betalingsmetode</string>
-    <string name="subscription">Abonnement</string>
-    <string name="active">Aktiv</string>
-    <string name="cancel_subscription">Annuller Abonnement</string>
-    <string name="current_hourclasses">Nuværende Mystiske Timeglas</string>
-    <string name="monthly_gem_cap">Månedlig ædelstensmaksimum</string>
-    <string name="inactive">Inaktiv</string>
-    <string name="one_month">1 Måned</string>
-    <string name="months">%d Måneder</string>
-    <string name="month">måned</string>
-    <string name="three_months">3 måneder</string>
-    <string name="six_months">6 måneder</string>
-    <string name="twelve_months">12 måneder</string>
-    <string name="subscribe_prompt_thanks">Du modtager følgende fordele for dit abonnement:</string>
-    <string name="subscription_status">Abonnement status</string>
-    <string name="challenge_details">Udfordrings-detaljer</string>
-    <string name="challenge_leave_title">Forlad Udfordring</string>
-    <string name="challenge_leave_text">Er du sikker på, at du vil forlade Udfordringen \"%s\"?</string>
-    <string name="my_challenges">Mine Udfordringer</string>
-    <string name="public_challenges">Offentlig</string>
-    <string name="challenges">Udfordringer</string>
-    <string name="daily">Daglig</string>
-    <string name="habit">Vane</string>
-    <string name="reward">Belønning</string>
-    <string name="todo">To Do</string>
-    <string name="official">Officiel</string>
-    <string name="participating">Deltager</string>
-    <string name="challenge">Udfordring</string>
-    <string name="go_to_challenge">Gå til Udfordring</string>
-    <string name="add_reminder">Tilføj påmindelse</string>
-    <string name="warning">Advarsel</string>
-    <string name="open_settings">Åben Indstillinger</string>
-    <string name="FAQ">Ofte Stillede Spørgsmål</string>
-    <string name="special">Special</string>
-    <string name="gem_for_gold_description">Fordi du abonnere på Habitica, kan du købe et antal Ædelsten hver måned ved at bruge Guld.</string>
-    <string name="limited_count">%d tilbage</string>
-    <string name="gem_shop">Ædelsten</string>
-    <string name="mystery_item">Mystisk Vare</string>
-    <string name="myster_item_notes">Hver måned modtager abonnenter en mystisk vare. Den er typisk frigivet ca. en uge før slutningen af måneden. </string>
-    <string name="open">Åben</string>
-    <string name="notification_mystery_item">Du åbner denne box og finder %s!</string>
-    <string name="checkInRewardEarned">Du har modtaget en/et %1$s som belønning for din hengivenhed til at forbedre dit liv.</string>
-    <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Din næste præmie vil åbne ved %1$d Check-ins</string>
-    <string name="pending_approval">afventer godkendelse</string>
-    <string name="group_tasks_edit_description">Gruppe opgave kan ikke redigeres.</string>
-    <string name="group_tasks_edit_title">Kan ikke redigere denne opgave</string>
-    <string name="remaining_1hour">1t tilbage</string>
-    <string name="remaining_1Minute">1m tilbage</string>
-    <string name="remaining_1day">1d tilbage</string>
-    <string name="remaining_1week">1 uge tilbage</string>
-    <string name="remaining_1month">1 måned tilbage</string>
-    <string name="ago_1hour">1t siden</string>
-    <string name="ago_1Minute">1m siden</string>
-    <string name="ago_1day">1d siden</string>
-    <string name="ago_1week">1u siden</string>
-    <string name="ago_1month">1 måned siden</string>
-    <string name="equipped">Er iført</string>
-    <string name="add_tag">Tilføj ny kategori</string>
-    <string name="join">Tilmeld</string>
-    <string name="setup_task_teams_3">Færdiggør team-projektet</string>
-    <string name="setup_task_teams_2">Opdater teamet om status</string>
-    <string name="setup_task_teams_1">Kontakt teamet</string>
-    <string name="setup_task_school_3">Lav lektier til skolen</string>
-    <string name="task_setup_description">Fantastisk! Nå, hvad er du interesseret i at arbejde på under denne rejse\?</string>
-    <string name="avatar_setup_description">Nå, hvordan vil du se ud\? Bare rolig, du kan ændre det senere.</string>
-    <string name="intro_3_description">Hold fokus på dine mål med hjælp fra vennerne. Støt hinanden i livet og i kampen, mens i forbedrer jer sammen!</string>
-    <string name="intro_3_title">Bliv social</string>
-    <string name="intro_3_subtitle">Bekæmp monstre</string>
-    <string name="intro_2_description">Lås nye muligheder i spillet op ved at klare opgaver i virkeligheden. Opnå brynjer, kæledyr og andet som belønning for at opnå dine mål.</string>
-    <string name="quest_reject">Afslå</string>
-    <string name="quest_accept">Accepter</string>
-    <string name="reward_dialog_dismiss">Afvis</string>
-    <string name="reward_dialog_buy">Køb</string>
-    <string name="tavern_inn_rest">Sæt dine Daglige på pause</string>
-    <string name="tavern_inn_checkOut">Genaktiver dine Daglige</string>
-    <string name="reminder_title">Husk at afkrydse dine opgaver</string>
-    <string name="faint_penalty_body">Du mistede et niveau, dit guld og et stykke udstyr, men du kan vinde det tilbage ved hårdt arbejde! Held og lykke - du vil klare det fantastisk.</string>
-    <string name="onwards">Fremad!</string>
-    <string name="levelup_detail">Ved at fuldføre opgaver i virkeligheden er du steget i niveau og er nu helt helbredt!</string>
-    <string name="levelup_header">Du har nået niveau %1$d!</string>
-    <string name="not_selected">Fravalgt</string>
-    <string name="selected">Valgt</string>
-    <string name="about_source_code">Kildekode</string>
-    <string name="about_bugreport">Rapporter en fejl</string>
-    <string name="about_give_us_feedback">Send os ris og ros!</string>
-    <string name="about_rate_our_app">Bedøm vores app</string>
-    <string name="about_habitica_open_source">Habitica er tilgængeligt som open source program på Github</string>
-    <string name="about_libraries">Biblioteker</string>
-    <string name="about_title">Om</string>
-</resources>
\ No newline at end of file
+  <string name="action_refresh">Opdater</string>
+  <string name="XP_default">Erfaring</string>
+  <string name="HP_default">Liv</string>
+  <string name="MP_default">Mana</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Indstillinger</string>
+  <string name="SP_userID_title">Bruger ID</string>
+  <string name="SP_userID_summary">Dit Bruger ID</string>
+  <string name="SP_APIToken_title">API Nøgle</string>
+  <string name="SP_APIToken_summary">Din API Nøgle</string>
+  <string name="Language_title">Sprog</string>
+  <string name="Language_summary">Skift Habiticas sprog</string>
+  <string name="PS_contact_title">Kontakt mig</string>
+  <string name="pref_account_header">Konto</string>
+  <string name="pref_first_day_of_the_week_title">Første dag af ugen</string>
+  <string name="pref_first_day_of_the_week_summary">Første dag af ugen i alle kalendere</string>
+  <string name="pref_reminder_header">Daglig Påmindelse</string>
+  <string name="pref_reminder_checkbox">Aktiver Påmindelser</string>
+  <string name="pref_reminder_picker">Sæt Påmidelses Tid</string>
+  <string name="pref_cds_header">Brugerdefineret Dagstart</string>
+  <string name="pref_push_notifications_checkbox">Bruger Push-Notifikationer</string>
+  <string name="push_notifications">Push-Notifikationer</string>
+  <string name="push_notifications_sum">Ændre dine push-notifikationer indstillinger</string>
+  <string name="preference_push_you_won_challenge">Du vandt en udfordring!</string>
+  <string name="preference_push_received_a_private_message">Modtog en Privatbesked</string>
+  <string name="preference_push_gifted_gems">Ædelstensgave</string>
+  <string name="preference_push_gifted_subscription">Abonnementsgave</string>
+  <string name="preference_push_invited_to_party">Inviteret til Gruppe</string>
+  <string name="preference_push_invited_to_guild">Inviteret til Klan</string>
+  <string name="preference_push_your_quest_has_begun">Din quest er startet</string>
+  <string name="preference_push_invited_to_quest">Inviteret til Quest</string>
+  <!--Adding tasks-->
+  <string name="action_edit">Ret</string>
+  <string name="action_cancel">Afbryd</string>
+  <string name="login_btn">Log ind</string>
+  <string name="register_btn">Registrer</string>
+  <string name="username">Brugernavn</string>
+  <string name="email_username">Email eller Brugernavn</string>
+  <string name="password">Kodeord</string>
+  <string name="emailAddress">Email adresse</string>
+  <string name="confirmpassword">Bekræft kodeord</string>
+  <string name="logout">Log ud</string>
+  <string name="logout_description">Log ud af din konto</string>
+  <string name="LoginActivityName">Velkommen</string>
+  <string name="about.title">Om</string>
+  <string name="about.libraries">Biblioteker</string>
+  <string name="about.habitica_open_source">Habitica er tilgængelig som open source software på GitHub</string>
+  <string name="about.rate_our_app">Bedøm vores App</string>
+  <string name="about.give_us_feedback">Send us Feedback!</string>
+  <string name="about.bugreport">Rapportér en fejl</string>
+  <string name="about.source_code">Kilde Kode</string>
+  <!--Network Errors-->
+  <string name="network_error_no_network_body">Du er ikke forbundet til internettet.</string>
+  <string name="internal_error_api">Der er problemer med serveren. Prøv igen senere.</string>
+  <string name="authentication_error_title">Godkendelsesfejl</string>
+  <string name="authentication_error_body">Dit Brugernavn og/eller Kodeord var forkert.</string>
+  <string name="login_validation_error_title">Bekræftigelsesfejl</string>
+  <string name="login_validation_error_fieldsmissing">Du skal udfylde alle felter.</string>
+  <string name="save_changes">Gem</string>
+  <string name="copy">Kopier</string>
+  <string name="notes">Noter</string>
+  <string name="difficulty">Sværhedsgrad</string>
+  <string name="tags">Tags</string>
+  <string name="trivial">Triviel</string>
+  <string name="easy">Let</string>
+  <string name="medium">Medium</string>
+  <string name="hard">Hård</string>
+  <string name="start_date">Start Dato</string>
+  <string name="positive_habit_form">Positiv ( + )</string>
+  <string name="negative_habit_form">Negativ ( - )</string>
+  <string name="checklist">Tjekliste</string>
+  <string name="reminders">Påmindelser</string>
+  <string name="attributes">Attributter</string>
+  <string name="repeatables_frequency_daily">Daglig</string>
+  <string name="repeatables_frequency_weekly">Ugentlig</string>
+  <string name="repeatables_frequency_monthly">Månedlig</string>
+  <string name="repeatables_frequency_yearly">Årlig</string>
+  <string name="repeatables_frequency_day_of_month">Dag i Måneden</string>
+  <string name="repeatables_frequency_day_of_week">Ugedag</string>
+  <string name="monday">Mandag</string>
+  <string name="tuesday">Tirsdag</string>
+  <string name="wednesday">Onsdag</string>
+  <string name="thursday">Torsdag</string>
+  <string name="friday">Fredag</string>
+  <string name="saturday">Lørdag</string>
+  <string name="sunday">Søndag</string>
+  <string name="faint_subtitle">Frygt ikke!</string>
+  <string name="faint_header">Du løb tør for liv!</string>
+  <string name="faint_button">Genfyld Liv &amp; Prøv igen</string>
+  <string name="filter">Filter</string>
+  <string name="used_skill_without_mana">Du har brugt %1$s.</string>
+  <string name="new_checklist_item">nyt tjekliste punkt</string>
+  <string name="skill_progress_title">Brug Evne</string>
+  <string name="unlock_lvl_11">Låses op for ved niv. 11</string>
+  <string name="forgot_pw_btn">Glemt kodeord</string>
+  <string name="tavern.inn.checkOut">Genaktiver dine Daglige</string>
+  <string name="tavern.inn.rest">Sæt dine Daglige på pause</string>
+  <string name="reward.dialog.buy">Køb</string>
+  <string name="reward.dialog.dismiss">Afsked</string>
+  <string name="party">Gruppe</string>
+  <string name="chat">Chat</string>
+  <string name="members">Medlemmer</string>
+  <string name="habits">Vaner</string>
+  <string name="dailies">Daglige</string>
+  <string name="todos">To Do\'s</string>
+  <string name="rewards">Belønninger</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nej</string>
+  <string name="quest">Quest</string>
+  <string name="avatar_body">Krop</string>
+  <string name="avatar_hair">Hår</string>
+  <string name="avatar_shirt">Trøje</string>
+  <string name="avatar_skin">Hud</string>
+  <string name="avatar_base">Base</string>
+  <string name="avatar_color">Farve</string>
+  <string name="avatar_beard">Skæg</string>
+  <string name="avatar_mustache">Overskæg</string>
+  <string name="avatar_flower">Blomst</string>
+  <string name="avatar_bangs">Pandehår</string>
+  <string name="avatar_size">Størrelse</string>
+  <string name="avatar_size_slim">Tynd</string>
+  <string name="avatar_size_broad">Bred</string>
+  <string name="avatar_background">Baggrund</string>
+  <string name="purchase_customization">Køb Brugerdefinering</string>
+  <string name="purchase_set_button">Lås op for sættet for %d Ædelsten</string>
+  <string name="purchase_button">Køb</string>
+  <string name="purchase_set_title">Køb sæt %s</string>
+  <string name="due_date">Forfaldsdato</string>
+  <string name="quest.accept">Accepter</string>
+  <string name="quest.reject">Afvis</string>
+  <string name="quest.begin">Start Quest</string>
+  <string name="quest.cancel">Aflys Invitation</string>
+  <string name="quest.abort">Afbryd Quest</string>
+  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="sidebar_help">Hjælp &amp; OSS</string>
+  <string name="complete_tutorial">Forstået!</string>
+  <string name="dismiss_tutorial">Påmind mig igen</string>
+  <string name="intro_1_subtitle">Velkommen til</string>
+  <string name="intro_2_subtitle">Fremskridt i spillet</string>
+  <string name="intro_2_title">Fremskridt i livet</string>
+  <string name="intro_finish_button">Lad os starte!</string>
+  <string name="next_button">Næste</string>
+  <string name="skip_button">Spring over</string>
+  <string name="setup_group_work">Arbejde</string>
+  <string name="setup_group_exercise">Motion</string>
+  <string name="setup_group_health">Liv</string>
+  <string name="setup_group_school">Skole</string>
+  <string name="setup_group_teams">Hold</string>
+  <string name="setup_group_chores">Pligter</string>
+  <string name="setup_group_creativity">Kreativitet</string>
+  <string name="setup_task_work_2">Mest vigtige opgave</string>
+  <string name="setup_task_work_3">Arbejdsprojekt</string>
+  <string name="setup_task_exercise_1">10 minutters konditionstræning</string>
+  <string name="setup_task_exercise_2">Udstrækning</string>
+  <string name="setup_task_exercise_3">Opret træningsprogram</string>
+  <string name="setup_task_healthWellness_1">Spis sundt / junk food</string>
+  <string name="setup_task_healthWellness_2">Brug tandtråd</string>
+  <string name="setup_task_healthWellness_3">Planlæg check-up</string>
+  <string name="setup_task_school_1">Studere/Udsætte</string>
+  <string name="setup_task_school_2">Lav lektier</string>
+  <string name="setup_task_chores_1">10 minutters rengøring</string>
+  <string name="setup_task_chores_2">Vask op</string>
+  <string name="setup_task_chores_3">Organiser skab</string>
+  <string name="setup_task_creativity_2">Arbejd på et kreativt projekt</string>
+  <string name="setup_task_creativity_3">Færdiggør et kreativt projekt</string>
+  <string name="my_guilds">Mine klaner</string>
+  <string name="public_guilds">Offentlige klaner</string>
+  <string name="guild">Klan</string>
+  <string name="leave">Forlad</string>
+  <string name="gems">Ædelsten</string>
+  <string name="delete">Slet</string>
+  <string name="name">Navn</string>
+  <string name="description">Beskrivelse</string>
+  <string name="privacy">Privatliv</string>
+  <string name="write_message">Skriv besked</string>
+  <string name="guild_search_hint">Søg efter klaner</string>
+  <string name="battle_gear">Kampudstyr</string>
+  <string name="costume">Kostume</string>
+  <string name="outfit_head">Hoved</string>
+  <string name="outfit_headAccessory">Hoved Udstyr</string>
+  <string name="outfit_armor">Rustning</string>
+  <string name="outfit_back">Ryg</string>
+  <string name="outfit_body">Krop</string>
+  <string name="outfit_shield">Skjold</string>
+  <string name="outfit_weapon">Våben</string>
+  <string name="wear_costume">Bær Kostume</string>
+  <string name="today">I dag</string>
+  <string name="sidebar_items">Ting</string>
+  <string name="eggs">Æg</string>
+  <string name="hatching_potions">Udrugningseliksir</string>
+  <string name="food">Mad</string>
+  <string name="quests">Quests</string>
+  <string name="pets">Kæledyr</string>
+  <string name="mounts">Ridedyr</string>
+  <string name="armoireEquipment">Du har fundet et stykke sjældent udstyr i Armoire: %s! Fedt!</string>
+  <string name="armoireFood">Du roder rundt i Armoire og finder %1$s %2$s. Hvad laver det her?</string>
+  <string name="armoireExp">Du kæmper med Armoire og får Erfaring. Tag den!</string>
+  <string name="sell">Sælg (%d Guld)</string>
+  <string name="hatch_with_potion">Udrug med eliksir</string>
+  <string name="hatch_egg">Udrug med æg</string>
+  <string name="invite_party">Inviter gruppe</string>
+  <string name="dialog_feeding">Foder %s med:</string>
+  <string name="use_animal">Brug</string>
+  <string name="feed">Foder</string>
+  <string name="hatch_with">Udrug kæledyr med %s</string>
+  <string name="hatched_pet_title">Du har udruget en/et %1$s %2$s!</string>
+  <string name="close">Luk</string>
+  <string name="share">Del</string>
+  <string name="notification_pet_fed">Du har fodret din %s!</string>
+  <string name="world_quest">Verdensquest</string>
+  <string name="empty_items">Du have ingen %s</string>
+  <string name="user_level">Niv. %d</string>
+  <string name="user_level_with_class">Niv. %1$d %2$s</string>
+  <string name="warrior">Kriger</string>
+  <string name="rogue">Slyngel</string>
+  <string name="mage">Magiker</string>
+  <string name="healer">Helbreder</string>
+  <string name="select_class">Vælg Klasse</string>
+  <string name="opt_out_class">Fravælg</string>
+  <string name="class_confirmation">Er du sikker på, at du vil være en %s?</string>
+  <string name="class_changed">Du er nu en %s!</string>
+  <string name="choose_class">Vælg Klasse</string>
+  <string name="dialog_go_back">Gå tilbage</string>
+  <string name="opt_out_confirmation">Er du sikker på, at du vil fravælge?</string>
+  <string name="change_class">Ændre din Klasse</string>
+  <string name="enable_class">Aktiver Klassesystem</string>
+  <string name="email">E-mail</string>
+  <string name="open_in_store">Åben i play store</string>
+  <string name="confirm">Bekræft</string>
+  <string name="market">Marked</string>
+  <string name="timeTravelers">Tidsrejsende</string>
+  <string name="gold_plural">guld</string>
+  <string name="edit_tag_btn_edit">Ret</string>
+  <string name="confirm_delete_tag_title">Er du sikker?</string>
+  <string name="confirm_delete_tag_message">Vil du virkelig slette?</string>
+  <!--QR Strings-->
+  <string name="add_task">Tilføj Opgave</string>
+  <string name="add_habit">Tilføj Vane</string>
+  <string name="add_daily">Tilføj Daglig Opgave</string>
+  <string name="add_todo">Tilføj To Do</string>
+  <string name="add_reward">Tilføj Belønning</string>
+  <string name="widget_dailies">Habitica Daglige Opgaver</string>
+  <string name="widget_todo_list">Habitica To Do Liste</string>
+  <string name="gem.purchase.toolbartitle">Køb</string>
+  <!--Login Incentives-->
+  <string name="subscription_hourglasses">+%d Mystisk Timeglas</string>
+  <string name="payment_method">Betalingsmetode</string>
+  <string name="subscription">Abonnement</string>
+  <string name="active">Aktiv</string>
+  <string name="cancel_subscription">Annuller Abonnement</string>
+  <string name="current_hourclasses">Nuværende Mystiske Timeglas</string>
+  <string name="monthly_gem_cap">Månedlig ædelstensmaksimum</string>
+  <string name="inactive">Inaktiv</string>
+  <string name="one_month">1 Måned</string>
+  <string name="months">%d Måneder</string>
+  <string name="month">måned</string>
+  <string name="three_months">3 måneder</string>
+  <string name="six_months">6 måneder</string>
+  <string name="twelve_months">12 måneder</string>
+  <string name="subscribe_prompt_thanks">Du modtager følgende fordele for dit abonnement:</string>
+  <string name="subscription_status">Abonnement status</string>
+  <string name="challenge_leave_title">Forlad Udfordring</string>
+  <string name="my_challenges">Mine Udfordringer</string>
+  <string name="daily">Daglig</string>
+  <string name="habit">Vane</string>
+  <string name="reward">Belønning</string>
+  <string name="todo">To Do</string>
+  <string name="official">Officiel</string>
+  <string name="challenge">Udfordring</string>
+  <string name="special">Special</string>
+  <string name="gem_for_gold_description">Fordi du abonnere på Habitica, kan du købe et antal Ædelsten hver måned ved at bruge Guld.</string>
+  <string name="gem_shop">Ædelsten</string>
+  <string name="mystery_item">Mystisk Vare</string>
+  <string name="myster_item_notes">Hver måned modtager abonnenter en mystisk vare. Den er typisk frigivet ca. en uge før slutningen af måneden. </string>
+  <string name="open">Åben</string>
+  <string name="checkInRewardEarned">Du har modtaget en/et %1$s som belønning for din hengivenhed til at forbedre dit liv.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Din næste præmie vil åbne ved %1$d Check-ins</string>
+  <string name="pending_approval">afventer godkendelse</string>
+</resources>
diff --git a/Habitica/res/values-de/strings.sidebar.xml b/Habitica/res/values-de/strings.sidebar.xml
index 7ae47f56f..038ec6013 100644
--- a/Habitica/res/values-de/strings.sidebar.xml
+++ b/Habitica/res/values-de/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Nachrichten</string>
     <string name="sidebar_tavern">Gasthaus</string>
     <string name="sidebar_party">Gruppe</string>
-    <string name="sidebar_purchaseGems">Edelsteine &amp; Abonnement</string>
     <string name="sidebar_guilds">Gilden</string>
     <string name="sidebar_challenges">Wettbewerbe</string>
     <string name="sidebar_section_inventory">Inventar</string>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index df23d1771..e343d6f17 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -369,9 +369,6 @@
     <string name="subscribe_prompt_thanks">Du erhälst diese Vorteile für Dein Abonnement</string>
     <string name="subscription_status">Abonnement Status</string>
     <string name="challenge_leave_title">Herausforderung abbrechen</string>
-    <string name="challenge_leave_text">Bist Du Dir sicher, dass Du die Herausforderung \"%s\" abbrechen willst\?</string>
-    <string name="challenge_remove_tasks_title">Aufgaben entfernen</string>
-    <string name="challenge_remove_tasks_text">Willst Du Deine Aufgaben wirklich entfernen\?</string>
     <string name="remove_tasks">Entfernen</string>
     <string name="keep_tasks">Behalten</string>
     <string name="my_challenges">Meine Herausforderungen</string>
@@ -664,8 +661,6 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="send_gift">Geschenk abschicken</string>
     <string name="server">Server</string>
     <string name="gift_confirmation_title">Dein Geschenk wurde verschickt!</string>
-    <string name="gift_confirmation_text_g1g1">Du hast %s ein %s-monatiges Abo für Habitica geschickt und das gleiche Abo wurde Deinem Konto gutgeschrieben dank unserer \"Verschenke ein Abo und erhalte eins gratis\"-Aktion!</string>
-    <string name="gift_confirmation_text">Du hast %s ein %s-monatiges Abo für Habitica geschickt.</string>
     <string name="discover">Entdecken</string>
     <string name="damage_paused">Schaden pausiert</string>
     <string name="preference_push_important_announcements">Wichtige Ankündigungen</string>
@@ -706,7 +701,6 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="network_error_no_network_body">Keine Internetverbindung.</string>
     <string name="quest_completed">Quest abgeschlossen!</string>
     <string name="not_participating">Du nimmst nicht teil</string>
-    <string name="unlock_level_short">Level %d</string>
     <string name="unlock_previous_short">Schließe Quest %d ab</string>
     <string name="unlock_level">Freischalten durch Erreichen des Levels %d</string>
     <string name="unlock_previous">Freischalten durch Abschluss der Quest %d</string>
diff --git a/Habitica/res/values-el/strings.profile.xml b/Habitica/res/values-el/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-el/strings.profile.xml
+++ b/Habitica/res/values-el/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-el/strings.sidebar.xml b/Habitica/res/values-el/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-el/strings.sidebar.xml
+++ b/Habitica/res/values-el/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-el/strings.tutorial.xml b/Habitica/res/values-el/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-el/strings.tutorial.xml
+++ b/Habitica/res/values-el/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-el/strings.xml b/Habitica/res/values-el/strings.xml
index e75875cbb..6a4823751 100755
--- a/Habitica/res/values-el/strings.xml
+++ b/Habitica/res/values-el/strings.xml
@@ -1,470 +1,375 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="action_refresh">Ανανέωση</string>
-    <string name="XP_default">Εμπειρία</string>
-    <string name="HP_default">Υγεία</string>
-    <string name="MP_default">Mana</string>
-    <!--Prefs-->
-    <string name="PS_settings_title">Ρυθμίσεις</string>
-    <string name="SP_address_hint">Ο προσαρμοσμένος server σας</string>
-    <string name="SP_userID_title">Ταυτότητα Χρήστη</string>
-    <string name="SP_userID_summary">Η Ταυτότητα Χρήστη σου</string>
-    <string name="SP_APIToken_title">API Token</string>
-    <string name="SP_APIToken_summary">Το API Token σου</string>
-    <string name="Language_title">Γλώσσα</string>
-    <string name="Language_summary">Άλλαξε τη γλώσσα του Habitica</string>
-    <string name="SP_user_qr_code">Ο QR Κωδικός σου</string>
-    <string name="PS_contact_title">Επικοινώνησε μαζί μου</string>
-    <string name="unknown_error">Προέκυψε ένα σφάλμα...</string>
-    <string name="pref_account_header">Λογαριασμός</string>
-    <string name="pref_first_day_of_the_week_title">Πρώτη Μέρα της Εβδομάδας</string>
-    <string name="pref_first_day_of_the_week_summary">Πρώτη Μέρα της Εβδομάδας σε όλα τα ημερολόγια</string>
-    <string name="pref_reminder_header">Ημερήσια Υπενθύμιση</string>
-    <string name="pref_reminder_checkbox">Ενεργοποίηση Υπενθύμισης</string>
-    <string name="pref_reminder_picker">Όρισε Ώρα Υπενθύμισης</string>
-    <string name="pref_cds_header">Προσαρμοσμένη Έναρξη Μέρας</string>
-    <string name="pref_cds_picker">Όρισε Προσαρμένη Ώρα Έναρξης Μέρας</string>
-    <string name="pref_push_notifications_checkbox">Ειδοποιήσεις Χρήστη</string>
-    <string name="push_notifications">Ειδοποιήσεις</string>
-    <string name="push_notifications_sum">Όρισε τις ρυθμίσεις ειδοποιήσεων</string>
-    <string name="preference_push_you_won_challenge">Κέρδισες μία Πρόκληση!</string>
-    <string name="preference_push_received_a_private_message">Έλαβες ένα Προσωπικό Μήνυμα</string>
-    <string name="preference_push_gifted_gems">Δωρισμένα Πετράδια</string>
-    <string name="preference_push_gifted_subscription">Δωρισμένη Συνδρομή</string>
-    <string name="preference_push_invited_to_party">Πρόσκληση σε Παρέα</string>
-    <string name="preference_push_invited_to_guild">Πρόσκληση σε Συντεχνία</string>
-    <string name="preference_push_your_quest_has_begun">Η Αποστολή σου ξεκίνησε</string>
-    <string name="preference_push_invited_to_quest">Πρόσκληση σε Αποστολή</string>
-    <!--Adding tasks-->
-    <string name="task_value">Αξία</string>
-    <string name="new_todo">Νέα Να-Κάνω</string>
-    <string name="new_reward">Νέα Ανταμοιβή</string>
-    <string name="new_daily">Νέα Ημερήσια</string>
-    <string name="new_habit">Νέα Συνήθεια</string>
-    <string name="action_edit">Επεξεργασία</string>
-    <string name="action_delete">Διαγραφή</string>
-    <string name="action_cancel">Ακύρωση</string>
-    <string name="login_btn">Είσοδος</string>
-    <string name="register_btn">Εγγραφή</string>
-    <string name="username">Όνομα Χρήστη</string>
-    <string name="email_username">Email ή Όνομα Χρήστη</string>
-    <string name="password">Κωδικός</string>
-    <string name="emailAddress">Διεύθυνση email</string>
-    <string name="confirmpassword">Επιβεβαίωσε τον κωδικό</string>
-    <string name="logout">Αποσύνδεση</string>
-    <string name="logout_description">Αποσυνδέσου από το λογαριασμό σου</string>
-    <string name="account_details">Στοιχεία Λογαριασμού</string>
-    <string name="LoginActivityName">Καλώς ήρθες</string>
-    <string name="string_revive">Αναγέννηση</string>
-    <string name="please_connect">Παρακαλώ συνδέσου μέσω της εφαρμογής πρωτού χρησιμοποιήσεις το widget</string>
-    <string name="about.title">Σχετικά</string>
-    <string name="about.libraries">Βιβλιοθήκες</string>
-    <string name="about.versionhistory">Ιστορικό έκδοσης</string>
-    <string name="about.habitica_open_source">Η Habitica είναι διαθέσιμη ως λογισμικό ανοικτού κώδικα στο Github</string>
-    <string name="about.rate_our_app">Βαθμολόγησε την εφαρμογή μας</string>
-    <string name="about.give_us_feedback">Στείλτε μας τα Σχόλιά σας!</string>
-    <string name="about.bugreport">Ανάφερε ένα σφάλμα</string>
-    <string name="about.source_code">Πηγαίος Κώδικας</string>
-    <string name="repeatEvery">Επανάληψη Κάθε</string>
-    <!--Network Errors-->
-    <string name="network_error_title">Σφάλμα Σύνδεσης</string>
-    <string name="network_error_no_network_body">Δεν είσαι συνδεδεμένος στο Διαδίκτυο.</string>
-    <string name="internal_error_api">Φαίνεται να υπάρχει πρόβλημα με τον διακομιστή. Προσπάθησε αργότερα.</string>
-    <string name="authentication_error_title">Σφάλμα Πιστοποίησης</string>
-    <string name="authentication_error_body">Το Όνομα Χρήστη ή/και ο Κωδικός είναι εσφαλμένα.</string>
-    <string name="login_validation_error_title">Σφάλμα Επικύρωσης</string>
-    <string name="login_validation_error_fieldsmissing">Πρέπει να γεμίσεις όλα τα πεδία.</string>
-    <string name="save_changes">Αποθήκευση</string>
-    <string name="copy">Αντιγραφή</string>
-    <string name="notes">Σημειώσεις</string>
-    <string name="text">Κείμενο</string>
-    <string name="difficulty">Δυσκολία</string>
-    <string name="tags">Ετικέτες</string>
-    <string name="trivial">Ασήμαντο</string>
-    <string name="easy">Εύκολο</string>
-    <string name="medium">Μέτριο</string>
-    <string name="hard">Δύσκολο</string>
-    <string name="start_date">Ημέρα Έναρξης</string>
-    <string name="positive_habit_form">Θετικό (+)</string>
-    <string name="negative_habit_form">Αρνητικό (-)</string>
-    <string name="checklist">Λίστα</string>
-    <string name="reminders">Υπενθυμίσεις</string>
-    <string name="actions">Δράσεις</string>
-    <string name="attributes">Χαρακτηριστικά</string>
-    <string name="physical">Ισχύς</string>
-    <string name="mental">Ευφυΐα</string>
-    <string name="social">Κράση</string>
-    <string name="other">Φρόνηση</string>
-    <string name="frequency">Συχνότητα</string>
-    <string name="frequency_weekly">Συγκεκριμένες Μέρες της Εβδομάδας</string>
-    <string name="frequency_daily">Κάθε Χ μέρες</string>
-    <string name="repeatables_summary_title">Σύνοψη</string>
-    <string name="repeatables_title">Επαναλήψεις</string>
-    <string name="repeatables_on_title">Επαναλαμβάνεται</string>
-    <string name="repeatables_frequency_daily">Ημερήσια</string>
-    <string name="repeatables_frequency_weekly">Εβδομαδιαία</string>
-    <string name="repeatables_frequency_monthly">Μηνιαία</string>
-    <string name="repeatables_frequency_yearly">Ετήσια</string>
-    <string name="repeatables_frequency_day_of_month">Μέρα του Μήνα</string>
-    <string name="repeatables_frequency_day_of_week">Μέρα της Εβδομάδας</string>
-    <string name="monday">Δευτέρα</string>
-    <string name="tuesday">Τρίτη</string>
-    <string name="wednesday">Τετάρτη</string>
-    <string name="thursday">Πέμπτη</string>
-    <string name="friday">Παρασκευή</string>
-    <string name="saturday">Σάββατο</string>
-    <string name="sunday">Κυριακή</string>
-    <string name="levelup_header">Έφτασες στο επίπεδο %1$d!</string>
-    <string name="levelup_button">Huzzah!</string>
-    <string name="faint_subtitle">Μην απελπίζεσαι!</string>
-    <string name="faint_header">Ξέμεινες από Ζωή!</string>
-    <string name="faint_button">Γέμισε Ζωή &amp; Προσπάθησε Ξανά</string>
-    <string name="filter">Φίλτρα</string>
-    <string name="profile_image">Εικόνα Προφίλ</string>
-    <string name="mana_price_button">%dΠΜ</string>
-    <string name="used_skill">Χρησιμοποίησες %1$s για %2$d πόντους μαγείας.</string>
-    <string name="used_skill_without_mana">Χρησιμοποίησες %1$s.</string>
-    <string name="new_checklist_item">νέο αντικείμενο λίστας</string>
-    <string name="add_checklist_item">Πρόσθεσε</string>
-    <string name="skill_progress_title">Ρίχνεις το Ξόρκι</string>
-    <string name="coming_soon">Έρχεται Σύντομα</string>
-    <string name="chat_flag_confirmation">Είσαι σίγουρος/η ότι θέλεις να αναφέρεις αυτό το μήνυμα για παραβίαση των όρων χρήσης;</string>
-    <string name="flag_confirm">Αναφορά Μηνύματος</string>
-    <string name="unlock_lvl_11">Στο επίπεδο 11</string>
-    <string name="no_party_message">Δεν ανήκεις σε μία παρέα. Για να μπεις σε μία, επισκέψου την ιστοσελίδα.</string>
-    <string name="forgot_pw_btn">Ξέχασα τον Κωδικό</string>
-    <string name="reward.dialog.buy">Αγοράζω</string>
-    <string name="reward.dialog.dismiss">Απόρριψη</string>
-    <string name="party">Ομάδα</string>
-    <string name="chat">Συνομιλία</string>
-    <string name="members">Μέλη</string>
-    <string name="habits">Συνήθειες</string>
-    <string name="rewards">Ανταμοιβές</string>
-    <string name="taskform.delete.title">Είσαι σίγουρος;</string>
-    <string name="taskform.delete.message">Θες πραγματικά να διαγραφείς?</string>
-    <string name="yes">Ναι</string>
-    <string name="no">Όχι</string>
-    <string name="quest">Αποστολή</string>
-    <string name="avatar_body">Σώμα</string>
-    <string name="avatar_hair">Μαλλιά</string>
-    <string name="avatar_shirt">Πουκάμισο</string>
-    <string name="avatar_skin">Δέρμα</string>
-    <string name="avatar_ears">Αυτιά ζώου</string>
-    <string name="avatar_base">Βάση</string>
-    <string name="avatar_color">Χρώμα</string>
-    <string name="avatar_beard">Γενειάδα</string>
-    <string name="avatar_mustache">Μουστάκι</string>
-    <string name="avatar_flower">Λουλούδι</string>
-    <string name="avatar_bangs">Αφέλειες</string>
-    <string name="avatar_nothing">Δεν έχει οριστεί</string>
-    <string name="avatar_size">Μέγεθος</string>
-    <string name="avatar_size_slim">Αδύνατος</string>
-    <string name="avatar_background">Φόντο</string>
-    <string name="purchase_set_button">Ξεκλείδωσε το σετ για %d πετράδια</string>
-    <string name="purchase_button">Αγορά</string>
-    <string name="purchase_set_title">Αγορά σετ %s</string>
-    <string name="due_date">Ημερομηνία λήξης</string>
-    <string name="quest.accept">Αποδοχή</string>
-    <string name="quest.reject">Απόρριψη</string>
-    <string name="quest.begin">Έναρξη Αποστολής</string>
-    <string name="quest.cancel">Ακύρωση Πρόσκλησης</string>
-    <string name="quest.abort">Διακοπή Αποστολής</string>
-    <string name="quest.leave">Έξοδος από την Αποστολή</string>
-    <string name="quest.participants">Συμμετέχοντες</string>
-    <string name="version_info">Έκδοση %1$s (%2$d)</string>
-    <string name="sidebar_help">Βοήθεια &amp;Συχνές Ερωτήσεις</string>
-    <string name="complete_tutorial">Κατάλαβα!</string>
-    <string name="dismiss_tutorial">Υπενθύμισε μου ξανά</string>
-    <string name="intro_1_subtitle">Καλωσόρισες στο</string>
-    <string name="intro_1_title">Habitica</string>
-    <string name="intro_2_subtitle">Πρόοδος στο παιχνίδι</string>
-    <string name="intro_2_title">Πρόοδος στη ζωή</string>
-    <string name="intro_2_description">Ξεκλείδωσε ενέργειες στο παιχνίδι με την ολοκλήρωση των πραγματικών σου υποχρεώσεων. Κέρδισε πανοπλίες, κατοικίδια, και πολλά άλλα σαν ανταμοιβή για την εκπλήρωση των στόχων σου.</string>
-    <string name="intro_3_subtitle">Πολέμησε τέρατα</string>
-    <string name="intro_3_title">Κοινωνικοποιήσου</string>
-    <string name="intro_finish_button">Ας αρχίσουμε!</string>
-    <string name="previous_button">Προηγούμενο</string>
-    <string name="next_button">Επόμενο</string>
-    <string name="skip_button">Παράκαμψε</string>
-    <string name="setup_welcome_title">Καλωσόρισες</string>
-    <string name="setup_group_work">Εργασία</string>
-    <string name="setup_group_exercise">Άσκηση</string>
-    <string name="setup_group_health">Υγεία</string>
-    <string name="setup_group_school">Σχολείο</string>
-    <string name="setup_group_teams">Ομάδες</string>
-    <string name="setup_group_chores">Αγγαρείες</string>
-    <string name="setup_group_creativity">Δημιουργικότητα</string>
-    <string name="setup_task_work_1">Έλεγχος των email</string>
-    <string name="setup_task_school_1">Διάβασμα/Αναβολή</string>
-    <string name="setup_task_chores_2">Πλύσιμο Πιάτων</string>
-    <string name="setup_task_chores_3">Οργάνωση ντουλάπας</string>
-    <string name="gem.purchase.support">Θες να μας βοηθήσεις να κρατήσουμε το Habitica ζωντανό? Μπορείς να υποστηρίξεις τους developers αγοράζοντας πετράδια!\n\nΜε τα πετράδια μπορείς να αγοράσεις διασκεδαστικά πράγματα για το λογαριασμό σου, όπως: \n\n - Ωραία κουστούμια για το avatar σου\n - Μαγευτικά φόντα\n - Διασκεδαστικές αποστολές που σε ανταμείβουν με αυγά κατοικίδιων\n - Τη δυνατότητα να αλλάξεις κλάση πριν το επίπεδο 100\n\nΣας ευχαριστούμε πολύ που μας βοηθάτε να κάνουμε το Habitica το καλλίτερο που μπορεί να γίνει. Η βοήθειά σας σημαίνει πολλά για εμάς!</string>
-    <string name="my_guilds">Οι Συντεχνίες μου</string>
-    <string name="public_guilds">Δημόσιες Συντεχνίες</string>
-    <string name="guild">Συντεχνία</string>
-    <string name="leave">Αποχώρηση</string>
-    <string name="leader">Αρχηγός</string>
-    <string name="gems">Πετράδια</string>
-    <string name="send_pm">Αποστολή ΠΜ</string>
-    <string name="flag">Σημαία</string>
-    <string name="delete">Διαγραφή</string>
-    <string name="name">Όνομα</string>
-    <string name="description">Περιγραφή</string>
-    <string name="add_tag">Προσθήκη νέας ετικέτας</string>
-    <string name="privacy">Ιδιωτικότητα</string>
-    <string name="write_message">Εγγραφή Μηνύματος</string>
-    <string name="post">Ανάρτηση</string>
-    <string name="guild_search_hint">Ψάξε για Συντεχνίες</string>
-    <string name="todo_due">Λήγει:%s</string>
-    <string name="daily_streak">τρέχον σερί: %d</string>
-    <string name="todo_has_duedate">Η Υποχρέωση έχει Ημερομηνία Λήξης</string>
-    <string name="battle_gear">Εξοπλισμός Μάχης</string>
-    <string name="costume">Κουστούμι</string>
-    <string name="outfit_head">Κεφάλι</string>
-    <string name="outfit_headAccessory">Εξάρτημα κεφαλής</string>
-    <string name="outfit_eyewear">Οπτικά είδη</string>
-    <string name="outfit_armor">Πανοπλία</string>
-    <string name="outfit_back">Πλάτη</string>
-    <string name="outfit_body">Σώμα</string>
-    <string name="outfit_shield">Ασπίδα</string>
-    <string name="outfit_weapon">Όπλο</string>
-    <string name="wear_costume">Εφαρμογή Κουστουμιού</string>
-    <string name="equipped">Φορεμένο</string>
-    <string name="quest.invitation">Πρόσκληση σε Αποστολή</string>
-    <string name="quest.invitation.text">Σας έχουν προσκαλέσει σε μια αποστολή!</string>
-    <string name="ago_1day">πριν 1 ημ</string>
-    <string name="ago_days">πριν %dημ</string>
-    <string name="ago_1Minute">πριν 1 μήνα</string>
-    <string name="ago_minutes">πριν %dμήνες</string>
-    <string name="ago_hours">πριν %d ώρα</string>
-    <string name="ago_1hour"> πριν 1 ώρα</string>
-    <string name="today">Σήμερα</string>
-    <string name="sidebar_items">Αντικείμενα</string>
-    <string name="eggs">Αυγά</string>
-    <string name="hatching_potions">Φίλτρα εκκόλαψης</string>
-    <string name="food">Φαγητό</string>
-    <string name="quests">Αποστολές</string>
-    <string name="pets">Κατοικίδια</string>
-    <string name="mounts">Yποζύγια</string>
-    <string name="sell">Πώληση (%d Χρυσό)</string>
-    <string name="hatch_with_potion">Εκκόλαψη με φίλτρο</string>
-    <string name="hatch_egg">Εκκόλαψη με αυγό</string>
-    <string name="invite_party">Πρόσκληση συντροφιάς</string>
-    <string name="dialog_feeding">Τάισε %s με:</string>
-    <string name="use_animal">Χρήση</string>
-    <string name="feed">Τάισε</string>
-    <string name="hatch_with">Εκκόλαψη κατοικίδιου με %s</string>
-    <string name="hatched_pet_title">Εκκόλαψες ένα %1$s %2$s!</string>
-    <string name="evolved_pet_title">Δάμασες το %s, πάμε μια βόλτα!</string>
-    <string name="close">Κλείσιμο</string>
-    <string name="share">Κοινοποίησε</string>
-    <string name="notification_pet_fed">Τάισες το %s σου!</string>
-    <string name="notification_purchase_reward">Αγόρασες μια ανταμοιβή</string>
-    <string name="empty_items">Δεν έχεις %s</string>
-    <string name="user_level">Επίπεδο %d</string>
-    <string name="user_level_with_class">Επίπεδο %1$d %2$s</string>
-    <string name="warrior">Πολεμιστής</string>
-    <string name="rogue">Αγύρτης</string>
-    <string name="mage">Μάγος</string>
-    <string name="healer">Θεραπευτής</string>
-    <string name="select_class">Επέλεξε Κλάση</string>
-    <string name="class_confirmation">Σίγουρα θέλεις να είσαι ένας %s?</string>
-    <string name="class_changed">Τώρα είσαι ένας %s!</string>
-    <string name="choose_class">Διάλεξε Κλάση</string>
-    <string name="dialog_go_back">Πίσω</string>
-    <string name="change_class">Άλλαξε την κλάση σου</string>
-    <string name="change_class_description">Άλλαξε την κλάση σου και ξαναμοίρασε τους πόντους στατιστικών σου για 3 πετράδια.</string>
-    <string name="changing_class_progress">Αλλαγή Κλάσης</string>
-    <string name="by_email">Μέσω Email</string>
-    <string name="invite_existing_users">Πρόσκληση Υπαρκτών Χρηστών</string>
-    <string name="send">Στείλε</string>
-    <string name="invite">Κάλεσε φίλους</string>
-    <string name="invite_username_description">Αν έχετε φίλους που παίζουν ήδη το Habitica, καλέστε τους με το όνομα χρήστη τους εδώ.</string>
-    <string name="invite_email_description">Αν κάποιος φίλος σου εγγραφεί στο Habitica μέσω του email σου, θα ενταχθεί αυτόματα στη συντροφιά σου!</string>
-    <string name="add_invites">Προσθήκη Προσκλήσεων</string>
-    <string name="user_id">Ταυτότητα Χρήστη</string>
-    <string name="email">Email</string>
-    <string name="invite_users">Προσκάλεσε στην παρέα</string>
-    <string name="share_using">Κοινή χρήση</string>
-    <string name="share_levelup">Έφτασα στο επίπεδο %d στο #Habitica βελτιώνοντας τις συνήθειες μου στην πραγματική ζωή!</string>
-    <string name="share_hatched">Μόλις απέκτησα ένα %1$s %2$s στο #Habitica με την ολοκλήρωση πραγματικών μου υποχρεώσεων!</string>
-    <string name="share_raised">Μόλις κέρδισα ένα υποζύγιο%s στο Habitica με την ολοκλήρωση πραγματικών μου υποχρεώσεων!</string>
-    <string name="open_in_store">Άνοιγμα στο play store</string>
-    <string name="leaderMessage">Μήνυμα από τον %1$s</string>
-    <string name="leaderName">Αρχηγός: %1$s</string>
-    <string name="confirm">Επιβεβαίωση</string>
-    <string name="market">Αγορά</string>
-    <string name="timeTravelers">Χρονοταξιδευτές</string>
-    <string name="seasonalShop">Εποχιακό Κατάστημα</string>
-    <string name="empty_inbox">Δεν έχεις μηνύματα. Μπορείς να στείλεις νέο μήνυμα σε ένα χρήστη από τα μηνύματα δημόσιας συνομιλίας του!</string>
-    <string name="login_incentive">Ξεκλειδώνει με το να εισέρχεσαι στο Habitica τακτικά</string>
-    <string name="create_account">Ξεκλειδώνει με τη δημιουργία λογαριασμού</string>
-    <string name="no_gold">Το χρυσό δεν επαρκεί</string>
-    <string name="no_potion">Δεν χρειάζεσαι φίλτρο υγείας</string>
-    <string name="successful_purchase">%1$s Αγοράστηκε</string>
-    <string name="purchase_confirmation_title">Επιβεβαίωση αγοράς</string>
-    <string name="confirm_purchase_text">Αγόρασε %1$s για %2$s %3$s</string>
-    <string name="gem">πετράδι</string>
-    <string name="hourglass">κλεψύδρα</string>
-    <string name="hourglasses">κλεψύδρες</string>
-    <string name="gold_singular">Χρυσάφι</string>
-    <string name="gold_plural">Χρυσάφι</string>
-    <string name="edit_tag_title">Επεξεργασία Ετικέτας</string>
-    <string name="edit_tag_btn_edit">Επεξεργασία</string>
-    <string name="edit_tag_btn_done">Ολοκληρώθηκε</string>
-    <string name="edit_tag_btn_delete">Διαγραφή</string>
-    <string name="confirm_delete_tag_title">Είσαι σίγουρος;</string>
-    <string name="confirm_delete_tag_message">Θες πραγματικά να διαγραφείς?</string>
-    <string name="filter_drawer_edit_tags">Επεξεργασία Ετικετών</string>
-    <string name="filter_drawer_filter_tags">Φίλτρο κατά Ετικέτα</string>
-    <!--QR Strings-->
-    <string name="qr_save_message">Ο κωδικός QR αποθηκεύτηκε στο</string>
-    <string name="qr_dialogue_title">Ο QR κωδικός σου</string>
-    <string name="download">Κατέβασε</string>
-    <string name="send_new_message">Στείλε καινούριο μήνυμα</string>
-    <string name="choose_recipient_title">Επέλεξε Παραλήπτη του Μηνύματος</string>
-    <string name="action_continue">Συνέχεια</string>
-    <string name="scan_qr_code">Σάρωση κωδικού QR</string>
-    <string name="stats_widget_label">Στατιστικά του Habitica</string>
-    <string name="add_task">Προσθήκη Υποχρέωσης</string>
-    <string name="add_habit">Προσθήκη Συνήθειας</string>
-    <string name="add_reward">Προσθήκη Ανταμοιβής</string>
-    <string name="widget_add_task">Habitica Πρόσθεσε Υποχρέωση</string>
-    <string name="google_services_missing">Οι υπηρεσίες Google play δεν βρέθηκαν.</string>
-    <string name="gem.purchase.toolbartitle">Αγορά</string>
-    <string name="gem.purchase.listitem3">Αποστολές που σε ανταμείβουν με αυγά κατοικίδιων</string>
-    <string name="open_market">Λαϊκή Αγορά</string>
-    <string name="AudioTheme_title">Θέμα Μουσικής</string>
-    <string name="AudioTheme_summary">Αλλαγή του Θέματος Μουσικής στο Habitica</string>
-    <!--Login Incentives-->
-    <string name="see_you_tomorrow">Τα λέμε αύριο!</string>
-    <string name="has_reminder">Έχει Υπενθύμιση</string>
-    <string name="has_tag">Έχει Ετικέτα</string>
-    <string name="subscribe.listitem1">Αγόρασε πετράδια με χρυσό</string>
-    <string name="subscriptions">Συνδρομές</string>
-    <string name="subscribe">Γίνε Συνδρομητής</string>
-    <string name="payment_method">Τρόπος πληρωμής</string>
-    <string name="subscription">Συνδρομή</string>
-    <string name="cancel_subscription">Ακύρωση Συνδρομής</string>
-    <string name="one_month">1 Μήνα</string>
-    <string name="months">%d Μήνες</string>
-    <string name="month">μήνας</string>
-    <string name="three_months">3 μήνες</string>
-    <string name="six_months">6 μήνες</string>
-    <string name="twelve_months">12 μήνες</string>
-    <string name="byLeader">κατά %s</string>
-    <string name="my_challenges">Οι Προκλήσεις μου</string>
-    <string name="public_challenges">Δημόσιο</string>
-    <string name="challenges">Προκλήσεις</string>
-    <string name="habit">Συνήθεια</string>
-    <string name="reward">Ανταμοιβή</string>
-    <string name="official">Επίσημο</string>
-    <string name="add_reminder">Προσθήκη Υπενθύμισης</string>
-    <string name="warning">Προειδοποίηση</string>
-    <string name="inbox">Μηνύματα</string>
-    <string name="FAQ">Συχνές Ερωτήσεις</string>
-    <string name="gem_shop">Πετράδι</string>
-    <string name="checkInRewardEarned">Κέρδισες ένα %1$s σαν ανταμοιβή για την αφοσίωση στη βελτίωση της ζωής σου.</string>
-    <string name="filters">Φίλτρα</string>
-    <string name="empty_title_habits">Δεν έχεις καμία συνήθεια</string>
-    <string name="empty_title_rewards">Δεν έχεις καμία ανταμοιβή</string>
-    <string name="save">Αποθήκευση</string>
-    <string name="location">Τοποθεσία</string>
-    <string name="tasks">Υποχρεώσεις</string>
-    <string name="create_challenge">Δημιουργία Πρόκλησης</string>
-    <string name="edit_challenge">Επεξεργασία</string>
-    <string name="description_optional">Περιγραφή (προαιρετικό)</string>
-    <string name="new_challenge_title">Τίτλος νέας Πρόκλησης</string>
-    <string name="system">Σύστημα</string>
-    <string name="start_quest">Έναρξη νέας Αποστολής</string>
-    <string name="party_description">Περιγραφή Συντροφιάς</string>
-    <string name="welcome_back">Καλωσόρισες Πίσω</string>
-    <string name="start_day">Η Μέρα μου ξεκινά</string>
-    <string name="your_balance">Το υπόλοιπό σου:</string>
-    <string name="available_until" formatted="false">Διαθέσιμο μέχρι %s</string>
-    <string name="gems_left_max" formatted="false">Μηνιαία Πετράδια: Απομένουν %1$d/%2$d</string>
-    <string name="gems_left_nomax" formatted="false">Μηνιαία Πετράδια: Απομένουν %d</string>
-    <string name="health">Υγεία</string>
-    <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-    <string name="experience_reward" formatted="false">%dπόντοι Εμπειρίας</string>
-    <string name="gold_reward" formatted="false">%dΧρυσό</string>
-    <string name="quest_owner_rewards">Ανταμοιβές Ιδιοκτήτη Αποστολής</string>
-    <string name="str_abbrv">ΙΣΧ</string>
-    <string name="per_abbrv">ΦΡΟ</string>
-    <string name="int_abbrv">ΕΥΦ</string>
-    <string name="con_abbrv">ΚΡΑ</string>
-    <string name="delete_account">Διαγραφή Λογαριασμού</string>
-    <string name="delete_account_confirmation">διαγραφή του λογαριασμού μου</string>
-    <string name="danger_zone">Περιοχή Κινδύνου</string>
-    <string name="deleting_account">Διαγραφή Λογαριασμού</string>
-    <string name="insufficientGems">Χρειάζεσαι περισσότερα Πετράδια για να αγοράσεις αυτό το αντικείμενο!</string>
-    <string name="purchase_gems">Αγορά Πετραδιών</string>
-    <string name="level">Επίπεδο</string>
-    <string name="stats">Στατιστικά</string>
-    <string name="fix_character_description">Αν έπεσες σε κάποιο σφάλμα ή έκανες κάποιο λάθος και άλλαξε άδικα ο χαρακτήρας σου, μπορείς να διορθώσεις χειροκίνητα τις τιμές εδώ.</string>
-    <string name="fix_character_values">Επιδιόρθωση Τιμών Χαρακτήρων</string>
-    <string name="forgot_password_title">Αποστολή με email μιας διεύθυνσης αλλαγής κωδικού.</string>
-    <string name="forgot_password_description">Εισήγαγε το email που χρησιμοποίησες για την εγγραφή σου στο Habitica.</string>
-    <string name="forgot_password_confirmation">Αν έχουμε καταχωρημένο το email σου, θα σου στείλουμε οδηγίες για να βάλεις νέο κωδικό.</string>
-    <string name="profile">Προφίλ</string>
-    <string name="about">Σχετικά</string>
-    <string name="app_settings">Ρυθμίσεις Εφαρμογής</string>
-    <string name="change_email">Αλλαγή διεύθυνσης Email</string>
-    <string name="change_username">Αλλαγή Όνομα Χρήστη</string>
-    <string name="change">Αλλαγή</string>
-    <string name="character_level">Επίπεδο Χαρακτήρα</string>
-    <string name="strength">Ισχύς</string>
-    <string name="intelligence">Ευφυΐα</string>
-    <string name="constitution">Κράση</string>
-    <string name="perception">Φρόνηση</string>
-    <string name="distribute_task_help">Τοποθέτησε πόντους με βάση την κατηγορία Ισχύς, Ευφυΐας, Κράσης, Φρόνησης σε σχέση με τις υποχρεώσεις που ολοκλήρωσες.</string>
-    <string name="classless">Χωρίς Κλάση</string>
-    <string name="available_stats" formatted="false">%d πόντοι</string>
-    <string name="helpful_links">Χρήσιμοι Σύνδεσμοι</string>
-    <string name="view_faq">Δες τις Συχνές Ερωτήσεις</string>
-    <string name="report_bug">Αναφορά Σφάλματος</string>
-    <string name="player_tiers">Βαθμίδες Παικτών</string>
-    <string name="staff_moderators">Προσωπικό και Διαχειριστές</string>
-    <string name="strike_active_title" formatted="false">Ο %s δέχτηκε Επίθεση!</string>
-    <string name="questShop">Κατάστημα Αποστολών</string>
-    <string name="market_owner_long">Alex ο Πραματευτής</string>
-    <string name="tavern_owner_long">Daniel ο ξενοδόχος</string>
-    <string name="stable_owner_long">Matt ο Θηριοδαμαστής</string>
-    <string name="no_party_title">Παίξε το Habitica σε μια Συντροφιά</string>
-    <string name="create_party_website">Άνοιξε την ιστοσελίδα για να δημιουργήσεις μια συντροφιά</string>
-    <string name="insufficientSubscriberGemsTitle">Συμπληρώθηκε το Μηνιαίο Όριο Πετραδιών</string>
-    <string name="chat_message">Μήνυμα συνομιλίας</string>
-    <string name="world_boss_description_subtitle">%s επιθέσεις!</string>
-    <string name="questShop_owner_long">Ian ο Οδηγός Αποστολών</string>
-    <string name="report">Αναφορά</string>
-    <string name="reply">Απάντηση</string>
-    <string name="challenge_prize">Έπαθλο Πρόκλησης</string>
-    <string name="challenge_categories">Κατηγορίες Προκλήσεων</string>
-    <string name="created_challenge">Δημιουργία Πρόκλησης</string>
-    <string name="public_challenge">Δημόσια Πρόκληση</string>
-    <string name="same_day_reminder_text">Όσο περισσότερα προσθέσεις, τόσο περισσότερα κερδίζεις. Ακόμη και μικρές συνήθειες προσθέτουν σε μεγάλες αλλαγές.</string>
-    <string name="daily_tip_7">Δοκίμασε να καρφιτσώσεις αντικείμενα από την Αγορά στις ανταμοιβές σου για να σε παρακινούν να τα κερδίσεις!</string>
-    <string name="daily_tip_8">Μπορείς να αλλάξεις τη δυσκολία τη υποχρέωσής σου για να πάρεις μεγαλύτερη ανταμοιβή για τις δυσκολότερες υποχρεώσεις σου!</string>
-    <string name="moderator">Διαχειριστής</string>
-    <string name="staff">Προσωπικό</string>
-    <string name="expand_notes">Περισσότερα</string>
-    <string name="collapse_notes">Λιγότερα</string>
-    <string name="last_login">Τελευταία είσοδος</string>
-    <string name="total_checkins">Σύνολο εισόδων</string>
-    <string name="two_handed">Δύο χεριών</string>
-    <string name="confirmUsername">Επιβεβαίωση Όνομα Χρήστη</string>
-    <string name="confirm_username_title">Είσαι σίγουρος για την επιβεβαίωση του τρέχον ονόματος χρήστη;</string>
-    <string name="cancel">Ακύρωση</string>
-    <string name="confirm_username">Επιβεβαίωση Όνομα Χρήστη</string>
-    <string name="username_not_confirmed">Το Όνομα Χρήστη δεν Επιβεβαιώθηκε</string>
-    <string name="username_confirmed">Το Όνομα Χρήστη Επιβεβαιώθηκε</string>
-    <string name="username_level">\@%s ・Επίπεδο %d</string>
-    <string name="welcomeNameTitle">Πώς να σε φωνάζουμε?</string>
-    <string name="display_name_length_error">Τα Ονόματα Εμφάνισης πρέπει να είναι από 1 μέχρι 30 χαρακτήρες</string>
-    <string name="setup_task_reward">Αντάμειψε τον εαυτό σου</string>
-    <string name="setup_task_reward_notes">Να δεις τηλεόραση, να παίξεις ένα παιχνίδι, να φας μια λιχουδιά, ότι θέλεις εσύ!</string>
-    <string name="equipment_str">ΙΣΧ:</string>
-    <string name="equipment_con">ΚΡΑ:</string>
-    <string name="equipment_int">ΕΥΦ:</string>
-    <string name="equipment_per">ΦΡΟ:</string>
-</resources>
\ No newline at end of file
+  <string name="action_refresh">Ανανέωση</string>
+  <string name="XP_default">Εμπειρία</string>
+  <string name="HP_default">Υγεία</string>
+  <string name="MP_default">Mana</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Ρυθμίσεις</string>
+  <string name="SP_userID_title">Ταυτότητα Χρήστη</string>
+  <string name="SP_userID_summary">Η Ταυτότητα Χρήστη σου</string>
+  <string name="SP_APIToken_title">API Token</string>
+  <string name="SP_APIToken_summary">Το API Token σου</string>
+  <string name="Language_title">Γλώσσα</string>
+  <string name="Language_summary">Άλλαξε τη γλώσσα του Habitica</string>
+  <string name="PS_contact_title">Επικοινώνησε μαζί μου</string>
+  <string name="pref_account_header">Λογαριασμός</string>
+  <string name="pref_first_day_of_the_week_title">Πρώτη Μέρα της Εβδομάδας</string>
+  <string name="pref_first_day_of_the_week_summary">Πρώτη Μέρα της Εβδομάδας σε όλα τα ημερολόγια</string>
+  <string name="pref_reminder_header">Ημερήσια Υπενθύμιση</string>
+  <string name="pref_reminder_checkbox">Ενεργοποίηση Υπενθύμισης</string>
+  <string name="pref_reminder_picker">Όρισε Ώρα Υπενθύμισης</string>
+  <string name="pref_cds_header">Προσαρμοσμένη Έναρξη Μέρας</string>
+  <string name="pref_push_notifications_checkbox">Ειδοποιήσεις Χρήστη</string>
+  <string name="push_notifications">Ειδοποιήσεις</string>
+  <string name="push_notifications_sum">Όρισε τις ρυθμίσεις ειδοποιήσεων</string>
+  <string name="preference_push_you_won_challenge">Κέρδισες μία Πρόκληση!</string>
+  <string name="preference_push_received_a_private_message">Έλαβες ένα Προσωπικό Μήνυμα</string>
+  <string name="preference_push_gifted_gems">Δωρισμένα Πετράδια</string>
+  <string name="preference_push_gifted_subscription">Δωρισμένη Συνδρομή</string>
+  <string name="preference_push_invited_to_party">Πρόσκληση σε Παρέα</string>
+  <string name="preference_push_invited_to_guild">Πρόσκληση σε Συντεχνία</string>
+  <string name="preference_push_your_quest_has_begun">Η Αποστολή σου ξεκίνησε</string>
+  <string name="preference_push_invited_to_quest">Πρόσκληση σε Αποστολή</string>
+  <!--Adding tasks-->
+  <string name="action_edit">Επεξεργασία</string>
+  <string name="action_cancel">Ακύρωση</string>
+  <string name="login_btn">Είσοδος</string>
+  <string name="register_btn">Εγγραφή</string>
+  <string name="username">Όνομα Χρήστη</string>
+  <string name="email_username">Email ή Όνομα Χρήστη</string>
+  <string name="password">Κωδικός</string>
+  <string name="emailAddress">Διεύθυνση email</string>
+  <string name="confirmpassword">Επιβεβαίωσε τον κωδικό</string>
+  <string name="logout">Αποσύνδεση</string>
+  <string name="logout_description">Αποσυνδέσου από το λογαριασμό σου</string>
+  <string name="LoginActivityName">Καλώς ήρθες</string>
+  <string name="about.title">Σχετικά</string>
+  <string name="about.libraries">Βιβλιοθήκες</string>
+  <string name="about.habitica_open_source">Η Habitica είναι διαθέσιμη ως λογισμικό ανοικτού κώδικα στο Github</string>
+  <string name="about.rate_our_app">Βαθμολόγησε την εφαρμογή μας</string>
+  <string name="about.give_us_feedback">Στείλτε μας τα Σχόλιά σας!</string>
+  <string name="about.bugreport">Ανάφερε ένα σφάλμα</string>
+  <string name="about.source_code">Πηγαίος Κώδικας</string>
+  <!--Network Errors-->
+  <string name="network_error_no_network_body">Δεν είσαι συνδεδεμένος στο Διαδίκτυο</string>
+  <string name="internal_error_api">Φαίνεται να υπάρχει πρόβλημα με τον διακομιστή. Προσπάθησε αργότερα.</string>
+  <string name="authentication_error_title">Σφάλμα Πιστοποίησης</string>
+  <string name="authentication_error_body">Το Όνομα Χρήστη ή/και ο Κωδικός είναι εσφαλμένα.</string>
+  <string name="login_validation_error_title">Σφάλμα Επικύρωσης</string>
+  <string name="login_validation_error_fieldsmissing">Πρέπει να γεμίσεις όλα τα πεδία.</string>
+  <string name="save_changes">Αποθήκευση</string>
+  <string name="copy">Αντιγραφή</string>
+  <string name="notes">Σημειώσεις</string>
+  <string name="difficulty">Δυσκολία</string>
+  <string name="tags">Ετικέτες</string>
+  <string name="trivial">Ασήμαντο</string>
+  <string name="easy">Εύκολο</string>
+  <string name="medium">Μέτριο</string>
+  <string name="hard">Δύσκολο</string>
+  <string name="start_date">Ημέρα Έναρξης</string>
+  <string name="positive_habit_form">Θετικό (+)</string>
+  <string name="negative_habit_form">Αρνητικό (-)</string>
+  <string name="checklist">Λίστα</string>
+  <string name="reminders">Υπενθυμίσεις</string>
+  <string name="attributes">Χαρακτηριστικά</string>
+  <string name="repeatables_frequency_daily">Ημερήσια</string>
+  <string name="repeatables_frequency_weekly">Εβδομαδιαία</string>
+  <string name="repeatables_frequency_monthly">Μηνιαία</string>
+  <string name="repeatables_frequency_yearly">Ετήσια</string>
+  <string name="repeatables_frequency_day_of_month">Μέρα του Μήνα</string>
+  <string name="repeatables_frequency_day_of_week">Μέρα της Εβδομάδας</string>
+  <string name="monday">Δευτέρα</string>
+  <string name="tuesday">Τρίτη</string>
+  <string name="wednesday">Τετάρτη</string>
+  <string name="thursday">Πέμπτη</string>
+  <string name="friday">Παρασκευή</string>
+  <string name="saturday">Σάββατο</string>
+  <string name="sunday">Κυριακή</string>
+  <string name="levelup_header">Έφτασες στο επίπεδο %1$d!</string>
+  <string name="faint_subtitle">Μην απελπίζεσαι!</string>
+  <string name="faint_header">Ξέμεινες από Ζωή!</string>
+  <string name="faint_button">Γέμισε Ζωή &amp; Προσπάθησε Ξανά</string>
+  <string name="filter">Φίλτρα</string>
+  <string name="used_skill_without_mana">Χρησιμοποίησες %1$s.</string>
+  <string name="new_checklist_item">νέο αντικείμενο λίστας</string>
+  <string name="skill_progress_title">Ρίχνεις το Ξόρκι</string>
+  <string name="unlock_lvl_11">Στο επίπεδο 11</string>
+  <string name="forgot_pw_btn">Ξέχασα τον Κωδικό</string>
+  <string name="reward.dialog.buy">Αγοράζω</string>
+  <string name="reward.dialog.dismiss">Απόρριψη</string>
+  <string name="party">Ομάδα</string>
+  <string name="chat">Συνομιλία</string>
+  <string name="members">Μέλη</string>
+  <string name="habits">Συνήθειες</string>
+  <string name="rewards">Ανταμοιβές</string>
+  <string name="yes">Ναι</string>
+  <string name="no">Όχι</string>
+  <string name="quest">Αποστολή</string>
+  <string name="avatar_body">Σώμα</string>
+  <string name="avatar_hair">Μαλλιά</string>
+  <string name="avatar_shirt">Πουκάμισο</string>
+  <string name="avatar_skin">Δέρμα</string>
+  <string name="avatar_base">Βάση</string>
+  <string name="avatar_color">Χρώμα</string>
+  <string name="avatar_beard">Γενειάδα</string>
+  <string name="avatar_mustache">Μουστάκι</string>
+  <string name="avatar_flower">Λουλούδι</string>
+  <string name="avatar_bangs">Αφέλειες</string>
+  <string name="avatar_size">Μέγεθος</string>
+  <string name="avatar_size_slim">Αδύνατος</string>
+  <string name="avatar_background">Φόντο</string>
+  <string name="purchase_set_button">Ξεκλείδωσε το σετ για %d πετράδια</string>
+  <string name="purchase_button">Αγορά</string>
+  <string name="purchase_set_title">Αγορά σετ %s</string>
+  <string name="due_date">Ημερομηνία λήξης</string>
+  <string name="quest.accept">Αποδοχή</string>
+  <string name="quest.reject">Απόρριψη</string>
+  <string name="quest.begin">Έναρξη Αποστολής</string>
+  <string name="quest.cancel">Ακύρωση Πρόσκλησης</string>
+  <string name="quest.abort">Διακοπή Αποστολής</string>
+  <string name="version_info">Έκδοση %1$s (%2$d)</string>
+  <string name="sidebar_help">Βοήθεια &amp;Συχνές Ερωτήσεις</string>
+  <string name="complete_tutorial">Κατάλαβα!</string>
+  <string name="dismiss_tutorial">Υπενθύμισε μου ξανά</string>
+  <string name="intro_1_subtitle">Καλωσόρισες στο</string>
+  <string name="intro_2_subtitle">Πρόοδος στο παιχνίδι</string>
+  <string name="intro_2_title">Πρόοδος στη ζωή</string>
+  <string name="intro_2_description">Ξεκλείδωσε ενέργειες στο παιχνίδι με την ολοκλήρωση των πραγματικών σου υποχρεώσεων. Κέρδισε πανοπλίες, κατοικίδια, και πολλά άλλα σαν ανταμοιβή για την εκπλήρωση των στόχων σου.</string>
+  <string name="intro_3_subtitle">Πολέμησε τέρατα</string>
+  <string name="intro_3_title">Κοινωνικοποιήσου</string>
+  <string name="intro_finish_button">Ας αρχίσουμε!</string>
+  <string name="next_button">Επόμενο</string>
+  <string name="skip_button">Παράκαμψε</string>
+  <string name="setup_group_work">Εργασία</string>
+  <string name="setup_group_exercise">Άσκηση</string>
+  <string name="setup_group_health">Υγεία</string>
+  <string name="setup_group_school">Σχολείο</string>
+  <string name="setup_group_teams">Ομάδες</string>
+  <string name="setup_group_chores">Αγγαρείες</string>
+  <string name="setup_group_creativity">Δημιουργικότητα</string>
+  <string name="setup_task_work_1">Έλεγχος των email</string>
+  <string name="setup_task_school_1">Διάβασμα/Αναβολή</string>
+  <string name="setup_task_chores_2">Πλύσιμο Πιάτων</string>
+  <string name="setup_task_chores_3">Οργάνωση ντουλάπας</string>
+  <string name="my_guilds">Οι Συντεχνίες μου</string>
+  <string name="public_guilds">Δημόσιες Συντεχνίες</string>
+  <string name="guild">Συντεχνία</string>
+  <string name="leave">Αποχώρηση</string>
+  <string name="gems">Πετράδια</string>
+  <string name="delete">Διαγραφή</string>
+  <string name="name">Όνομα</string>
+  <string name="description">Περιγραφή</string>
+  <string name="add_tag">Προσθήκη νέας ετικέτας</string>
+  <string name="privacy">Ιδιωτικότητα</string>
+  <string name="write_message">Εγγραφή Μηνύματος</string>
+  <string name="guild_search_hint">Ψάξε για Συντεχνίες</string>
+  <string name="battle_gear">Εξοπλισμός Μάχης</string>
+  <string name="costume">Κουστούμι</string>
+  <string name="outfit_head">Κεφάλι</string>
+  <string name="outfit_headAccessory">Εξάρτημα κεφαλής</string>
+  <string name="outfit_eyewear">Οπτικά είδη</string>
+  <string name="outfit_armor">Πανοπλία</string>
+  <string name="outfit_back">Πλάτη</string>
+  <string name="outfit_body">Σώμα</string>
+  <string name="outfit_shield">Ασπίδα</string>
+  <string name="outfit_weapon">Όπλο</string>
+  <string name="wear_costume">Εφαρμογή Κουστουμιού</string>
+  <string name="equipped">Φορεμένο</string>
+  <string name="ago_1day">πριν 1 ημ. </string>
+  <string name="ago_days">πριν %dημ.</string>
+  <string name="ago_1Minute">πριν 1 μήνα</string>
+  <string name="ago_minutes">πριν %dμήνες</string>
+  <string name="ago_hours">πριν %d ώρα</string>
+  <string name="ago_1hour"> πριν 1 ώρα</string>
+  <string name="today">Σήμερα</string>
+  <string name="sidebar_items">Αντικείμενα</string>
+  <string name="eggs">Αυγά</string>
+  <string name="hatching_potions">Φίλτρα εκκόλαψης</string>
+  <string name="food">Φαγητό</string>
+  <string name="quests">Αποστολές</string>
+  <string name="pets">Κατοικίδια</string>
+  <string name="mounts">Yποζύγια</string>
+  <string name="sell">Πώληση (%d Χρυσό)</string>
+  <string name="hatch_with_potion">Εκκόλαψη με φίλτρο</string>
+  <string name="hatch_egg">Εκκόλαψη με αυγό</string>
+  <string name="invite_party">Πρόσκληση συντροφιάς</string>
+  <string name="dialog_feeding">Τάισε %s με:</string>
+  <string name="use_animal">Χρήση</string>
+  <string name="feed">Τάισε</string>
+  <string name="hatch_with">Εκκόλαψη κατοικίδιου με %s</string>
+  <string name="hatched_pet_title">Εκκόλαψες ένα %1$s %2$s!</string>
+  <string name="evolved_pet_title">Δάμασες το %s, πάμε μια βόλτα!</string>
+  <string name="close">Κλείσιμο</string>
+  <string name="share">Κοινοποίησε</string>
+  <string name="notification_pet_fed">Τάισες το %s σου!</string>
+  <string name="notification_purchase_reward">Αγόρασες μια ανταμοιβή</string>
+  <string name="empty_items">Δεν έχεις %s</string>
+  <string name="user_level">Επίπεδο %d</string>
+  <string name="user_level_with_class">Επίπεδο %1$d %2$s</string>
+  <string name="warrior">Πολεμιστής</string>
+  <string name="rogue">Αγύρτης</string>
+  <string name="mage">Μάγος</string>
+  <string name="healer">Θεραπευτής</string>
+  <string name="select_class">Επέλεξε Κλάση</string>
+  <string name="class_confirmation">Σίγουρα θέλεις να είσαι ένας %s?</string>
+  <string name="class_changed">Τώρα είσαι ένας %s!</string>
+  <string name="choose_class">Διάλεξε Κλάση</string>
+  <string name="dialog_go_back">Πίσω</string>
+  <string name="change_class">Άλλαξε την κλάση σου</string>
+  <string name="change_class_description">Άλλαξε την κλάση σου και ξαναμοίρασε τους πόντους στατιστικών σου για 3 πετράδια.</string>
+  <string name="changing_class_progress">Αλλαγή Κλάσης</string>
+  <string name="by_email">Μέσω Email</string>
+  <string name="invite_existing_users">Πρόσκληση Υπαρκτών Χρηστών</string>
+  <string name="send">Στείλε</string>
+  <string name="invite">Κάλεσε φίλους</string>
+  <string name="invite_username_description">Αν έχετε φίλους που παίζουν ήδη το Habitica, καλέστε τους με το όνομα χρήστη τους εδώ.</string>
+  <string name="invite_email_description">Αν κάποιος φίλος σου εγγραφεί στο Habitica μέσω του email σου, θα ενταχθεί αυτόματα στη συντροφιά σου!</string>
+  <string name="add_invites">Προσθήκη Προσκλήσεων</string>
+  <string name="email">Email</string>
+  <string name="share_using">Κοινή χρήση</string>
+  <string name="share_levelup">Έφτασα στο επίπεδο %d στο Habitica βελτιώνοντας τις συνήθειες μου στην πραγματική ζωή!</string>
+  <string name="share_hatched">Μόλις απέκτησα ένα %1$s %2$s στο Habitica με την ολοκλήρωση πραγματικών μου υποχρεώσεων!</string>
+  <string name="share_raised">Μόλις κέρδισα ένα υποζύγιο%s στο Habitica με την ολοκλήρωση πραγματικών μου υποχρεώσεων!</string>
+  <string name="open_in_store">Άνοιγμα στο play store</string>
+  <string name="confirm">Επιβεβαίωση</string>
+  <string name="market">Αγορά</string>
+  <string name="timeTravelers">Χρονοταξιδευτές</string>
+  <string name="seasonalShop">Εποχιακό Κατάστημα</string>
+  <string name="empty_inbox">Δεν έχεις μηνύματα. Μπορείς να στείλεις νέο μήνυμα σε ένα χρήστη από τα μηνύματα δημόσιας συνομιλίας του!</string>
+  <string name="login_incentive">Ξεκλειδώνει με το να εισέρχεσαι στο Habitica τακτικά</string>
+  <string name="create_account">Ξεκλειδώνει με τη δημιουργία λογαριασμού</string>
+  <string name="successful_purchase">%1$s Αγοράστηκε</string>
+  <string name="gold_plural">Χρυσάφι</string>
+  <string name="edit_tag_btn_edit">Επεξεργασία</string>
+  <string name="confirm_delete_tag_title">Είσαι σίγουρος;</string>
+  <string name="confirm_delete_tag_message">Θες πραγματικά να διαγραφείς?</string>
+  <!--QR Strings-->
+  <string name="choose_recipient_title">Επέλεξε Παραλήπτη του Μηνύματος</string>
+  <string name="action_continue">Συνέχεια</string>
+  <string name="stats_widget_label">Στατιστικά του Habitica</string>
+  <string name="add_task">Προσθήκη Υποχρέωσης</string>
+  <string name="add_habit">Προσθήκη Συνήθειας</string>
+  <string name="add_reward">Προσθήκη Ανταμοιβής</string>
+  <string name="google_services_missing">Οι υπηρεσίες Google play δεν βρέθηκαν.</string>
+  <string name="gem.purchase.toolbartitle">Αγορά</string>
+  <string name="gem.purchase.listitem3">Αποστολές που σε ανταμείβουν με αυγά κατοικίδιων</string>
+  <string name="open_market">Λαϊκή Αγορά</string>
+  <string name="AudioTheme_title">Θέμα Μουσικής</string>
+  <string name="AudioTheme_summary">Αλλαγή του Θέματος Μουσικής στο Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Τα λέμε αύριο!</string>
+  <string name="has_reminder">Έχει Υπενθύμιση</string>
+  <string name="has_tag">Έχει Ετικέτα</string>
+  <string name="subscribe.listitem1">Αγόρασε πετράδια με χρυσό</string>
+  <string name="subscriptions">Συνδρομές</string>
+  <string name="subscribe">Γίνε Συνδρομητής</string>
+  <string name="payment_method">Τρόπος πληρωμής</string>
+  <string name="subscription">Συνδρομή</string>
+  <string name="cancel_subscription">Ακύρωση Συνδρομής</string>
+  <string name="one_month">1 Μήνα</string>
+  <string name="months">%d Μήνες</string>
+  <string name="month">μήνας</string>
+  <string name="three_months">3 μήνες</string>
+  <string name="six_months">6 μήνες</string>
+  <string name="twelve_months">12 μήνες</string>
+  <string name="my_challenges">Οι Προκλήσεις μου</string>
+  <string name="habit">Συνήθεια</string>
+  <string name="reward">Ανταμοιβή</string>
+  <string name="official">Επίσημο</string>
+  <string name="inbox">Μηνύματα</string>
+  <string name="gem_shop">Πετράδι</string>
+  <string name="checkInRewardEarned">Κέρδισες ένα %1$s σαν ανταμοιβή για την αφοσίωση στη βελτίωση της ζωής σου.</string>
+  <string name="filters">Φίλτρα</string>
+  <string name="empty_title_habits">Δεν έχεις καμία συνήθεια</string>
+  <string name="empty_title_rewards">Δεν έχεις καμία ανταμοιβή</string>
+  <string name="save">Αποθήκευση</string>
+  <string name="location">Τοποθεσία</string>
+  <string name="tasks">Υποχρεώσεις</string>
+  <string name="create_challenge">Δημιουργία Πρόκλησης</string>
+  <string name="description_optional">Περιγραφή (προαιρετικό)</string>
+  <string name="new_challenge_title">Τίτλος νέας Πρόκλησης</string>
+  <string name="start_quest">Έναρξη νέας Αποστολής</string>
+  <string name="party_description">Περιγραφή Συντροφιάς</string>
+  <string name="welcome_back">Καλωσόρισες Πίσω</string>
+  <string name="start_day">Η Μέρα μου ξεκινά</string>
+  <string name="available_until" formatted="false">Διαθέσιμο μέχρι %s</string>
+  <string name="gems_left_max" formatted="false">Μηνιαία Πετράδια: Απομένουν %1$d/%2$d</string>
+  <string name="gems_left_nomax" formatted="false">Μηνιαία Πετράδια: Απομένουν %d</string>
+  <string name="health">Υγεία</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+  <string name="experience_reward" formatted="false">%dπόντοι Εμπειρίας</string>
+  <string name="gold_reward" formatted="false">%dΧρυσό</string>
+  <string name="quest_owner_rewards">Ανταμοιβές Ιδιοκτήτη Αποστολής</string>
+  <string name="str_abbrv">ΙΣΧ</string>
+  <string name="per_abbrv">ΦΡΟ</string>
+  <string name="int_abbrv">ΕΥΦ</string>
+  <string name="con_abbrv">ΚΡΑ</string>
+  <string name="delete_account">Διαγραφή Λογαριασμού</string>
+  <string name="delete_account_confirmation">διαγραφή του λογαριασμού μου</string>
+  <string name="danger_zone">Περιοχή Κινδύνου</string>
+  <string name="deleting_account">Διαγραφή Λογαριασμού</string>
+  <string name="insufficientGems">Χρειάζεσαι περισσότερα Πετράδια για να αγοράσεις αυτό το αντικείμενο!</string>
+  <string name="purchase_gems">Αγορά Πετραδιών</string>
+  <string name="level">Επίπεδο</string>
+  <string name="stats">Στατιστικά</string>
+  <string name="fix_character_description">Αν έπεσες σε κάποιο σφάλμα ή έκανες κάποιο λάθος και άλλαξε άδικα ο χαρακτήρας σου, μπορείς να διορθώσεις χειροκίνητα τις τιμές εδώ.</string>
+  <string name="fix_character_values">Επιδιόρθωση Τιμών Χαρακτήρων</string>
+  <string name="forgot_password_title">Αποστολή με email μιας διεύθυνσης αλλαγής κωδικού.</string>
+  <string name="forgot_password_description">Εισήγαγε το email που χρησιμοποίησες για την εγγραφή σου στο Habitica.</string>
+  <string name="forgot_password_confirmation">Αν έχουμε καταχωρημένο το email σου, θα σου στείλουμε οδηγίες για να βάλεις νέο κωδικό.</string>
+  <string name="profile">Προφίλ</string>
+  <string name="about">Σχετικά</string>
+  <string name="app_settings">Ρυθμίσεις Εφαρμογής</string>
+  <string name="change_email">Αλλαγή διεύθυνσης Email</string>
+  <string name="change_username">Αλλαγή Όνομα Χρήστη</string>
+  <string name="change">Αλλαγή</string>
+  <string name="character_level">Επίπεδο Χαρακτήρα</string>
+  <string name="strength">Ισχύς</string>
+  <string name="intelligence">Ευφυΐα</string>
+  <string name="constitution">Κράση</string>
+  <string name="perception">Φρόνηση</string>
+  <string name="distribute_task_help">Τοποθέτησε πόντους με βάση την κατηγορία Ισχύς, Ευφυΐας, Κράσης, Φρόνησης σε σχέση με τις υποχρεώσεις που ολοκλήρωσες.</string>
+  <string name="classless">Χωρίς Κλάση</string>
+  <string name="helpful_links">Χρήσιμοι Σύνδεσμοι</string>
+  <string name="view_faq">Δες τις Συχνές Ερωτήσεις</string>
+  <string name="report_bug">Αναφορά Σφάλματος</string>
+  <string name="player_tiers">Βαθμίδες Παικτών</string>
+  <string name="staff_moderators">Προσωπικό και Διαχειριστές</string>
+  <string name="strike_active_title" formatted="false">Ο %s δέχτηκε Επίθεση!</string>
+  <string name="questShop">Κατάστημα Αποστολών</string>
+  <string name="market_owner_long">Alex ο Πραματευτής</string>
+  <string name="tavern_owner_long">Daniel ο ξενοδόχος</string>
+  <string name="stable_owner_long">Matt ο Θηριοδαμαστής</string>
+  <string name="no_party_title">Παίξε το Habitica σε μια Συντροφιά</string>
+  <string name="questShop_owner_long">Ian ο Οδηγός Αποστολών</string>
+  <string name="report">Αναφορά</string>
+  <string name="reply">Απάντηση</string>
+  <string name="challenge_prize">Έπαθλο Πρόκλησης</string>
+  <string name="challenge_categories">Κατηγορίες Προκλήσεων</string>
+  <string name="created_challenge">Δημιουργία Πρόκλησης</string>
+  <string name="public_challenge">Δημόσια Πρόκληση</string>
+  <string name="same_day_reminder_text">Όσο περισσότερα προσθέσεις, τόσο περισσότερα κερδίζεις. Ακόμη και μικρές συνήθειες προσθέτουν σε μεγάλες αλλαγές.</string>
+  <string name="daily_tip_7">Δοκίμασε να καρφιτσώσεις αντικείμενα από την Αγορά στις ανταμοιβές σου για να σε παρακινούν να τα κερδίσεις!</string>
+  <string name="daily_tip_8">Μπορείς να αλλάξεις τη δυσκολία τη υποχρέωσής σου για να πάρεις μεγαλύτερη ανταμοιβή για τις δυσκολότερες υποχρεώσεις σου!</string>
+  <string name="moderator">Διαχειριστής</string>
+  <string name="staff">Προσωπικό</string>
+  <string name="expand_notes">Περισσότερα</string>
+  <string name="collapse_notes">Λιγότερα</string>
+  <string name="last_login">Τελευταία είσοδος</string>
+  <string name="total_checkins">Σύνολο εισόδων</string>
+  <string name="two_handed">Δύο χεριών</string>
+  <string name="confirm_username_title">Είσαι σίγουρος για την επιβεβαίωση του τρέχον ονόματος χρήστη;</string>
+  <string name="cancel">Ακύρωση</string>
+  <string name="confirm_username">Επιβεβαίωση Όνομα Χρήστη</string>
+  <string name="username_not_confirmed">Το Όνομα Χρήστη δεν Επιβεβαιώθηκε</string>
+  <string name="username_confirmed">Το Όνομα Χρήστη Επιβεβαιώθηκε</string>
+  <string name="welcomeNameTitle">Πώς να σε φωνάζουμε?</string>
+  <string name="display_name_length_error">Τα Ονόματα Εμφάνισης πρέπει να είναι από 1 μέχρι 30 χαρακτήρες</string>
+  <string name="setup_task_reward">Αντάμειψε τον εαυτό σου</string>
+  <string name="setup_task_reward_notes">Να δεις τηλεόραση, να παίξεις ένα παιχνίδι, να φας μια λιχουδιά, ότι θέλεις εσύ!</string>
+  <string name="equipment_str">ΙΣΧ:</string>
+  <string name="equipment_con">ΚΡΑ:</string>
+  <string name="equipment_int">ΕΥΦ:</string>
+  <string name="equipment_per">ΦΡΟ:</string>
+</resources>
diff --git a/Habitica/res/values-en-rGB/strings.sidebar.xml b/Habitica/res/values-en-rGB/strings.sidebar.xml
index d8b4680b4..a8d9aa77c 100644
--- a/Habitica/res/values-en-rGB/strings.sidebar.xml
+++ b/Habitica/res/values-en-rGB/strings.sidebar.xml
@@ -5,7 +5,6 @@
     <string name="sidebar_section_social">Social</string>
     <string name="sidebar_tavern">Tavern</string>
     <string name="sidebar_party">Party</string>
-    <string name="sidebar_purchaseGems">Gems &amp; Subscription</string>
     <string name="sidebar_guilds">Guilds</string>
     <string name="sidebar_challenges">Challenges</string>
     <string name="sidebar_section_inventory">Inventory</string>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 1e1cf6de8..7575a9406 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -342,9 +342,6 @@
     <string name="subscribe_prompt_thanks">You get these benefits for being a Subscriber</string>
     <string name="subscription_status">Subscription Status</string>
     <string name="challenge_leave_title">Leave Challenge</string>
-    <string name="challenge_leave_text">Are you sure you want to leave the Challenge “%s”?</string>
-    <string name="challenge_remove_tasks_title">Remove tasks</string>
-    <string name="challenge_remove_tasks_text">Do you want to remove the tasks?</string>
     <string name="remove_tasks">Remove</string>
     <string name="keep_tasks">Keep</string>
     <string name="my_challenges">My Challenges</string>
@@ -390,9 +387,9 @@
     <string name="completed">Completed</string>
     <string name="setuP_group_other">Other</string>
     <string name="clear">Clear</string>
-    <string name="empty_title_habits">You don&amp;rsquo;t have any Habits</string>
-    <string name="empty_description_habits">Habits are tasks that don&amp;rsquo;t have a rigid schedule. You can check them off many times a day, or not at all.</string>
-    <string name="empty_title_dailies">You don&amp;rsquo;t have any Dailies</string>
+    <string name="empty_title_habits">You don\'t have any Habits</string>
+    <string name="empty_description_habits">Habits are tasks that don\'t have a rigid schedule. You can check them off many times a day, or not at all.</string>
+    <string name="empty_title_dailies">You don\'t have any Dailies</string>
     <string name="empty_description_dailies">Dailies are tasks that repeat on a regular basis. Choose the schedule that works for you!</string>
     <string name="empty_title_todos">You don\'t have any To Do\'s</string>
     <string name="empty_description_todos">To Do\'s are tasks that only need to be completed once. Add checklists to your To Do\'s to increase their value.</string>
@@ -675,8 +672,6 @@
     <string name="send_gift">Send Gift</string>
     <string name="server">Server</string>
     <string name="gift_confirmation_title">Your gift was sent!</string>
-    <string name="gift_confirmation_text_g1g1">You sent %s a %s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion!</string>
-    <string name="gift_confirmation_text">You sent %s a %s-month Habitica subscription.</string>
     <string name="discover">Discover</string>
     <string name="damage_paused">Damage paused</string>
     <string name="preference_push_important_announcements">Important Announcements</string>
@@ -763,7 +758,7 @@
     <string name="keep_challenges">Keep Challenges</string>
     <string name="inviteFriendDescription">You invited a friend (or friends) who joined you on your adventure!</string>
     <string name="inviteFriendTitle">Invited a Friend</string>
-    <string name="joinedChallengeDescription">You put themselves to the test by joining a Challenge!</string>
+    <string name="joinedChallengeDescription">You put yourself to the test by joining a Challenge!</string>
     <string name="joinedChallengeTitle">Joined a Challenge</string>
     <string name="joinedGuildDescription">Ventured into the social side of Habitica by joining a Guild!</string>
     <string name="joinedGuildTitle">Joined a Guild</string>
@@ -882,7 +877,6 @@
     <string name="unlock_previous">Unlock by finishing Quest %d</string>
     <string name="unlock_level">Unlock by reaching level %d</string>
     <string name="unlock_previous_short">Finish Quest %d</string>
-    <string name="unlock_level_short">Level %d</string>
     <string name="not_participating">You are not participating</string>
     <string name="quest_completed">Quest completed!</string>
     <string name="gift_confirmation_text_gems">You sent %s some gems.</string>
@@ -922,7 +916,7 @@
     <string name="remaining_1month">1 month remaining</string>
     <string name="ago_weeks">%dw ago</string>
     <string name="ago_1week">1w ago</string>
-    <string name="ago_months">%d month ago</string>
+    <string name="ago_months">%d months ago</string>
     <string name="ago_1month">1 month ago</string>
     <string name="skill_progress_title">Using Skill</string>
     <string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
@@ -1107,4 +1101,4 @@
     <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="view_gem_bundles">View Gem Bundles</string>
     <string name="fall_promo_info_prompt">The Fall Gala is in full swing so we thought it was the perfect time to introduce our first ever Gem Sale! Now you will get more Gems with each purchase than ever before.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-es/strings.sidebar.xml b/Habitica/res/values-es/strings.sidebar.xml
index 82348f81a..408fb86c3 100644
--- a/Habitica/res/values-es/strings.sidebar.xml
+++ b/Habitica/res/values-es/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Mensajes</string>
     <string name="sidebar_tavern">Taberna</string>
     <string name="sidebar_party">Equipo</string>
-    <string name="sidebar_purchaseGems">Gemas y Suscripción</string>
     <string name="sidebar_guilds">Gremios</string>
     <string name="sidebar_challenges">Desafíos</string>
     <string name="sidebar_section_inventory">Inventario</string>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 9313ed6f0..c74dc8afd 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -373,9 +373,6 @@
     <string name="subscribe_prompt_thanks">Siendo suscriptor, obtienes estos beneficios</string>
     <string name="subscription_status">Estado de Suscripción</string>
     <string name="challenge_leave_title">Abandonar Desafío</string>
-    <string name="challenge_leave_text">¿Seguro que quieres abandonar el Desafio \"%s\"?</string>
-    <string name="challenge_remove_tasks_title">Eliminar tareas</string>
-    <string name="challenge_remove_tasks_text">¿Quieres eliminar las tareas?</string>
     <string name="remove_tasks">Eliminar</string>
     <string name="keep_tasks">Mantener</string>
     <string name="my_challenges">Mis Desafíos</string>
@@ -671,8 +668,6 @@
     <string name="send_gift">Enviar Regalo</string>
     <string name="server">Servidor</string>
     <string name="gift_confirmation_title">¡Tu regalo se envió!</string>
-    <string name="gift_confirmation_text_g1g1">Tu suscripción regalo ha sido enviada y tu suscripción ha sido aplicada a tu cuenta.</string>
-    <string name="gift_confirmation_text">Tu suscripción regalo ha sido enviada y tu suscripción ha sido aplicada a tu cuenta.</string>
     <string name="discover">Descubre</string>
     <string name="damage_paused">Daño pausado</string>
     <string name="opting_out_progress">optar por no</string>
@@ -834,9 +829,9 @@
     <string name="empty_description_habits_filtered">Ningún hábito coincide con los filtros seleccionados.</string>
     <string name="empty_title_habits_filtered">Sin hábitos</string>
     <string name="register_btn_google">Registrarse con Google</string>
-    <string name="register_btn_fb">Ingresa desde Facebook</string>
-    <string name="login_btn_apple">Ingresa desde Apple</string>
-    <string name="x_months">Meses</string>
+    <string name="register_btn_fb">Registrarse con Facebook</string>
+    <string name="login_btn_apple">Registrarse con Apple</string>
+    <string name="x_months">%d Meses</string>
     <string name="inbox_messages_title_nosender">Recibiste %d mensajes</string>
     <string name="inbox_messages_title">Recibiste %d mensajes de %s</string>
     <string name="create_task">Crear %s</string>
@@ -1061,4 +1056,4 @@
     <string name="still_questions">¿Aún tienes una pregunta\?</string>
     <string name="purchase_amount_error">No puedes comprar esa cantidad.</string>
     <string name="read_more">Leer más</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-fi/strings.profile.xml b/Habitica/res/values-fi/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-fi/strings.profile.xml
+++ b/Habitica/res/values-fi/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-fi/strings.sidebar.xml b/Habitica/res/values-fi/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-fi/strings.sidebar.xml
+++ b/Habitica/res/values-fi/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-fi/strings.tutorial.xml b/Habitica/res/values-fi/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-fi/strings.tutorial.xml
+++ b/Habitica/res/values-fi/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-fi/strings.xml b/Habitica/res/values-fi/strings.xml
index e0fd46352..44644f01f 100755
--- a/Habitica/res/values-fi/strings.xml
+++ b/Habitica/res/values-fi/strings.xml
@@ -4,17 +4,14 @@
   <string name="XP_default">Kokemuspisteet</string>
   <string name="HP_default">Terveys</string>
   <string name="MP_default">Voima</string>
-  <string name="ERR_pb_barcode">Asetuksien lataus epäonnistui</string>
   <!--Prefs-->
   <string name="PS_settings_title">Asetukset</string>
-  <string name="SP_address_hint">Asiakaspalvelu</string>
   <string name="SP_userID_title">Käyttäjän tunnistus</string>
   <string name="SP_userID_summary">Käyttäjäkoodisi</string>
   <string name="SP_APIToken_title">API Valtuutus</string>
   <string name="SP_APIToken_summary">Api valtuutuksesi</string>
   <string name="Language_title">Kieli</string>
   <string name="Language_summary">Vaihda Habitica-sovelluksen kieli</string>
-  <string name="SP_user_qr_code">QR-koodisi</string>
   <string name="PS_contact_title">Yhteystiedot</string>
   <string name="pref_account_header">Tili</string>
   <string name="pref_first_day_of_the_week_title">Viikon ensimmäinen päivä</string>
@@ -23,7 +20,6 @@
   <string name="pref_reminder_checkbox">Aktivoi muistutus</string>
   <string name="pref_reminder_picker">Aseta aika muistutukselle</string>
   <string name="pref_cds_header">Mukautettu päivän alkamisaika</string>
-  <string name="pref_cds_picker">Aseta mukautettu päivän alkamisaika</string>
   <string name="pref_push_notifications_checkbox">Käyttäjän Push-ilmoitukset</string>
   <string name="push_notifications">Push-ilmoitukset</string>
   <string name="push_notifications_sum">Säädä Push-ilmoitusasetuksiasi</string>
@@ -33,9 +29,7 @@
   <string name="preference_push_your_quest_has_begun">Seikkailusi on alkanut</string>
   <string name="preference_push_invited_to_quest">Kutsuttu seikkailulle</string>
   <!--Adding tasks-->
-  <string name="task_value">Arvo</string>
   <string name="action_edit">Muokkaa</string>
-  <string name="action_delete">Poista</string>
   <string name="action_cancel">Peruuta</string>
   <string name="login_btn">Kirjaudu</string>
   <string name="register_btn">Rekisteröidy</string>
@@ -46,20 +40,15 @@
   <string name="confirmpassword">Vahvista salasana</string>
   <string name="logout">Kirjaudu ulos</string>
   <string name="logout_description">Kirjaudu ulos tililtäsi</string>
-  <string name="account_details">Tilin tiedot</string>
   <string name="LoginActivityName">Tervetuloa</string>
-  <string name="string_revive">Herätä henkiin</string>
-  <string name="please_connect">Käytä widgettejä aplikaation kautta</string>
   <string name="about.title">Tietoja</string>
   <string name="about.libraries">Info-osiot</string>
-  <string name="about.versionhistory">Versiohistoria</string>
   <string name="about.habitica_open_source">Habitica on löydettävissä avoimen koodin ohjelmana Githubista.</string>
   <string name="about.rate_our_app">Arvostele sovelluksemme</string>
   <string name="about.give_us_feedback">Lähetä meille palautetta!</string>
   <string name="about.bugreport">Raportoi virheistä</string>
   <string name="about.source_code">Lähdekoodi</string>
   <!--Network Errors-->
-  <string name="network_error_title">Yhteyshäiriö</string>
   <string name="network_error_no_network_body">Internetyhteytesi ei toimi</string>
   <string name="internal_error_api">Serverissä näyttäisi olevan ongelma. Yritä myöhemmin uudestaan.</string>
   <string name="authentication_error_title">Authentication Error</string>
@@ -69,7 +58,6 @@
   <string name="save_changes">Tallenna</string>
   <string name="copy">Kopioi</string>
   <string name="notes">Huomiot</string>
-  <string name="text">Teksti</string>
   <string name="difficulty">Vaikeustaso</string>
   <string name="tags">Tägit</string>
   <string name="trivial">Triviaali</string>
@@ -81,11 +69,7 @@
   <string name="negative_habit_form">Negatiivinen</string>
   <string name="checklist">Tarkistuslista</string>
   <string name="reminders">Muistutukset</string>
-  <string name="actions">Toiminnot</string>
   <string name="attributes">Ominaisuudet</string>
-  <string name="frequency">Tapahtumatiheys</string>
-  <string name="frequency_weekly">Tiettyinä päivinä viikossa</string>
-  <string name="frequency_daily">Joka X päivä</string>
   <string name="monday">Maanantai</string>
   <string name="tuesday">Tiistai</string>
   <string name="wednesday">Keskiviikko</string>
@@ -93,23 +77,14 @@
   <string name="friday">Perjantai</string>
   <string name="saturday">Lauantai</string>
   <string name="sunday">Sunnuntai</string>
-  <string name="levelup_button">Hienoa!</string>
   <string name="faint_subtitle">Älä masennu!</string>
   <string name="faint_header">Menetit terveytesi!</string>
   <string name="faint_button">Täydennä terveys &amp; Yritä uudelleen</string>
   <string name="filter">Suodatin</string>
-  <string name="profile_image">Profiilikuva</string>
-  <string name="mana_price_button">%d VP</string>
-  <string name="used_skill">Olet käyttänyt %1$s %2$d voimastasi.</string>
   <string name="used_skill_without_mana">Käytit %1$s.</string>
   <string name="new_checklist_item">Uusi asia muistilistaan</string>
-  <string name="add_checklist_item">Lisää</string>
   <string name="skill_progress_title">Taidon käyttö</string>
-  <string name="coming_soon">Tulossa pian</string>
-  <string name="chat_flag_confirmation">Oletko varma, että haluat raportoida käytösrikkeen?</string>
-  <string name="flag_confirm">Merkitse viesti</string>
   <string name="unlock_lvl_11">Avautuu tasolla 11</string>
-  <string name="no_party_message">Et kuulu vielä ryhmään. Liittyminen ryhmään tapahtuu nettisivuston kautta.</string>
   <string name="forgot_pw_btn">Unohdin salasanan</string>
   <string name="tavern.inn.checkOut">Uudelleenaktivoi päivittäiset</string>
   <string name="tavern.inn.rest">Pysäytä päivittäiset</string>
@@ -121,8 +96,6 @@
   <string name="habits">Tavat</string>
   <string name="dailies">Päivittäiset tehtävät</string>
   <string name="rewards">Palkinnot</string>
-  <string name="taskform.delete.title">Oletko varma?</string>
-  <string name="taskform.delete.message">Haluatko todella poistaa?</string>
   <string name="yes">Kyllä</string>
   <string name="no">Ei</string>
   <string name="quest">Seikkailu</string>
@@ -130,14 +103,12 @@
   <string name="avatar_hair">Hiukset</string>
   <string name="avatar_shirt">Paita</string>
   <string name="avatar_skin">Iho</string>
-  <string name="avatar_ears">Eläinkorvat</string>
   <string name="avatar_base">Pohja</string>
   <string name="avatar_color">Väri</string>
   <string name="avatar_beard">Parta</string>
   <string name="avatar_mustache">Viikset</string>
   <string name="avatar_flower">Kukka</string>
   <string name="avatar_bangs">Saparot</string>
-  <string name="avatar_nothing">Riisuttu</string>
   <string name="avatar_size">Koko</string>
   <string name="avatar_size_slim">Hoikka</string>
   <string name="avatar_size_broad">Roteva</string>
@@ -152,20 +123,12 @@
   <string name="quest.begin">Aloita seikkailu</string>
   <string name="quest.cancel">Peru kutsu</string>
   <string name="quest.abort">Keskeytä seikkailu</string>
-  <string name="quest.leave">Luovu seikkailusta</string>
-  <string name="quest.pending">Odottaa</string>
-  <string name="quest.accepted">Hyväksytty</string>
-  <string name="quest.rejected">Hylätty</string>
-  <string name="quest.participants">Osallistujat</string>
   <string name="sidebar_help">Apua &amp; UKK</string>
   <string name="complete_tutorial">Selvä!</string>
   <string name="dismiss_tutorial">Muistuta myöhemmin</string>
   <string name="intro_3_description">Ystävien avulla voit pysyä asettamissasi tavoitteissa. Kannustakaa toisianne niin elämässä kuin vastustajia vastaan taistellessa, niin kehitytte yhdessä!</string>
-  <string name="previous_button">Taaksepäin</string>
   <string name="next_button">Seuraava</string>
   <string name="skip_button">Ohita</string>
-  <string name="setup_welcome_description">Tervetuloa Habiticaan, jossa elämäsi paranee samalla kun etenet pelissä! Kun onnistut oikean elämän tavoitteissasi, niin samalla sinulle avautuu pelissä tarvikkeita, lemmikkejä ja paljon muuta.</string>
-  <string name="setup_welcome_title">Tervetuloa</string>
   <string name="setup_group_work">Työ</string>
   <string name="setup_group_exercise">Harjoitus</string>
   <string name="setup_group_school">Koulu</string>
@@ -193,26 +156,18 @@
   <string name="setup_task_creativity_1">Hio taitojasi</string>
   <string name="setup_task_creativity_2">Tee jotain luovaa</string>
   <string name="setup_task_creativity_3">Sain luovan projektin valmiiksi</string>
-  <string name="gem.purchase.support">Haluatko, että Habitica pysyy käynnissä? Voit tukea tuotteen kehitystä ostamalla timantteja!\n\nTimateilla voit osaa kaikkea hauskaa pelissä, esimerkiksi: \n\n - Upeita asusteita hahmollesi\n - Hienoja taustoja\n - Hauskoja seikkailuja, joista palkintona lemmikkien munia\n - Mahdollisuus vaihtaa hahmoluokkaasi ennen tasoa 100\n\nIsot kiitokset kun autat meitä tekemään Habiticasta paremman. Tukesi on meille tärkeää!</string>
   <string name="my_guilds">Minun killat</string>
   <string name="public_guilds">Julkiset killat</string>
   <string name="guild">Kilta</string>
   <string name="leave">Poistu</string>
   <string name="join">Liity</string>
-  <string name="leader">Johtaja</string>
   <string name="gems">Jalokivet</string>
-  <string name="send_pm">Lähetä YV</string>
-  <string name="flag">Valinta</string>
   <string name="delete">Poista</string>
   <string name="name">Nimi</string>
   <string name="description">Kuvaus</string>
   <string name="privacy">Yksityisyys</string>
   <string name="write_message">Kirjoita viesti</string>
-  <string name="post">Lähetä</string>
   <string name="guild_search_hint">Hae kiltoja</string>
-  <string name="todo_due">Pvm: %s</string>
-  <string name="daily_streak">nykyinen putki: %d</string>
-  <string name="todo_has_duedate">Tehtävällä on valmistumispäivämäärä</string>
   <string name="battle_gear">Taisteluvarustus</string>
   <string name="costume">Asu</string>
   <string name="outfit_head">Pää</string>
@@ -226,8 +181,6 @@
   <string name="wear_costume">Pue asu</string>
   <string name="equipped">Tarvikkeet</string>
   <string name="quest_cancel_message">Haluatko varmasti perua tämän seikkailun? Kaikki hyväksytyt kutsut hävitetään. Seikkailun omistaja pitää seikkailukäärön hallussaan.</string>
-  <string name="quest.invitation">Seikkailukutsu</string>
-  <string name="quest.invitation.text">Sinut on kutsuttu osallistumaan jahtiin!</string>
   <string name="today">tänään</string>
   <string name="sidebar_items">Esineet</string>
   <string name="eggs">Munat</string>
@@ -235,7 +188,6 @@
   <string name="quests">Seikkailut</string>
   <string name="pets">Lemmikit</string>
   <string name="mounts">Ratsut</string>
-  <string name="feed_to_pet">Syötä lemmikille</string>
   <string name="use_animal">Käytä</string>
   <string name="feed">Ruoki</string>
   <string name="close">Sulje</string>
@@ -251,23 +203,14 @@
   <string name="send">Lähetä</string>
   <string name="invite">Kutsu kavereita</string>
   <string name="add_invites">Lisää kutsuja</string>
-  <string name="user_id">Käyttäjätunnus</string>
   <string name="email">Sähköposti</string>
-  <string name="invite_users">Kutsu seurueeseen</string>
   <string name="share_using">Jaa käyttäen</string>
   <string name="open_in_store">Avaa Play-kaupassa</string>
   <string name="confirm">Vahvista</string>
   <string name="market">Kauppa</string>
   <string name="timeTravelers">Aikamatkailijat</string>
-  <string name="no_gold">Ei tarpeeksi Kultaa</string>
-  <string name="purchase_confirmation_title">Vahvista ostos</string>
-  <string name="gem">jalokivi</string>
-  <string name="hourglass">tiimalasi</string>
-  <string name="hourglasses">tiimalasit</string>
-  <string name="gold_singular">kulta</string>
   <string name="gold_plural">kulta</string>
   <string name="chat_message_copied">Kopioitu leikepöydälle</string>
-  <string name="copy_chat_message">Kopioi leikepöydälle</string>
   <!--QR Strings-->
   <string name="support_habitica">Tue Habitica-palvelua</string>
   <string name="skill_transformation_use">käytä</string>
diff --git a/Habitica/res/values-fr/strings.sidebar.xml b/Habitica/res/values-fr/strings.sidebar.xml
index dd93c1629..c0f0c059d 100644
--- a/Habitica/res/values-fr/strings.sidebar.xml
+++ b/Habitica/res/values-fr/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Messages</string>
     <string name="sidebar_tavern">Auberge</string>
     <string name="sidebar_party">Équipe</string>
-    <string name="sidebar_purchaseGems">Gemmes et abonnement</string>
     <string name="sidebar_guilds">Guildes</string>
     <string name="sidebar_challenges">Défis</string>
     <string name="sidebar_section_inventory">Inventaire</string>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index b16fa720c..abae9a5a3 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -223,6 +223,7 @@
     <string name="armoireEquipment">Vous avez trouvé %s dans l\'armoire enchantée</string>
     <string name="armoireFood">Vous farfouillez dans l\'armoire enchantée et trouvez une %1$s %2$s. Qu\'est-ce que ça fait là \?</string>
     <string name="armoireExp">Vous luttez contre l\'armoire enchantée et gagnez de l\'expérience. Prends ça !</string>
+    <string name="quest_items_found">Vous avez trouvé %d objets pour la quête</string>
     <string name="sell">Vendre (%d pièces d\'or)</string>
     <string name="hatch_with_potion">Faire éclore avec la potion</string>
     <string name="hatch_egg">Faire éclore avec l\'œuf</string>
@@ -372,9 +373,6 @@
     <string name="subscribe_prompt_thanks">Vous avez ces bonus grâce à votre abonnement</string>
     <string name="subscription_status">Etat de l\'abonnement</string>
     <string name="challenge_leave_title">Quitter le défi</string>
-    <string name="challenge_leave_text">Voulez-vous vraiment quitter le défi \"%s\" ?</string>
-    <string name="challenge_remove_tasks_title">Supprimer les tâches</string>
-    <string name="challenge_remove_tasks_text">Voulez-vous supprimer les tâches ?</string>
     <string name="remove_tasks">Supprimer</string>
     <string name="keep_tasks">Conserver</string>
     <string name="my_challenges">Mes défis</string>
@@ -674,8 +672,6 @@
     <string name="send_gift">Offrir</string>
     <string name="server">Serveur</string>
     <string name="gift_confirmation_title">Votre cadeau a été envoyé !</string>
-    <string name="gift_confirmation_text_g1g1">Votre abonnement offert a été envoyé, et votre abonnement a été rattaché à votre compte !</string>
-    <string name="gift_confirmation_text">Votre abonnement offert a été envoyé, et votre abonnement a été rattaché à votre compte.</string>
     <string name="opting_out_progress">Ne pas choisir</string>
     <string name="delete_oauth_account_description">Cela va définitivement supprimer votre compte, et il ne pourra pas être restauré ! Les gemmes sur votre compte ou celles dépensées ne seront pas remboursées. Si vous êtes absolument certain, tapez DELETE dans le champ ci-dessous.</string>
     <string name="discover">Découvrir</string>
@@ -740,7 +736,7 @@
     <string name="achievement_title">Vous avez obtenu un succès !</string>
     <string name="view_achievements">Voir les succès</string>
     <string name="see_what_s_new">Voir les nouveautés</string>
-    <string name="mystery_item_received">Vous ouvrez la boîte et trouvez %@</string>
+    <string name="mystery_item_received">Vous ouvrez la boite et trouvez %s</string>
     <string name="removed_member">%s ne fait plus partie du groupe</string>
     <string name="transfer">Transférer</string>
     <string name="remove_member_confirm">Confirmez-vous vouloir retirer %s du groupe \?</string>
@@ -877,7 +873,6 @@
     <string name="g1g1_duration">17 Déc jusqu\'au 6 Jan</string>
     <string name="quest_completed">Quête terminée !</string>
     <string name="not_participating">Vous ne participez pas</string>
-    <string name="unlock_level_short">Niveau %d</string>
     <string name="unlock_previous_short">Finir la quête %d</string>
     <string name="unlock_level">Débloqué en atteignant le niveau %d</string>
     <string name="unlock_previous">Débloqué en finissant la quête %d</string>
@@ -1109,4 +1104,4 @@
     <string name="how_it_works">Comment ça marche</string>
     <string name="x_to_y">%s à %s</string>
     <string name="usually_x_gems">Généralement %d gemmes</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-he/strings.profile.xml b/Habitica/res/values-he/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-he/strings.profile.xml
+++ b/Habitica/res/values-he/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-hi/strings.profile.xml b/Habitica/res/values-hi/strings.profile.xml
index 58b91a897..60d729c1d 100644
--- a/Habitica/res/values-hi/strings.profile.xml
+++ b/Habitica/res/values-hi/strings.profile.xml
@@ -11,4 +11,4 @@
     <string name="profile_send_message_to">%s के लिए संदेश भेजें</string>
     <string name="profile_pets_found">पालतू जानवर मिल गया</string>
     <string name="profile_pets_and_mounts">पालतू जानवर और सवारी</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-hi/strings.sidebar.xml b/Habitica/res/values-hi/strings.sidebar.xml
index 8ff3d964f..439985922 100644
--- a/Habitica/res/values-hi/strings.sidebar.xml
+++ b/Habitica/res/values-hi/strings.sidebar.xml
@@ -16,4 +16,4 @@
     <string name="sidebar_section_social">सामाजिक</string>
     <string name="sidebar_skills">कौशल</string>
     <string name="sidebar_tasks">काम</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-hi/strings.tutorial.xml b/Habitica/res/values-hi/strings.tutorial.xml
index a0fe2dd7a..06cf48615 100644
--- a/Habitica/res/values-hi/strings.tutorial.xml
+++ b/Habitica/res/values-hi/strings.tutorial.xml
@@ -2,4 +2,4 @@
 <resources>
     <string name="tutorial_habits_2">जब आप एक सकारात्मक आदत डालते हैं, + इसे टैप करें, अनुभव और सोना पाने के लिए!</string>
     <string name="tutorial_habits_1">पहली आदत है | वे सकारात्मक आदतें हो सकते हैं जिन्हें आप सुधारना चाहते हैं या नकारात्मक आदतें जिन्हें आप छोड़ना चाहते हैं।</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-hi/strings.xml b/Habitica/res/values-hi/strings.xml
index 0444eaca9..6d169f039 100755
--- a/Habitica/res/values-hi/strings.xml
+++ b/Habitica/res/values-hi/strings.xml
@@ -4,10 +4,8 @@
     <string name="XP_default">अनुभव</string>
     <string name="HP_default">स्वास्थ्य</string>
     <string name="MP_default">माना</string>
-    <string name="ERR_pb_barcode">बारकोड से प्राथमिकताओं को लोड नहीं किया जा सका</string>
     <!--Prefs-->
     <string name="PS_settings_title">परिस्थितियां</string>
-    <string name="SP_address_hint">आपका अनुकूलित परिसेवक</string>
     <string name="SP_userID_title">उपयोगकर्ता आईडी</string>
     <string name="SP_userID_summary">आपकी उपयोगकर्ता आईडी</string>
     <string name="SP_APIToken_title">एपीआई टोकन</string>
@@ -15,7 +13,6 @@
     <string name="Language_title">भाषा</string>
     <string name="Language_summary">हैबीटिका की भाषा बदलें</string>
     <string name="PS_contact_title">मुझसे संपर्क करें</string>
-    <string name="unknown_error">एक समस्या हुई...</string>
     <string name="pref_account_header">खाता</string>
     <string name="pref_first_day_of_the_week_title">सप्ताह का पहला दिन</string>
     <string name="pref_first_day_of_the_week_summary">सभी कैलेंडरों में सप्ताह का पहला दिन </string>
diff --git a/Habitica/res/values-hr-rHR/strings.sidebar.xml b/Habitica/res/values-hr-rHR/strings.sidebar.xml
index fa0ad28d0..00cdcc9a9 100644
--- a/Habitica/res/values-hr-rHR/strings.sidebar.xml
+++ b/Habitica/res/values-hr-rHR/strings.sidebar.xml
@@ -6,7 +6,6 @@
   <string name="sidebar_inbox">Poruke</string>
   <string name="sidebar_tavern">Krčma</string>
   <string name="sidebar_party">Družina</string>
-  <string name="sidebar_purchaseGems">Dragulji &amp; Pretplata</string>
   <string name="sidebar_guilds">Cehovi</string>
   <string name="sidebar_challenges">Izazovi</string>
   <string name="sidebar_section_inventory">Inventar</string>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 183e78582..818bc68f5 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -673,4 +673,4 @@
     <string name="gift_confirmation_text">Tvoj poklon je poslan i tvoja pretplata je aktivirana na tvom računu.</string>
     <string name="discover">Otkrij</string>
     <string name="damage_paused">Šteta je pauzirana</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-hu/strings.profile.xml b/Habitica/res/values-hu/strings.profile.xml
index 19c2d4701..369f91492 100644
--- a/Habitica/res/values-hu/strings.profile.xml
+++ b/Habitica/res/values-hu/strings.profile.xml
@@ -4,4 +4,4 @@
     <string name="profile_mounts_tamed">Megszelídített hátasok</string>
     <string name="profile_pets_found">Megtalált háziállatok</string>
     <string name="profile_pets_and_mounts">Háziállatok &amp; Hátasok</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-hu/strings.sidebar.xml b/Habitica/res/values-hu/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-hu/strings.sidebar.xml
+++ b/Habitica/res/values-hu/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-hu/strings.tutorial.xml b/Habitica/res/values-hu/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-hu/strings.tutorial.xml
+++ b/Habitica/res/values-hu/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-hu/strings.xml b/Habitica/res/values-hu/strings.xml
index db2fc833a..57bf15125 100755
--- a/Habitica/res/values-hu/strings.xml
+++ b/Habitica/res/values-hu/strings.xml
@@ -365,4 +365,4 @@
     <string name="participants">Résztvevők</string>
     <string name="invitations">Meghívók</string>
     <string name="garden">Kert</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-id/strings.profile.xml b/Habitica/res/values-id/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-id/strings.profile.xml
+++ b/Habitica/res/values-id/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-in/strings.sidebar.xml b/Habitica/res/values-in/strings.sidebar.xml
index c67620fb4..c62b2c105 100644
--- a/Habitica/res/values-in/strings.sidebar.xml
+++ b/Habitica/res/values-in/strings.sidebar.xml
@@ -6,7 +6,6 @@
   <string name="sidebar_inbox">Pesan</string>
   <string name="sidebar_tavern">Kedai Minuman</string>
   <string name="sidebar_party">Party</string>
-  <string name="sidebar_purchaseGems">Permata &amp; Berlangganan</string>
   <string name="sidebar_guilds">Guild</string>
   <string name="sidebar_challenges">Tantangan</string>
   <string name="sidebar_section_inventory">Inventori</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index c8fe86e6f..3825855f0 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -353,9 +353,6 @@
     <string name="subscribe_prompt_thanks">Dengan Berlangganan kamu menerima keuntungan bermanfaat berikut:</string>
     <string name="subscription_status">Status Langganan</string>
     <string name="challenge_leave_title">Tinggalkan Tantangan</string>
-    <string name="challenge_leave_text">Apakah kamu yakin ingin meninggalkan Tantangan \"%s\"?</string>
-    <string name="challenge_remove_tasks_title">Hapus tugas</string>
-    <string name="challenge_remove_tasks_text">Apakah kamu mau menghapus tugas ini?</string>
     <string name="remove_tasks">Hapus</string>
     <string name="keep_tasks">Simpan</string>
     <string name="my_challenges">Tantangan Saya</string>
diff --git a/Habitica/res/values-it/strings.sidebar.xml b/Habitica/res/values-it/strings.sidebar.xml
index af02c7fef..2f508bc6d 100644
--- a/Habitica/res/values-it/strings.sidebar.xml
+++ b/Habitica/res/values-it/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Messaggi</string>
     <string name="sidebar_tavern">Taverna</string>
     <string name="sidebar_party">Squadra</string>
-    <string name="sidebar_purchaseGems">Gemme e abbonamento</string>
     <string name="sidebar_guilds">Gilde</string>
     <string name="sidebar_challenges">Sfide</string>
     <string name="sidebar_section_inventory">Inventario</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index ab5ddebfc..8a5085e4c 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -373,9 +373,6 @@
     <string name="subscribe_prompt_thanks">Otterrai questi vantaggi abbonandoti</string>
     <string name="subscription_status">Stato abbonamento</string>
     <string name="challenge_leave_title">Abbandona sfida</string>
-    <string name="challenge_leave_text">Vuoi davvero abbandonare la sfida \"%s\"?</string>
-    <string name="challenge_remove_tasks_title">Rimuovi attività</string>
-    <string name="challenge_remove_tasks_text">Vuoi rimuovere le attività?</string>
     <string name="remove_tasks">Rimuovi</string>
     <string name="keep_tasks">Tieni</string>
     <string name="my_challenges">Le mie sfide</string>
@@ -670,8 +667,6 @@
     <string name="send_gift">Invia un Regalo</string>
     <string name="server">Server</string>
     <string name="gift_confirmation_title">Il tuo regalo è stato inviato!</string>
-    <string name="gift_confirmation_text_g1g1">L\'abbonamento regalato è stato ricevuto e l\'abbonamento corrispondente applicato al tuo profilo.</string>
-    <string name="gift_confirmation_text">L\'abbonamento regalato è stato ricevuto e l\'abbonamento corrispondente applicato al tuo profilo.</string>
     <string name="discover">Scopri</string>
     <string name="damage_paused">Danni sospesi</string>
     <string name="notifications">Notifiche</string>
@@ -772,7 +767,7 @@
     <string name="login_incentive_short">Accedi ad Habitica regolarmente</string>
     <string name="party_invite_short">Invita degli Amici</string>
     <string name="login_incentive_count">Sbloccalo accedendo ad Habitica %d volte.</string>
-    <string name="user_level_with_class_unabbreviated">Livello %1$d &amp;2$s</string>
+    <string name="user_level_with_class_unabbreviated">Livello %1$d &amp;%2$s</string>
     <string name="remaining_1hour">1 ora rimanente</string>
     <string name="remaining_hours">%d ore rimanenti</string>
     <string name="remaining_days">%d giorni rimanenti</string>
diff --git a/Habitica/res/values-iw/strings.sidebar.xml b/Habitica/res/values-iw/strings.sidebar.xml
index 9a10bb13c..a218a2aa3 100644
--- a/Habitica/res/values-iw/strings.sidebar.xml
+++ b/Habitica/res/values-iw/strings.sidebar.xml
@@ -5,7 +5,6 @@
   <string name="sidebar_section_social">חברתי</string>
   <string name="sidebar_tavern">פונדק</string>
   <string name="sidebar_party">חבורה</string>
-  <string name="sidebar_purchaseGems">קנה אבני חן</string>
   <string name="sidebar_guilds">גילדות</string>
   <string name="sidebar_challenges">אתגרים</string>
   <string name="sidebar_section_inventory">מלאי ציוד</string>
diff --git a/Habitica/res/values-ja/strings.sidebar.xml b/Habitica/res/values-ja/strings.sidebar.xml
index c36bdf8ee..630d3b385 100644
--- a/Habitica/res/values-ja/strings.sidebar.xml
+++ b/Habitica/res/values-ja/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">メッセージ</string>
     <string name="sidebar_tavern">キャンプ場</string>
     <string name="sidebar_party">パーティー</string>
-    <string name="sidebar_purchaseGems">ジェムの購入</string>
     <string name="sidebar_guilds">ギルド</string>
     <string name="sidebar_challenges">チャレンジ</string>
     <string name="sidebar_section_inventory">所持品</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 0f3e2366e..29d23bc31 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -371,9 +371,6 @@
     <string name="subscribe_prompt_thanks">有料会員はこれらの特典を受けられます</string>
     <string name="subscription_status">有料プランの状況</string>
     <string name="challenge_leave_title">チャレンジから抜ける</string>
-    <string name="challenge_leave_text">本当にチャレンジ「%s」を抜けますか？</string>
-    <string name="challenge_remove_tasks_title">タスクを削除</string>
-    <string name="challenge_remove_tasks_text">タスクを削除しますか？</string>
     <string name="remove_tasks">削除する</string>
     <string name="keep_tasks">残す</string>
     <string name="my_challenges">マイチャレンジ</string>
@@ -851,7 +848,7 @@
     <string name="mountMasterDescription">すべての乗騎を手なずけたので、「乗騎使い」の実績を解除しました！</string>
     <string name="mountMasterTitle">乗騎使い</string>
     <string name="beastMasterDescription">全てのペットを集めたため、「獣使い」の実績を獲得しました！</string>
-    <string name="mystery_item_received">宝箱を開け、%@を見つけました</string>
+    <string name="mystery_item_received">宝箱を開け、%sを見つけました</string>
     <string name="removed_member">%sはグループから解除されました</string>
     <string name="transfer">移譲する</string>
     <string name="remove_member_confirm">本当に%sをグループから解除しますか？</string>
@@ -1108,4 +1105,4 @@
     <string name="hatch_your_pet">ペットを孵化しましょう</string>
     <string name="use_saddle">くらを使う</string>
     <string name="magic_potion">魔法の薬</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-ko/strings.sidebar.xml b/Habitica/res/values-ko/strings.sidebar.xml
index ec8232f91..a3e717ba5 100644
--- a/Habitica/res/values-ko/strings.sidebar.xml
+++ b/Habitica/res/values-ko/strings.sidebar.xml
@@ -5,7 +5,6 @@
     <string name="sidebar_section_social">소셜</string>
     <string name="sidebar_tavern">주막</string>
     <string name="sidebar_party">파티</string>
-    <string name="sidebar_purchaseGems">보석 &amp; 구독</string>
     <string name="sidebar_guilds">길드</string>
     <string name="sidebar_challenges">도전</string>
     <string name="sidebar_section_inventory">인벤토리</string>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 424f8a548..e3012995c 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -358,9 +358,6 @@
     <string name="subscribe_prompt_thanks">구독자가 되시면 다음과 같은 혜택을 받을 수 있습니다</string>
     <string name="subscription_status">구독상황</string>
     <string name="challenge_leave_title">도전 그만두기</string>
-    <string name="challenge_leave_text">정말로 “%s” 도전을 그만 두시겠습니까?</string>
-    <string name="challenge_remove_tasks_title">할일 제거</string>
-    <string name="challenge_remove_tasks_text">할일을 제거하고 싶으신가요?</string>
     <string name="remove_tasks">제거하기</string>
     <string name="keep_tasks">놔두기</string>
     <string name="my_challenges">나의 도전들</string>
@@ -682,8 +679,6 @@
     <string name="send_gift">선물하기</string>
     <string name="server">서버</string>
     <string name="gift_confirmation_title" formatted="false">선물이 전달되었습니다!</string>
-    <string name="gift_confirmation_text_g1g1" formatted="false">하나 주고 하나 받기 이벤트를 통해 %s에게 %s-개월 Habitica 정기구독을 선물하였고 같은 기간의 구독 혜택이 본인에게도 적용되었습니다!</string>
-    <string name="gift_confirmation_text">%s에게 %s-개월 Habitica 구독서비스가 전달되었습니다.</string>
     <string name="discover">찾아보기</string>
     <string name="damage_paused">피해 동결 중</string>
     <string name="preference_push_important_announcements">중대 발표</string>
diff --git a/Habitica/res/values-land/bools.xml b/Habitica/res/values-land/bools.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/Habitica/res/values-land/bools.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-land/dimens.xml b/Habitica/res/values-land/dimens.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/Habitica/res/values-land/dimens.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-lt/strings.sidebar.xml b/Habitica/res/values-lt/strings.sidebar.xml
index ac7caf850..326b41caa 100644
--- a/Habitica/res/values-lt/strings.sidebar.xml
+++ b/Habitica/res/values-lt/strings.sidebar.xml
@@ -5,7 +5,6 @@
   <string name="sidebar_section_social">Bendruomenė</string>
   <string name="sidebar_tavern">Smuklė</string>
   <string name="sidebar_party">Grupė</string>
-  <string name="sidebar_purchaseGems">Pirkti Brangakmenius</string>
   <string name="sidebar_guilds">Gildijos</string>
   <string name="sidebar_challenges">Iššūkiai</string>
   <string name="sidebar_section_inventory">Inventorius</string>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index a1087f858..8b38aad82 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -385,7 +385,4 @@
     <string name="subscription_status">Prenumeratos būsena</string>
 
     <string name="challenge_leave_title">Palikite iššūkį</string>
-    <string name="challenge_leave_text">Ar tikrai norite palikti iššūkį „%s“\?</string>
-    <string name="challenge_remove_tasks_title">Pašalinkite užduotis</string>
-    <string name="challenge_remove_tasks_text">Ar norite pašalinti užduotis\?</string>
     </resources>
diff --git a/Habitica/res/values-nb-rNO/strings.profile.xml b/Habitica/res/values-nb-rNO/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-nb-rNO/strings.profile.xml
+++ b/Habitica/res/values-nb-rNO/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-nb-rNO/strings.sidebar.xml b/Habitica/res/values-nb-rNO/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-nb-rNO/strings.sidebar.xml
+++ b/Habitica/res/values-nb-rNO/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-nb-rNO/strings.tutorial.xml b/Habitica/res/values-nb-rNO/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-nb-rNO/strings.tutorial.xml
+++ b/Habitica/res/values-nb-rNO/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-night/colors.contributor.xml b/Habitica/res/values-night/colors.contributor.xml
new file mode 100644
index 000000000..238101d52
--- /dev/null
+++ b/Habitica/res/values-night/colors.contributor.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="contributor_0">#E6E6E6</color>
+    <color name="contributor_1">#E62E84</color>
+    <color name="contributor_2">#E61C1C</color>
+    <color name="contributor_3">#E61017</color>
+    <color name="contributor_4">#E65C00</color>
+    <color name="contributor_5">#E69215</color>
+    <color name="contributor_6">#4CE6AD</color>
+    <color name="contributor_7">#25D5E6</color>
+    <color name="contributor_mod">#35ABE6</color>
+    <color name="contributor_staff">#8F50FF</color>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-night/colors.tavern.xml b/Habitica/res/values-night/colors.tavern.xml
new file mode 100644
index 000000000..7ae5acbb0
--- /dev/null
+++ b/Habitica/res/values-night/colors.tavern.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="tavern.nolikes.background">#0A0A0A</color>
+    <color name="tavern.somelikes.background">#464646</color>
+    <color name="tavern.userliked.background">@color/text_green</color>
+    <color name="tavern.nolikes.foreground">@color/gray_400</color>
+    <color name="tavern.somelikes.foreground">@color/gray_700</color>
+    <color name="tavern.userliked.foreground">@color/gray_700</color>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
new file mode 100644
index 000000000..792d12500
--- /dev/null
+++ b/Habitica/res/values-night/colors.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="color_accent">@color/brand_400</color>
+    <color name="text_primary">@color/gray_600</color>
+    <color name="text_secondary">@color/gray_500</color>
+    <color name="text_ternary">@color/gray_400</color>
+    <color name="text_quad">@color/gray_300</color>
+    <color name="text_dimmed">@color/gray_200</color>
+    <color name="text_inverted">@color/gray_10</color>
+    <color name="text_brand">@color/brand_400</color>
+    <color name="text_brand_neon">@color/brand_500</color>
+    <color name="text_red">@color/red_10</color>
+    <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_10</color>
+    <color name="equipment_overview_background">@color/gray_10</color>
+    <color name="inverted_background">@color/gray_10</color>
+    <color name="inverted_background_offset">@color/gray_50</color>
+    <color name="background_red">@color/red_50</color>
+    <color name="background_orange">@color/orange_50</color>
+    <color name="background_yellow">@color/yellow_10</color>
+    <color name="background_green">@color/green_50</color>
+    <color name="background_blue">@color/blue_50</color>
+    <color name="background_teal">@color/teal_50</color>
+    <color name="background_brand">@color/brand_200</color>
+
+    <color name="checkbox_fill">#40000000</color>
+    <color name="checkbox_fill_inactive">#80000000</color>
+    <color name="checkbox_fill_selected">#40ffffff</color>
+    <color name="taskform_gray">#3D3945</color>
+    <color name="reward_buy_button_text">#FFFFB445</color>
+
+    <color name="content_95_alpha">#f21A181D</color>
+    <color name="content_80_alpha">#cc1A181D</color>
+    <color name="content_75_alpha">#bf1A181D</color>
+    <color name="content_50_alpha">#7f1A181D</color>
+    <color name="content_15_alpha">#261A181D</color>
+
+    <color name="text_red_white">@color/white</color>
+    <color name="text_orange_white">@color/white</color>
+    <color name="text_yellow_white">@color/white</color>
+    <color name="text_green_white">@color/white</color>
+    <color name="text_blue_white">@color/white</color>
+    <color name="text_teal_white">@color/white</color>
+    <color name="text_brown_white">@color/white</color>
+    <color name="text_brand_white">@color/white</color>
+    <color name="lightly_tinted_background">@color/brand_50</color>
+    <color name="dialog_background">@color/gray_10</color>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-night/styles.xml b/Habitica/res/values-night/styles.xml
new file mode 100644
index 000000000..4c36495b9
--- /dev/null
+++ b/Habitica/res/values-night/styles.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
+        <item name="android:layout_height">36dp</item>
+        <item name="android:background">@drawable/diamond_button</item>
+        <item name="backgroundTint">@color/brand_400</item>
+        <item name="android:paddingStart">36dp</item>
+        <item name="android:paddingEnd">36dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:shadowColor">@color/transparent</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-nl/strings.sidebar.xml b/Habitica/res/values-nl/strings.sidebar.xml
index 07443f6fe..99ee1a4da 100644
--- a/Habitica/res/values-nl/strings.sidebar.xml
+++ b/Habitica/res/values-nl/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Berichten</string>
     <string name="sidebar_tavern">Herberg</string>
     <string name="sidebar_party">Groep</string>
-    <string name="sidebar_purchaseGems">Edelstenen &amp; abonnement</string>
     <string name="sidebar_guilds">Gilden</string>
     <string name="sidebar_challenges">Uitdagingen</string>
     <string name="sidebar_section_inventory">Boedel</string>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index e9e082a94..8cec08097 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -373,9 +373,6 @@
     <string name="subscribe_prompt_thanks">Je krijgt deze voordelen door Abonnee te zijn</string>
     <string name="subscription_status">Abonnementstatus</string>
     <string name="challenge_leave_title">Verlaat uitdaging</string>
-    <string name="challenge_leave_text">Weet je zeker dat je de uitdaging \"%s\" wilt verlaten?</string>
-    <string name="challenge_remove_tasks_title">Verwijder taken</string>
-    <string name="challenge_remove_tasks_text">Wil je de taken verwijderen?</string>
     <string name="remove_tasks">Verwijderen</string>
     <string name="keep_tasks">Houden</string>
     <string name="my_challenges">Mijn uitdagingen</string>
@@ -787,7 +784,6 @@
     <string name="g1g1_duration">17 december tot 6 januari</string>
     <string name="limited_event">Beperkte gebeurtenis</string>
     <string name="not_participating">Je doet niet mee</string>
-    <string name="unlock_level_short">Niveau %d</string>
     <string name="unlock_previous_short">Voltooi Quest %d</string>
     <string name="unlock_level">Vrijspelen door level %d te behalen</string>
     <string name="unlock_previous">Vrijspelen door de Quest %d te voltooien</string>
diff --git a/Habitica/res/values-no/strings.xml b/Habitica/res/values-no/strings.xml
index 418770e40..993ec2735 100755
--- a/Habitica/res/values-no/strings.xml
+++ b/Habitica/res/values-no/strings.xml
@@ -4,19 +4,15 @@
     <string name="XP_default">Erfaring</string>
     <string name="HP_default">Helsepoeng</string>
     <string name="MP_default">Magipoeng</string>
-    <string name="ERR_pb_barcode">Preferanser kunne ikke lastes inn fra strekkoden</string>
     <!--Prefs-->
     <string name="PS_settings_title">Innstillinger</string>
-    <string name="SP_address_hint">Din egendefinerte server</string>
     <string name="SP_userID_title">Bruker ID</string>
     <string name="SP_userID_summary">Din Bruker ID</string>
     <string name="SP_APIToken_title">API Token</string>
     <string name="SP_APIToken_summary">Din API Token</string>
     <string name="Language_title">Språk</string>
     <string name="Language_summary">Endre Habiticas språk</string>
-    <string name="SP_user_qr_code">Din QR Kode</string>
     <string name="PS_contact_title">Kontakt meg</string>
-    <string name="unknown_error">En feil oppstod...</string>
     <string name="pref_account_header">Bruker</string>
     <string name="pref_first_day_of_the_week_title">Første dag i uken</string>
     <string name="pref_first_day_of_the_week_summary">Første dag i uken i alle kalendere</string>
@@ -24,7 +20,6 @@
     <string name="pref_reminder_checkbox">Aktiver Påminnelse</string>
     <string name="pref_reminder_picker">Sett Tid For Påminnelse</string>
     <string name="pref_cds_header">Egendefinert Starten På Dagen</string>
-    <string name="pref_cds_picker">Sett En Egendefinert Start På Dagen</string>
     <string name="pref_push_notifications_checkbox">Bruker Push-Varslinger</string>
     <string name="push_notifications">Push-Varslinger</string>
     <string name="push_notifications_sum">Sett dine instillinger for push-varslinger</string>
@@ -37,13 +32,7 @@
     <string name="preference_push_your_quest_has_begun">Ditt Oppdrag har Begynt</string>
     <string name="preference_push_invited_to_quest">Invitert til et Oppdrag</string>
     <!--Adding tasks-->
-    <string name="task_value">Verdi</string>
-    <string name="new_todo">Nytt Gjøremål</string>
-    <string name="new_reward">Ny Belønning</string>
-    <string name="new_daily">Nytt Daglig Gjøremål</string>
-    <string name="new_habit">Ny Vane</string>
     <string name="action_edit">Rediger</string>
-    <string name="action_delete">Slett</string>
     <string name="action_cancel">Avbryt</string>
     <string name="login_btn">Logg inn</string>
     <string name="register_btn">Registrer deg</string>
@@ -54,21 +43,15 @@
     <string name="confirmpassword">Bekreft passord</string>
     <string name="logout">Logg ut</string>
     <string name="logout_description">Logg ut av din brukerkonto</string>
-    <string name="account_details">Brukerdetaljer</string>
     <string name="LoginActivityName">Velkommen</string>
-    <string name="string_revive">Gjennoppliv</string>
-    <string name="please_connect">Vær så snill å koble gjennom applikasjonen før du bruker en widget</string>
     <string name="about.title">Om</string>
     <string name="about.libraries">Biblioteker</string>
-    <string name="about.versionhistory">Tidligere versjoner</string>
     <string name="about.habitica_open_source">Habitica er tilgjengelig som et åpen-kilde program på Github</string>
     <string name="about.rate_our_app">Ranger appen vår</string>
     <string name="about.give_us_feedback">Send oss Tilbakemeldinger!</string>
     <string name="about.bugreport">Rapporter en Feil</string>
     <string name="about.source_code">Kildekode</string>
-    <string name="repeatEvery">Gjentas Hver</string>
     <!--Network Errors-->
-    <string name="network_error_title">Tilknytningsfeil</string>
     <string name="network_error_no_network_body">Du er ikke koblet til internett.</string>
     <string name="internal_error_api">Det ser ut som om det er et problem med serveren. Prøv igjen senere.</string>
     <string name="authentication_error_title">Autentiseringsfeil</string>
@@ -78,7 +61,6 @@
     <string name="save_changes">Lagre</string>
     <string name="copy">Kopier</string>
     <string name="notes">Notater</string>
-    <string name="text">Tekst</string>
     <string name="difficulty">Vanskelighetsgrad</string>
     <string name="tags">Merkelapper</string>
     <string name="trivial">Triviell</string>
@@ -90,16 +72,7 @@
     <string name="negative_habit_form">Negativ ( - )</string>
     <string name="checklist">Sjekkliste</string>
     <string name="reminders">Påminnelser</string>
-    <string name="actions">Handlinger</string>
     <string name="attributes">Egenskaper</string>
-    <string name="physical">Styrke</string>
-    <string name="mental">Visdom</string>
-    <string name="frequency">Frekvens</string>
-    <string name="frequency_weekly">På Speifikke Dager i Uka</string>
-    <string name="frequency_daily">Hver X Dag</string>
-    <string name="repeatables_summary_title">Oppsummering</string>
-    <string name="repeatables_title">Gjentagelser</string>
-    <string name="repeatables_on_title">Gjentas På</string>
     <string name="repeatables_frequency_daily">Daglig</string>
     <string name="repeatables_frequency_weekly">Ukentlig</string>
     <string name="repeatables_frequency_monthly">Månedlig</string>
@@ -113,23 +86,14 @@
     <string name="friday">Fredag</string>
     <string name="saturday">Lørdag</string>
     <string name="sunday">Søndag</string>
-    <string name="levelup_button">Hurra!</string>
     <string name="faint_subtitle">Ikke fortvil!</string>
     <string name="faint_header">Du gikk tom for Helsepoeng!</string>
     <string name="faint_button">Fyll på Helse amp; Prøv Igjen</string>
     <string name="filter">Filter</string>
-    <string name="profile_image">Profilbilde</string>
-    <string name="mana_price_button">%d MP</string>
-    <string name="used_skill">Du brukte %1$s for %2$d magipoeng.</string>
     <string name="used_skill_without_mana">Du brukte %1$s.</string>
     <string name="new_checklist_item">Nytt punkt i sjekkliste</string>
-    <string name="add_checklist_item">Legg til</string>
     <string name="skill_progress_title">Bruker Ferdighet</string>
-    <string name="coming_soon">Kommer Snart</string>
-    <string name="chat_flag_confirmation">Er du sikker på at du vil rapportere denne meldingen for overtredelse?</string>
-    <string name="flag_confirm">Flagg Melding</string>
     <string name="unlock_lvl_11">Låses opp i Nivå 11</string>
-    <string name="no_party_message">Du er ikke i en klan. For å bli med i en klan, besøk nettsiden.</string>
     <string name="forgot_pw_btn">Glemt Passord</string>
     <string name="tavern.inn.checkOut">Reaktiver dine Daglige Gjøremål</string>
     <string name="tavern.inn.rest">Pause dine Daglige Gjøremål</string>
@@ -142,8 +106,6 @@
     <string name="dailies">Daglige Gjøremål</string>
     <string name="todos">Gjøremål</string>
     <string name="rewards">Belønninger</string>
-    <string name="taskform.delete.title">Er du sikker?</string>
-    <string name="taskform.delete.message">Vil du virkelig slette?</string>
     <string name="yes">Ja</string>
     <string name="no">Nei</string>
     <string name="quest">Oppdrag</string>
@@ -151,14 +113,12 @@
     <string name="avatar_hair">Hår</string>
     <string name="avatar_shirt">Skjorte</string>
     <string name="avatar_skin">Hud</string>
-    <string name="avatar_ears">Dyreører</string>
     <string name="avatar_base">Grunn</string>
     <string name="avatar_color">Farge</string>
     <string name="avatar_beard">Skjegg</string>
     <string name="avatar_mustache">Bart</string>
     <string name="avatar_flower">Blomst</string>
     <string name="avatar_bangs">Pannelugg</string>
-    <string name="avatar_nothing">Ingenting satt</string>
     <string name="avatar_size">Størrelse</string>
     <string name="avatar_size_slim">Tynn</string>
     <string name="avatar_size_broad">Bred</string>
@@ -173,17 +133,11 @@
     <string name="quest.begin">Start Oppdrag</string>
     <string name="quest.cancel">Avslå Invitasjon</string>
     <string name="quest.abort">Avbryt Oppdrag</string>
-    <string name="quest.leave">Forlat Oppdrag</string>
-    <string name="quest.pending">Venter</string>
-    <string name="quest.accepted">Akseptert</string>
-    <string name="quest.rejected">Avslått</string>
-    <string name="quest.participants">Deltakere</string>
     <string name="version_info">Versjon %1$s (%2$d)</string>
     <string name="sidebar_help">Hjelp &amp; FAQ</string>
     <string name="complete_tutorial">Den er grei!</string>
     <string name="dismiss_tutorial">Minn meg igjen</string>
     <string name="intro_1_subtitle">Velkommen til</string>
-    <string name="intro_1_title">Habitica</string>
     <string name="intro_1_description">Det er tid for å ha det gøy mens du får ting gjort. Bli med over %s andre som forbedrer livene sine med en oppgave om gangen.</string>
     <string name="intro_2_subtitle">Fremskritt i spillet</string>
     <string name="intro_2_title">Fremskritt i livet</string>
@@ -192,11 +146,8 @@
     <string name="intro_3_title">Bli sosial</string>
     <string name="intro_3_description">Hold styr på målene dine med hjelp fra dine venner. Støtt hverandre i livet og i kamp når dere blir bedre sammen!</string>
     <string name="intro_finish_button">Kom i gang!</string>
-    <string name="previous_button">Forrige</string>
     <string name="next_button">Neste</string>
     <string name="skip_button">Hopp over</string>
-    <string name="setup_welcome_description">Velkommen til Habitica, hvor progresjon i spillet vil forbedre ditt virkelige liv! Når du oppnår mål i ditt virkelig liv, låser du opp utstyr, kjæledyr, oppdrag og mer.</string>
-    <string name="setup_welcome_title">Velkommen</string>
     <string name="avatar_setup_description">Så, hvordan vil du se ut? Ikke bekymre deg, du kan endre dette senere.</string>
     <string name="task_setup_description">Utmerket! Så, hva er du interessert i å jobbe med gjennom denne reisen?</string>
     <string name="setup_group_work">Jobb</string>
@@ -227,28 +178,19 @@
     <string name="setup_task_creativity_1">Studer en mester i håndverket</string>
     <string name="setup_task_creativity_2">Jobb på kreativt prosjekt</string>
     <string name="setup_task_creativity_3">Fullfør kreativt prosjekt</string>
-    <string name="gem.purchase.support">Vil du hjelpe oss å holde Habitica gående? Du kan støtte utviklerene ved å kjøpe juveler!\n\nJuveler lar deg kjøpe morsomme bonuser for avataren din, som inkluderer: \n\n - Kule kostymer for din figur\n - Heftige bakgrunner\n - Morsomme oppdrag som belønner deg med kjæredyrsegg\n - Muligheten å endre klasse før nivå 100\n\nTusen takk for at du hjelper oss gjøre Habitica så bra som mulig. Din støtte betyr masse for oss!</string>
     <string name="my_guilds">Mine Laug</string>
     <string name="public_guilds">Offentlige Laug</string>
     <string name="guild">Laug</string>
     <string name="leave">Forlat</string>
     <string name="join">Bli med</string>
-    <string name="leader">Leder</string>
     <string name="gems">Juveler</string>
-    <string name="copy_as_todo">Kopier som Gjøremål</string>
-    <string name="send_pm">Send PM</string>
-    <string name="flag">Flagg</string>
     <string name="delete">Slett</string>
     <string name="name">Navn</string>
     <string name="description">Beskrivelse</string>
     <string name="add_tag">Legg til ny Merkelapp</string>
     <string name="privacy">Privatliv</string>
     <string name="write_message">Skriv Melding</string>
-    <string name="post">Post</string>
     <string name="guild_search_hint">Søk etter laug</string>
-    <string name="todo_due">Forfall: %s</string>
-    <string name="daily_streak">nåværende rekke: %d</string>
-    <string name="todo_has_duedate">Gjøremål har Forfallsdato</string>
     <string name="battle_gear">Kamputstyr</string>
     <string name="costume">Kostyme</string>
     <string name="outfit_head">Hode</string>
@@ -262,9 +204,7 @@
     <string name="wear_costume">Bruk Kostyme</string>
     <string name="equipped">Utstyrt</string>
     <string name="quest_cancel_message">Er du sikker på at du vil avbryte dette oppdraget? Alle aksepterte invitasjoner vil bli tapt. Eieren av oppdraget vil få beholde oppdragsrullen.</string>
-    <string name="quest.invitation">Oppdragsinvitasjon</string>
     <string name="quest_begin_message">Er du sikker? Bare %1$d av dine %2$dklanmedlemmer har blitt med i dette oppdraget! Oppdraget starter automatisk når alle spillere har blitt med eller sa nei til invitasjonen.</string>
-    <string name="quest.invitation.text">Du har blitt invitert til å delta i et oppdrag!</string>
     <string name="today">Idag</string>
     <string name="sidebar_items">Gjenstander</string>
     <string name="eggs">Egg</string>
@@ -276,12 +216,8 @@
     <string name="armoireEquipment">Du fant et stykke skjeldent Utstyr i Kabinettet: %s! Kjempemessig!</string>
     <string name="armoireFood">Du ransaker Kabinettet og finner %1$s %2$s. Hva gjør den her?</string>
     <string name="armoireExp">Du slåss med Kabinettet og får Erfaring. Ta den!</string>
-    <string name="armoireNotesFull">Åpne Kabinettet for å tilfeldig få spesielt Utstyr, Erfaring, eller mat! Utstyr som gjenstår: %d</string>
-    <string name="armoireLastItem">Du har funnet den siste resten av skjeldent Utstyr i det Fortryllede Kabinettet.</string>
-    <string name="armoireNotesEmpty">Kabinettet vill ha nytt Utstyr den første uka hver måned. Frem til da, fortsett å trykke for Erfaring og Mat!</string>
     <string name="sell">Selg (%d Gull)</string>
     <string name="hatch_with_potion">Klekk med mikstur</string>
-    <string name="feed_to_pet">Mat til kjæledyr</string>
     <string name="hatch_egg">Klekk med egg</string>
     <string name="invite_party">Inviter klan</string>
     <string name="dialog_feeding">Mat %s med:</string>
@@ -292,16 +228,7 @@
     <string name="close">Lukk</string>
     <string name="share">Del</string>
     <string name="notification_pet_fed">Du matet din %s!</string>
-    <string name="notification_purchase">Du kjøpte %s</string>
     <string name="notification_purchase_reward">Du kjøpte en premie</string>
-    <string name="sectionpets">Standard</string>
-    <string name="sectionpremiumPets">Magisk Eliksir</string>
-    <string name="sectionquestPets">Oppdrag</string>
-    <string name="sectionspecialPets">Sjelden</string>
-    <string name="sectionmounts">Standard</string>
-    <string name="sectionpremiumMounts">Magisk Eliksir</string>
-    <string name="sectionquestMounts">Oppdrag</string>
-    <string name="sectionspecialMounts">Sjelden</string>
     <string name="world_quest">Verdensoppdrag</string>
     <string name="empty_items">Du har ingen %s</string>
     <string name="user_level">Nivå %d</string>
@@ -315,7 +242,6 @@
     <string name="healer_description">Helbredere er ugjennomtrengelige mot skade, og gir den beskyttelsen videre til andre. Glemte daglige oppgaver og dårlige vaner plager dem ikke mye, og de har måter å få bedre liv fra feiltrinn. Spill som Helbreder hvis du liker å hjelpe andre i Klanen din, eller om tanken på å lure døden gjennom hardt arbeid inspirerer deg!</string>
     <string name="select_class">Velg Klasse</string>
     <string name="opt_out_class">Reserver Deg</string>
-    <string name="opt_out_description">Gidder du ikke bry deg med klasser? Vil du velge sener? Avslå - du vil bli en Kriger uten spesielle muligheter. Du kan lese mer om klassesystemet på wiki-en og aktivere klasser når du vil under Bruker -&gt; Egenskaper.</string>
     <string name="class_confirmation">Er du sikker på at du vil være en %s?</string>
     <string name="class_changed">Du er nå en %s!</string>
     <string name="class_changed_description">Du har nytt standard stridsutstyr som du kan bytte til under Utstyr!</string>
@@ -329,12 +255,9 @@
     <string name="invite_existing_users">Inviter Eksisterende Brukere</string>
     <string name="send">Send</string>
     <string name="invite">Inviter Venner</string>
-    <string name="invite_id_description">Hvis du har venner som allerede bruker Habitica, så inviter dem med Bruker-ID her.</string>
     <string name="invite_email_description">Hvis en venn blir medlem av Habitica via din epost, så vil de automatisk bli invitert til din klan!</string>
     <string name="add_invites">Legg til invitasjoner</string>
-    <string name="user_id">Bruker ID</string>
     <string name="email">Epost</string>
-    <string name="invite_users">Inviter til Klan</string>
     <string name="share_using">Del via</string>
     <string name="share_levelup">Jeg kom til nivå %d i Habitica ved å forbedre mine vaner</string>
     <string name="share_hatched">Jeg klekket akkurat et %1$s %2$s kjæledyr i Habitica ved å fullføre mine virkelige oppgaver!</string>
@@ -342,8 +265,6 @@
     <string name="open_in_store">Åpne i Play Store</string>
     <string name="change_class_confirmation">Er du sikker på at du vil bytte klasse? Det vil koste deg 3 juveler.</string>
     <string name="change_class_equipment_warning">Advarsel: Du vil ikke lenger ha muligheten til å kjøpe utstyr fra %s klassen.</string>
-    <string name="leaderMessage">Melding fra %1$s</string>
-    <string name="leaderName">Leder: %1$s</string>
     <string name="confirm">Bekreft</string>
     <string name="market">Marked</string>
     <string name="timeTravelers">Tidsreisende</string>
@@ -351,36 +272,15 @@
     <string name="party_invite">Lås opp ved å invitere venner</string>
     <string name="login_incentive">Lås opp ved å logge inn i Habitica ofte.</string>
     <string name="create_account">Lås opp ved å lage en konto.</string>
-    <string name="no_gold">Ikke nok Gull</string>
-    <string name="no_potion">Du trenger ikke kjøpe helsemikstur</string>
     <string name="successful_purchase">Kjøpte %1$s</string>
-    <string name="purchase_confirmation_title">Godta kjøp</string>
-    <string name="confirm_purchase_text">Kjøp %1$s for %2$s %3$s</string>
-    <string name="gem">juvel</string>
-    <string name="hourglass">timeglass</string>
-    <string name="hourglasses">timeglass</string>
-    <string name="gold_singular">gull</string>
     <string name="gold_plural">gull</string>
     <string name="chat_message_copied">Melding kopiert til utklippstavlen</string>
-    <string name="copy_chat_message">Copier til utklippstavlen</string>
-    <string name="edit_tag_title">Rediger Merkelapp</string>
     <string name="edit_tag_btn_edit">Rediger</string>
-    <string name="edit_tag_btn_done">Ferdig</string>
-    <string name="edit_tag_btn_delete">Slett</string>
     <string name="confirm_delete_tag_title">Er du sikker?</string>
     <string name="confirm_delete_tag_message">Vil du virkelig slette?</string>
-    <string name="filter_drawer_edit_tags">Rediger Merkelapper</string>
-    <string name="filter_drawer_filter_tags">Filtrer etter Merkelapper</string>
     <!--QR Strings-->
-    <string name="qr_section_title">Få noen til å invitere deg med denne QR Koden</string>
-    <string name="qr_save_message">QR kode lagret på</string>
-    <string name="qr_dialogue_title">Din QR Kode</string>
-    <string name="download">Last Ned</string>
-    <string name="send_new_message">Send ny melding</string>
     <string name="choose_recipient_title">Velge Meldingsmottakeren</string>
     <string name="action_continue">Fortsett</string>
-    <string name="scan_qr_code">Skann QR Kode</string>
-    <string name="enter_recipient_uuid">Tast mottakerens Bruker-ID</string>
     <string name="invited_to_party">Du har blitt invitert til en klan!</string>
     <string name="stats_widget_label">Habitica Statistikk</string>
     <string name="add_task">Legg til Oppgave</string>
@@ -392,7 +292,6 @@
     <string name="widget_habit_button">Habitica Gjør Vane</string>
     <string name="widget_dailies">Habitica Daglige Gjøremål</string>
     <string name="widget_todo_list">Habitica Liste over Gjøremål</string>
-    <string name="widget_add_task">Habitica Legg til Oppgave</string>
     <string name="google_services_missing">Google play tjenester kunne ikke bli funnet.</string>
     <string name="gem.purchase.toolbartitle">Kjøp</string>
     <string name="gem.purchase.title">Ved å kjøpe juveler, så støtter du utviklerne og hjelper til med å holde Habitica i gang.</string>
@@ -448,54 +347,35 @@
     <string name="twelve_months">12 måneder</string>
     <string name="subscribe_prompt_thanks">Får å Abonnerer, så får du disse nyttige egenskapene:</string>
     <string name="subscription_status">Abonnementstatus</string>
-    <string name="byLeader">av %s</string>
-    <string name="challenge_details">Utfordring Detaljer</string>
     <string name="challenge_leave_title">Forlat Utfordring</string>
-    <string name="challenge_leave_text">Er du sikker på at du vil forlate Utfordringen \"%s\"?</string>
-    <string name="challenge_remove_tasks_title">Fjern oppgaver</string>
-    <string name="challenge_remove_tasks_text">Ønsker du å fjerne oppgavene?</string>
     <string name="remove_tasks">Fjern</string>
     <string name="keep_tasks">Behold</string>
     <string name="my_challenges">Mine Utfordringer</string>
-    <string name="public_challenges">Offentlig</string>
-    <string name="challenges">Utfordringer</string>
     <string name="daily">Daglig</string>
     <string name="habit">Vane</string>
     <string name="reward">Belønning</string>
     <string name="todo">Gjøremål</string>
     <string name="official">Offisiell</string>
-    <string name="participating">Deltakende</string>
     <string name="challenge">Utfordring</string>
-    <string name="go_to_challenge">Gå til Utfordring</string>
     <string name="not_part_of_a_challenge">Du er ikke del av noen Utfordringer akkurat nå!</string>
     <string name="join_a_challenge">Bli med på en utfordring for å legge til ferdig organiserte oppgaver til din egen liste. Da kan du kjempe med andre brukere for å vinne prestasjoner og til og med juveler!</string>
     <string name="check_the_public_challenge_tab">Klikk på \"Offentlig\" fanen for å finne en brukergenerert Utfordring som er best tilpasset dine behov!</string>
-    <string name="add_reminder">Legg til Påminnelse</string>
-    <string name="warning">Advarsel</string>
-    <string name="open_settings">Åpne Innstillinger</string>
-    <string name="dont_keep_activities_warning">Det virker som om du har utvikleralternativet \ \"Ikke behold Aktiviteter \\" aktiv. Foreløpig er dette alternativet som forårsaker problemer med habitica appen, så vi anbefaler at du deaktiverer den.</string>
-    <string name="FAQ">Ofte stilte spørsmål</string>
     <string name="special">Spesiell</string>
     <string name="gem_for_gold_description">Siden du abonnereer til Habitica, så kan du kjøpe et antall Juveler med Gull hver måned.</string>
-    <string name="limited_count">%d igjen</string>
     <string name="gem_shop">Juvel</string>
     <string name="mystery_item">Mysteriegjenstand</string>
     <string name="myster_item_notes">Hver måned vil abonnenter motta en mysteriegjenstand. Dette blir som regel utgitt rundt en uke før slutten av måneden.</string>
     <string name="open">Åpne</string>
-    <string name="notification_mystery_item">Du åpner esken og finner %s!</string>
     <string name="checkInRewardEarned">Du hat fått en %1$s som en belønning for din dedikasjon til å forbedre livet ditt.</string>
     <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Din neste premie låses opp etter %1$d Innlogginger</string>
     <string name="pending_approval">venter på godkjenning</string>
     <string name="filters">Filtre</string>
     <string name="done">Ferdig</string>
-    <string name="group_tasks_edit_description">Gruppeoppgaver can ikke bli redigert</string>
-    <string name="group_tasks_edit_title">Kan ikke endre denne oppgaven</string>
     <string name="groups">Grupper</string>
     <string name="all">Alle</string>
     <string name="none">Ingen</string>
     <string name="owned">Eid</string>
     <string name="not_owned">Ikke eid</string>
-    <string name="new_game">Nytt\nSpill</string>
     <string name="login_btn_fb">Logg inn med Facebook</string>
     <string name="login_btn_google">Logg inn med Google</string>
     <string name="action_back">Tilbake</string>
@@ -539,17 +419,13 @@
     <string name="new_challenge_title">Tittel til ny utfordring</string>
     <string name="ownership">Eierforhold</string>
     <string name="inn">Vertshuset</string>
-    <string name="system">System</string>
     <string name="start_quest">Start et nytt Oppdrag</string>
     <string name="leave_party">Forlat Klan</string>
     <string name="party_description">Klanbeskrivelse</string>
-    <string name="abort_confirmation">Er du sikker på at du vil avbryte dette oppdraget? Oppdraget avbrytes for alle i klanen og all fremskritt vil bli borte. Oppdragsrullen returneres til oppdragseier.</string>
-    <string name="leave_quest_confirmation">Er du sikker på av du vil forlate dette aktive oppdraget? All fremskritt du har gjort i oppdraget vil bli borte.</string>
     <string name="number_participants">%1$dDeltakere</string>
     <string name="welcome_back">Velkommen Tilbake</string>
     <string name="yesterdaililes_prompt">Utførte du noen av disse Daglige Gjøremålene i går:</string>
     <string name="start_day">Start Dagen Min</string>
-    <string name="nextPrizeUnlocksIn" formatted="false">Neste premie om %dinnlogginger</string>
     <string name="accepted">Akseptert</string>
     <string name="declined">Ikke akseptert</string>
     <string name="participants">Deltakere</string>
@@ -560,7 +436,6 @@
     <string name="thousand_abbrev">k</string>
     <string name="million_abbrev">m</string>
     <string name="billion_abbrev">b</string>
-    <string name="your_balance">Din balanse:</string>
     <string name="available_until" formatted="false">Tilgjengelig til %s</string>
     <string name="gems_left_max" formatted="false">Månedlige juveler: %1$d/%2$d er igjen</string>
     <string name="gems_left_nomax" formatted="false">Månedlige juveler: %d er igjen</string>
@@ -583,7 +458,6 @@
     <string name="reset_account_confirmation">Tilbakestill kontoen min</string>
     <string name="delete_account_confirmation">Slett kontoen min</string>
     <string name="danger_zone">Fare-sone</string>
-    <string name="nevermind">Bare glem det.</string>
     <string name="resetting_account">Tilbakestilling av konto</string>
     <string name="deleting_account">Sletting av konto</string>
     <string name="insufficientGold">Du må fullføre flere oppgaver før du kan få råd til denne gjenstanden.</string>
diff --git a/Habitica/res/values-pl/strings.sidebar.xml b/Habitica/res/values-pl/strings.sidebar.xml
index e0bdf86d2..08ea5d40b 100644
--- a/Habitica/res/values-pl/strings.sidebar.xml
+++ b/Habitica/res/values-pl/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Wiadomości</string>
     <string name="sidebar_tavern">Karczma</string>
     <string name="sidebar_party">Drużyna</string>
-    <string name="sidebar_purchaseGems">Kup Klejnoty</string>
     <string name="sidebar_guilds">Gildie</string>
     <string name="sidebar_challenges">Wyzwania</string>
     <string name="sidebar_section_inventory">Ekwipunek</string>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 06a666008..2cf2b6500 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -213,6 +213,7 @@
     <string name="quests">Misje</string>
     <string name="pets">Zwierzaki</string>
     <string name="mounts">Wierzchowce</string>
+    <string name="quest_items_found">Znalazłeś %d przedmiot(y/ów) z zadania</string>
     <string name="armoireEquipment">Znalazłeś element rzadkiego Ekwipunku w Skrzyni: %s! Super!</string>
     <string name="armoireFood">Przeszukujesz Skrzynię i znajdujesz %1$s %2$s. Co to tam robi?</string>
     <string name="armoireExp">Mocujesz się ze Skrzynią i zyskujesz Doświadczenie. A masz!</string>
@@ -354,9 +355,6 @@
     <string name="subscribe_prompt_thanks">Za subskrypcję otrzymasz korzyści</string>
     <string name="subscription_status">Status Subskrypcji</string>
     <string name="challenge_leave_title">Opuść wyzwanie</string>
-    <string name="challenge_leave_text">Jesteś pewien, że chcesz opuścić wyzwanie “%s”?</string>
-    <string name="challenge_remove_tasks_title">Usuń zadania</string>
-    <string name="challenge_remove_tasks_text">Czy chcesz usunąć zadania\?</string>
     <string name="remove_tasks">Usuń</string>
     <string name="keep_tasks">Zachowaj</string>
     <string name="my_challenges">Moje wyzwania</string>
diff --git a/Habitica/res/values-pt-rBR/strings.sidebar.xml b/Habitica/res/values-pt-rBR/strings.sidebar.xml
index 84d741a76..6813aa8ec 100644
--- a/Habitica/res/values-pt-rBR/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rBR/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Mensagens</string>
     <string name="sidebar_tavern">Taverna</string>
     <string name="sidebar_party">Grupo</string>
-    <string name="sidebar_purchaseGems">Gemas &amp; Inscrição</string>
     <string name="sidebar_guilds">Guildas</string>
     <string name="sidebar_challenges">Desafios</string>
     <string name="sidebar_section_inventory">Inventário</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 11ea3801c..806100508 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -373,9 +373,6 @@
     <string name="subscribe_prompt_thanks">Você desfruta desses benefícios por ser um(a) assinante</string>
     <string name="subscription_status">Status da assinatura</string>
     <string name="challenge_leave_title">Sair do Desafio</string>
-    <string name="challenge_leave_text">Tem certeza que deseja sair do Desafio “%s”?</string>
-    <string name="challenge_remove_tasks_title">Remover tarefas</string>
-    <string name="challenge_remove_tasks_text">Você quer remover as tarefas?</string>
     <string name="remove_tasks">Remover</string>
     <string name="keep_tasks">Manter</string>
     <string name="my_challenges">Meus Desafios</string>
@@ -905,7 +902,6 @@
     <string name="network_error_no_network_body">Você não está conectado(a) à internet.</string>
     <string name="quest_completed">Missão concluída!</string>
     <string name="not_participating">Você não está participando</string>
-    <string name="unlock_level_short">Nível %d</string>
     <string name="unlock_previous_short">Terminar Missão %d</string>
     <string name="unlock_level">Desbloqueie ao atingir o nível %d</string>
     <string name="unlock_previous">Desbloqueie ao terminar a Missão %d</string>
diff --git a/Habitica/res/values-pt-rPT/strings.sidebar.xml b/Habitica/res/values-pt-rPT/strings.sidebar.xml
index e9c7504ba..869b3126f 100644
--- a/Habitica/res/values-pt-rPT/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rPT/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Mensagens</string>
     <string name="sidebar_tavern">Taberna</string>
     <string name="sidebar_party">Equipa</string>
-    <string name="sidebar_purchaseGems">Comprar Gemas</string>
     <string name="sidebar_guilds">Guildas</string>
     <string name="sidebar_challenges">Desafios</string>
     <string name="sidebar_section_inventory">Inventário</string>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index 2473669fd..a2041dd1a 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -322,8 +322,6 @@
     <string name="twelve_months">12 meses</string>
     <string name="subscription_status">Estado da Subscrição</string>
     <string name="challenge_leave_title">Sair do Desafio</string>
-    <string name="challenge_remove_tasks_title">Remover tarefas</string>
-    <string name="challenge_remove_tasks_text">Deseja remover as tarefas?</string>
     <string name="remove_tasks">Remover</string>
     <string name="keep_tasks">Manter</string>
     <string name="my_challenges">Os Meus Desafios</string>
diff --git a/Habitica/res/values-ro/strings.profile.xml b/Habitica/res/values-ro/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-ro/strings.profile.xml
+++ b/Habitica/res/values-ro/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-ro/strings.sidebar.xml b/Habitica/res/values-ro/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-ro/strings.sidebar.xml
+++ b/Habitica/res/values-ro/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-ro/strings.tutorial.xml b/Habitica/res/values-ro/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-ro/strings.tutorial.xml
+++ b/Habitica/res/values-ro/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-ro/strings.xml b/Habitica/res/values-ro/strings.xml
index f702987ea..3ae7b2ad5 100755
--- a/Habitica/res/values-ro/strings.xml
+++ b/Habitica/res/values-ro/strings.xml
@@ -4,19 +4,15 @@
     <string name="XP_default">Experienţă</string>
     <string name="HP_default">Sănătate</string>
     <string name="MP_default">Mana</string>
-    <string name="ERR_pb_barcode">Preferințele nu au putut fi încărcate din codul de bare</string>
     <!--Prefs-->
     <string name="PS_settings_title">Setari</string>
-    <string name="SP_address_hint">Serverul dvs. personalizat</string>
     <string name="SP_userID_title">Nume Utilizator</string>
     <string name="SP_userID_summary">Numele tau de utilizator</string>
     <string name="SP_APIToken_title">Token API</string>
     <string name="SP_APIToken_summary">Tokenul tau API</string>
     <string name="Language_title">Limba</string>
     <string name="Language_summary">Schimbă limba în Habitica</string>
-    <string name="SP_user_qr_code">Codul tau QR</string>
     <string name="PS_contact_title">Contacteaza-ma</string>
-    <string name="unknown_error">A aparut o eroare…</string>
     <string name="pref_account_header">Cont</string>
     <string name="pref_first_day_of_the_week_title">Prima zi a saptamanii</string>
     <string name="pref_first_day_of_the_week_summary">Prima zi a saptamanii in toate calendarele</string>
@@ -24,7 +20,6 @@
     <string name="pref_reminder_checkbox">Activați Memento</string>
     <string name="pref_reminder_picker">Setați ora pentru memento</string>
     <string name="pref_cds_header">Ziua de pornire personalizată</string>
-    <string name="pref_cds_picker">Setează-ți o oră personalizată de început a zilei</string>
     <string name="pref_push_notifications_checkbox">Utilizează Notificări Push</string>
     <string name="push_notifications">Notificări Push</string>
     <string name="push_notifications_sum">Setează-ți notificările push</string>
@@ -37,13 +32,7 @@
     <string name="preference_push_your_quest_has_begun">Expediția ta a inceput</string>
     <string name="preference_push_invited_to_quest">Invitat în Expediție</string>
     <!--Adding tasks-->
-    <string name="task_value">Valoare</string>
-    <string name="new_todo">Nou To-Do</string>
-    <string name="new_reward">Răsplată noua</string>
-    <string name="new_daily">Sarcină Zilnică Noua</string>
-    <string name="new_habit">Obicei Nou</string>
     <string name="action_edit">Editare</string>
-    <string name="action_delete">Șterge</string>
     <string name="action_cancel">Anulare</string>
     <string name="login_btn">Autentificare</string>
     <string name="register_btn">Inregistrare</string>
@@ -54,21 +43,15 @@
     <string name="confirmpassword">Confrimare parolă</string>
     <string name="logout">Deconectare</string>
     <string name="logout_description">Deconectați-vă din cont</string>
-    <string name="account_details">Detalii cont</string>
     <string name="LoginActivityName">Bun venit</string>
-    <string name="string_revive">Renaște</string>
-    <string name="please_connect">Conectați-vă prin intermediul aplicației înainte de a utiliza un widget</string>
     <string name="about.title">Despre</string>
     <string name="about.libraries">Biblioteci</string>
-    <string name="about.versionhistory">Istoricul versiunilor</string>
     <string name="about.habitica_open_source">Habitica este disponibil ca software open source pe Github</string>
     <string name="about.rate_our_app">Evaluați aplicația noastră</string>
     <string name="about.give_us_feedback">Trimiteți-ne feedback!</string>
     <string name="about.bugreport">Raporteaza o eroare</string>
     <string name="about.source_code">Cod sursă</string>
-    <string name="repeatEvery">Repetați fiecare</string>
     <!--Network Errors-->
-    <string name="network_error_title">Eroare de conexiune</string>
     <string name="network_error_no_network_body">Nu sunteți conectat(ă) la internet.</string>
     <string name="internal_error_api">Se pare că există o problemă cu serverul. Încercați mai târziu.</string>
     <string name="authentication_error_title">Eroare de autentificare</string>
@@ -78,7 +61,6 @@
     <string name="save_changes">Salvează</string>
     <string name="copy">Copiază</string>
     <string name="notes">undefined</string>
-    <string name="text">Text</string>
     <string name="difficulty">Dificultate</string>
     <string name="tags">Etichete</string>
     <string name="trivial">Banal</string>
@@ -90,18 +72,7 @@
     <string name="negative_habit_form">Negativ ( - )</string>
     <string name="checklist">Listă de verificare</string>
     <string name="reminders">Mementouri</string>
-    <string name="actions">Acțiuni</string>
     <string name="attributes">Atribute</string>
-    <string name="physical">Forță</string>
-    <string name="mental">Inteligență</string>
-    <string name="social">Constituție</string>
-    <string name="other">Percepție</string>
-    <string name="frequency">Frecvență</string>
-    <string name="frequency_weekly">În anumite zile ale săptămânii</string>
-    <string name="frequency_daily">La fiecare X Zile</string>
-    <string name="repeatables_summary_title">Rezumat</string>
-    <string name="repeatables_title">Repetiții</string>
-    <string name="repeatables_on_title">Se repetă pe</string>
     <string name="repeatables_frequency_daily">Zilnic</string>
     <string name="repeatables_frequency_weekly">Săptămânal</string>
     <string name="repeatables_frequency_monthly">Lunar</string>
@@ -115,23 +86,14 @@
     <string name="friday">Vineri</string>
     <string name="saturday">Sâmbătă</string>
     <string name="sunday">Duminică</string>
-    <string name="levelup_button">Huzzah!</string>
     <string name="faint_subtitle">Nu dispera!</string>
     <string name="faint_header">Ai rămas fără Viață</string>
     <string name="faint_button">Reumple-ți Viața &amp; Încearcă din Nou</string>
     <string name="filter">Filtru</string>
-    <string name="profile_image">Imagine de profil</string>
-    <string name="mana_price_button">%dPM</string>
-    <string name="used_skill">Ai folosit %1$s pentru %2$d mana</string>
     <string name="used_skill_without_mana">Ai folosit %1$s.</string>
     <string name="new_checklist_item">obiect nou în checklist</string>
-    <string name="add_checklist_item">Adaugă</string>
     <string name="skill_progress_title">Folosind abilitatea</string>
-    <string name="coming_soon">In curând</string>
-    <string name="chat_flag_confirmation">Sigur doriți să raportați acest mesaj pentru încălcarea regulilor?</string>
-    <string name="flag_confirm">Marchează mesajul</string>
     <string name="unlock_lvl_11">Deblocați la nivelul 11</string>
-    <string name="no_party_message">Nu ești într-o ceată. Pentru a te alătura uneia, te rugăm să vizitezi site-ul.</string>
     <string name="forgot_pw_btn">Parolă uitată</string>
     <string name="tavern.inn.checkOut">Reactivează-ți Cotidienele</string>
     <string name="tavern.inn.rest">Pune pauză Cotidienelor tale</string>
@@ -144,8 +106,6 @@
     <string name="dailies">Sarcini Zilnice</string>
     <string name="todos">De-Făcut</string>
     <string name="rewards">Recompense</string>
-    <string name="taskform.delete.title">Esti sigur?</string>
-    <string name="taskform.delete.message">Chiar vrei să ștergi?</string>
     <string name="yes">Da</string>
     <string name="no">Nu</string>
     <string name="quest">Expediție</string>
@@ -153,14 +113,12 @@
     <string name="avatar_hair">Păr</string>
     <string name="avatar_shirt">Tricou</string>
     <string name="avatar_skin">Piele</string>
-    <string name="avatar_ears">Urechi Animal</string>
     <string name="avatar_base">Bază</string>
     <string name="avatar_color">Culoare</string>
     <string name="avatar_beard">Barbă</string>
     <string name="avatar_mustache">Mustață</string>
     <string name="avatar_flower">Floare</string>
     <string name="avatar_bangs">Breton</string>
-    <string name="avatar_nothing">Nimic setat</string>
     <string name="avatar_size">Mărime</string>
     <string name="avatar_size_slim">Suplu</string>
     <string name="avatar_size_broad">Mare</string>
@@ -175,17 +133,11 @@
     <string name="quest.begin">Incepe expediția</string>
     <string name="quest.cancel">Anulează Invitația</string>
     <string name="quest.abort">Abandonează Expediția</string>
-    <string name="quest.leave">Părăsește Expediția</string>
-    <string name="quest.pending">Iminent</string>
-    <string name="quest.accepted">Acceptat</string>
-    <string name="quest.rejected">Respins</string>
-    <string name="quest.participants">Participanți</string>
     <string name="version_info">Versiunea %1$s (%2$d)</string>
     <string name="sidebar_help">Ajutor &amp; FAQ</string>
     <string name="complete_tutorial">Am înțeles!</string>
     <string name="dismiss_tutorial">Reamintește-mi</string>
     <string name="intro_1_subtitle">Bine ai venit la</string>
-    <string name="intro_1_title">Habitica</string>
     <string name="intro_1_description">E timpul să te distrezi în timp ce îți rezolvi activitățile. Alătură-te celor peste %s alți jucători care-și îmbunătățesc viața cu fiecare sarcină executată. </string>
     <string name="intro_2_subtitle">Progres în joc</string>
     <string name="intro_2_title">Progresul în viață</string>
@@ -194,11 +146,8 @@
     <string name="intro_3_title">Fii social</string>
     <string name="intro_3_description">Păstrează-ți țelurile sub control cu ajutorul prietenilor. Sprijiniți-vă unii pe ceilalți în viață și în bătălii, îmbunătățindu-vă împreună!</string>
     <string name="intro_finish_button">Să începem!</string>
-    <string name="previous_button">Anterior</string>
     <string name="next_button">Următor</string>
     <string name="skip_button">Ocolire</string>
-    <string name="setup_welcome_description">Bine ai venit la Habitica, unde avansând în joc îți va îmbunătăți viața reală! Cu cât îți îndeplinești scopurile din lumea reală, cu atât vei debloca mai mult echipament, mai multe animale de companie, expediții, și altele.</string>
-    <string name="setup_welcome_title">Bun venit!</string>
     <string name="avatar_setup_description">Așadar, cum ai vrea să arăți? Nu-ți face griji, poți modifica asta mai târziu.</string>
     <string name="task_setup_description">Grozav! Acum, la ce ai vrea să lucrezi în timpul acestei călătorii?</string>
     <string name="setup_group_work">Muncă</string>
@@ -229,28 +178,19 @@
     <string name="setup_task_creativity_1">Studiază un o meserie</string>
     <string name="setup_task_creativity_2">Lucrează la un proiect de creativitate</string>
     <string name="setup_task_creativity_3">Finalizează proiectul de creativitate</string>
-    <string name="gem.purchase.support">Vrei să menții Habitica funcțională? Îi poți susține pe developeri cumpărând nestemate!\n\nNestematele îți permit să cumperi lucruri extra amuzante pentru contul tău, incluzând: \n\n - Costume cool pentru avatarul tău\n - Background-uri super\n - Expediții distractive care te recompensează cu ouă de animale de companie\n - Abilitatea de a-ți schimba clasa înainte de nivelul 100\n\nMulțumim foarte mult pentru că ne ajuți să menținem Habitica pe cât de bună poate să fie. Susținerea ta înseamnă mult pentru noi!</string>
     <string name="my_guilds">Breslele mele</string>
     <string name="public_guilds">Bresle publice</string>
     <string name="guild">Breaslă</string>
     <string name="leave">Părăsește</string>
     <string name="join">Alătură-te</string>
-    <string name="leader">Lider</string>
     <string name="gems">Nestemate</string>
-    <string name="copy_as_todo">Copiază ca lucru De-Făcut</string>
-    <string name="send_pm">Trimite Mesaj Privat</string>
-    <string name="flag">Steag</string>
     <string name="delete">Șterge</string>
     <string name="name">Nume</string>
     <string name="description">Descriere</string>
     <string name="add_tag">Adaugă Etichetă nouă</string>
     <string name="privacy">Intimitate</string>
     <string name="write_message">Scrie Mesaj</string>
-    <string name="post">Postează</string>
     <string name="guild_search_hint">Caută bresle</string>
-    <string name="todo_due">Termen: %s</string>
-    <string name="daily_streak">Șir curent: %d</string>
-    <string name="todo_has_duedate">Sarcina are Dată Limită</string>
     <string name="battle_gear">Echipament de Luptă</string>
     <string name="costume">Costum</string>
     <string name="outfit_head">Cap</string>
@@ -264,9 +204,7 @@
     <string name="wear_costume">Poartă Costum</string>
     <string name="equipped">Echipat</string>
     <string name="quest_cancel_message">Ești sigur că vrei să anulezi această expediție? Toate invitațiile acceptate vor fi pierdute. Posesorul aventurii va păstra răvașul expediției.</string>
-    <string name="quest.invitation">Invitație în Expediție</string>
     <string name="quest_begin_message">Ești sigur? Doar %1$d din %2$d dintre membrii cetei tale s-au alăturat acestei expediții! Expedițiile încep automat atunci când toți jucătorii se alătură sau refuză invitația.</string>
-    <string name="quest.invitation.text">Ai fost invitat să participi într-o expediție!</string>
     <string name="today">Astăzi</string>
     <string name="sidebar_items">Obiecte</string>
     <string name="eggs">Ouă</string>
@@ -278,12 +216,8 @@
     <string name="armoireEquipment">Ai găsit o piesă rară de Echipament în Cufăr: %s! Super!</string>
     <string name="armoireFood">Scotocești prin Cufăr și găsești %1$s %2$s. Ce caută asta aici?</string>
     <string name="armoireExp">Te lupți împotriva cufărului și primești Experiență. Ia-o!</string>
-    <string name="armoireNotesFull">Deschide cufărul pentru a primi aleator Echipament special, Experiență, sau hrană! Piese de Echipament rămase: %d</string>
-    <string name="armoireLastItem">Ai găsit ultima piesă rară de Echipament în Cufărul Fermecat</string>
-    <string name="armoireNotesEmpty">Cufărul va conține Echipament nou în prima săptămână din fiecare lună. Până atunci, apasă pentru Experiență și Hrană!</string>
     <string name="sell">Vinde (%d Aur)</string>
     <string name="hatch_with_potion">Eclozează cu o poțiune</string>
-    <string name="feed_to_pet">Hrănește animalul de companie</string>
     <string name="hatch_egg">Eclozează cu un ou</string>
     <string name="invite_party">Invită ceata</string>
     <string name="dialog_feeding">Hrănește %s cu:</string>
@@ -295,16 +229,7 @@
     <string name="close">Închide</string>
     <string name="share">Distribuie</string>
     <string name="notification_pet_fed">Ți-ai hrănit %s!</string>
-    <string name="notification_purchase">Ai achiziționat %s</string>
     <string name="notification_purchase_reward">Ai achiziționat o recompensă</string>
-    <string name="sectionpets">Standard</string>
-    <string name="sectionpremiumPets">Poțiune Magică</string>
-    <string name="sectionquestPets">Expediție</string>
-    <string name="sectionspecialPets">Rar</string>
-    <string name="sectionmounts">Standard</string>
-    <string name="sectionpremiumMounts">Poțiune Magică</string>
-    <string name="sectionquestMounts">Expediție</string>
-    <string name="sectionspecialMounts">Rar</string>
     <string name="world_quest">Expediție Globală</string>
     <string name="inn_description">Ai nevoie de o pauză? Cazează-te în Hanul lui Daniel pentru a pune pauză unora din atributele dificile ale jocului:\n\n
 • Cotidienele ratate nu te vor deteriora\n
@@ -323,7 +248,6 @@
     <string name="healer_description">Vracii sunt protejați împotriva loviturilor și aplică această protecție și altora. Cotidienele ratate și obiceiurile proaste nu îi deranjează așa mult și au modalități de recuperare a sănătății în caz de eșec. Fă-te Vraci dacă îți face plăcere să-i ajuți pe alții din echipa ta sau dacă te inspiră ideea de a trișa Moartea prin muncă asiduă!</string>
     <string name="select_class">Selectează-ți Clasa</string>
     <string name="opt_out_class">Alege să nu iei parte</string>
-    <string name="opt_out_description">Nu te interesează clasele? Vrei să alegi mai târziu? Alege să nu participi - vei fi un luptător fără abilități speciale. Poți citi despre sistemul de clase mai târziu pe wiki și poți activa clasele oricând.</string>
     <string name="class_confirmation">Ești sigur că vrei să fii %s?</string>
     <string name="class_changed">De acum ești %s!</string>
     <string name="class_changed_description">Acum ai Echipament de Luptă de bază, pe care îl poți schimba de la Echipament!</string>
@@ -338,12 +262,9 @@
     <string name="invite_existing_users">Invită Utilizatori existenți</string>
     <string name="send">Trimite</string>
     <string name="invite">Invită Prieteni</string>
-    <string name="invite_id_description">Dacă ai prieteni care utilizează deja Habitica, invită-i prin ID-ul de Utilizator de aici.</string>
     <string name="invite_email_description">Dacă un prieten se alătura Habitica prin intermediul email-ului tău, aceștia vor fi automat invitați în ceata ta!</string>
     <string name="add_invites">Adaugă Invitații</string>
-    <string name="user_id">ID Utilizator</string>
     <string name="email">Email</string>
-    <string name="invite_users">Invită în Ceată</string>
     <string name="share_using">Distribuie utilizând</string>
     <string name="share_levelup">Am ajuns la nivelul %d în Habitica îmbunătățindu-mi obicieiurile din viața reală!</string>
     <string name="share_hatched">Tocmai am eclozat un %1$s%2$s ca animal de companie în Habitica, completându-mi sarcinile din viața reala!</string>
@@ -351,8 +272,6 @@
     <string name="open_in_store">Deschide Play Store</string>
     <string name="change_class_confirmation">Ești sigur că vrei să-ți schimbi clasa? Te va costa 3 nestemate.</string>
     <string name="change_class_equipment_warning">Atenție: Nu vei mai putea cumpăra echipament din clasa %s.</string>
-    <string name="leaderMessage">Mesaj de la %1$s</string>
-    <string name="leaderName">Lider: %1$s</string>
     <string name="confirm">Confirmă</string>
     <string name="market">Târg</string>
     <string name="timeTravelers">Călătorii în Timp</string>
@@ -361,36 +280,15 @@
     <string name="party_invite">Deblochează invitând prieteni</string>
     <string name="login_incentive">Deblochează logându-te în Habitica regulat</string>
     <string name="create_account">Deblochează creând un cont nou</string>
-    <string name="no_gold">Aur insuficient</string>
-    <string name="no_potion">Nu este necesar să cumperi o poțiune de viață</string>
     <string name="successful_purchase">Ai cumpărat %1$s</string>
-    <string name="purchase_confirmation_title">Confirmă achiziția</string>
-    <string name="confirm_purchase_text">Cumpără %1$s pentru %2$s %3$s</string>
-    <string name="gem">nestemată</string>
-    <string name="hourglass">clepsidră</string>
-    <string name="hourglasses">clepsidre</string>
-    <string name="gold_singular">aur</string>
     <string name="gold_plural">aur</string>
     <string name="chat_message_copied">Mesaj copiat în Clipboard</string>
-    <string name="copy_chat_message">Copiază în clipboard</string>
-    <string name="edit_tag_title">Editează Eticheta</string>
     <string name="edit_tag_btn_edit">Editează</string>
-    <string name="edit_tag_btn_done">Gata</string>
-    <string name="edit_tag_btn_delete">Șterge</string>
     <string name="confirm_delete_tag_title">Ești sigur(ă)?</string>
     <string name="confirm_delete_tag_message">Ești sigur(ă) că vrei să ștergi?</string>
-    <string name="filter_drawer_edit_tags">Editează Etichetele</string>
-    <string name="filter_drawer_filter_tags">Filtrează în funcție de Etichetă</string>
     <!--QR Strings-->
-    <string name="qr_section_title">Ajută pe cineva să te invite prin acest Cod QR</string>
-    <string name="qr_save_message">Cod QR salvat la</string>
-    <string name="qr_dialogue_title">Codul tău QR</string>
-    <string name="download">Download</string>
-    <string name="send_new_message">Trimite mesaj nou</string>
     <string name="choose_recipient_title">Alege un Destinatar</string>
     <string name="action_continue">Continuă</string>
-    <string name="scan_qr_code">Scanează Codul QR</string>
-    <string name="enter_recipient_uuid">Introdu ID-ul de Utilizator al Destinatarului</string>
     <string name="invited_to_party">Ai fost invitat să te alături unei cete!</string>
     <string name="stats_widget_label">Status Habitica</string>
     <string name="add_task">Adaugă Sarcină</string>
@@ -402,7 +300,6 @@
     <string name="widget_habit_button">Habitica Respectă Obiceiul</string>
     <string name="widget_dailies">Cotidiene Habitica</string>
     <string name="widget_todo_list">Habitica Listă De-Făcut</string>
-    <string name="widget_add_task">Habitica Adaugă Sarcină</string>
     <string name="google_services_missing">Serviciile play Google nu au putut fi găsite.</string>
     <string name="gem.purchase.toolbartitle">Cumpără</string>
     <string name="gem.purchase.title">Cumpărând nestemate îi ajuți pe developeri și ajuți să păstrezi Habitica funcțională</string>
@@ -458,55 +355,36 @@
     <string name="twelve_months">12 luni</string>
     <string name="subscribe_prompt_thanks">Pentru că te-ai abonat primești următoarele beneficii utile:</string>
     <string name="subscription_status">Statusul abonamentului</string>
-    <string name="byLeader">cu %s</string>
-    <string name="challenge_details">Detaliile Provocării</string>
     <string name="challenge_leave_title">Părăsește Provocarea</string>
-    <string name="challenge_leave_text">Ești sigur că vrei să părăsești Provocarea ”%s”?</string>
-    <string name="challenge_remove_tasks_title">Elimină sarcini</string>
-    <string name="challenge_remove_tasks_text">Dorești să elimini sarcinile?</string>
     <string name="remove_tasks">Elimină</string>
     <string name="keep_tasks">Păstrează</string>
     <string name="my_challenges">Provocările mele</string>
-    <string name="public_challenges">Public</string>
-    <string name="challenges">Provocări</string>
     <string name="daily">Zilnic</string>
     <string name="habit">Obicei</string>
     <string name="reward">Recompensă</string>
     <string name="todo">De-Făcut</string>
     <string name="official">Oficial</string>
-    <string name="participating">Participând</string>
     <string name="challenge">Provocare</string>
-    <string name="go_to_challenge">Mergi la Provocare</string>
     <string name="not_part_of_a_challenge">Nu faci parte din nicio Provocare acum!</string>
     <string name="join_a_challenge">Alătură-te unei Provocări pentru a adăuga un set special ales de sarcini listei tale, apoi intră în competiție împotriva altor Habiticans pentru a câștiga realizări și chiar nestemate!</string>
     <string name="check_the_public_challenge_tab">Apasă pe tab-ul ”Public” pentru a găsi Provocările create de utilizatori care sunt cele mai potrivite pentru tine!</string>
-    <string name="add_reminder">Adaugă Memento</string>
-    <string name="warning">Atenție</string>
-    <string name="open_settings">Deschide Setările</string>
-    <string name="dont_keep_activities_warning">Se pare că ai la dispoziție opțiunea de Developer  \“Don\'t keep Activities\” activă. Momentan, această opțiune cauzează probleme cu aplicația Habitica, și sugerăm așadar dezactivarea ei. </string>
     <string name="inbox">Mesaje</string>
-    <string name="FAQ">Întrebări Frecvente</string>
     <string name="special">Special</string>
     <string name="gem_for_gold_description">Datorită faptului că ești abonat la Habitica, poți cumpăra un anumit număr de Nestemate în fiecare lună, folosind Aur. </string>
-    <string name="limited_count">%d rămase</string>
     <string name="gem_shop">Nestemată</string>
     <string name="mystery_item">Obiect Misterios</string>
     <string name="myster_item_notes">În fiecare lună, abonații vor primi un obiect misterios. Acesta apare de regulă cu aproximativ o săptămână înainte de finalul lunii.</string>
     <string name="open">Deschide</string>
-    <string name="notification_mystery_item">Deschizi cutia și găsești %s!</string>
     <string name="checkInRewardEarned">Ai obținut un/o %1$s ca recompensă pentru devotamentul tău de a-ți îmbunătăți viața.</string>
     <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Următorul tău premiu se deblochează în %1$d Check-In-uri</string>
     <string name="pending_approval">așteaptă acceptul</string>
     <string name="filters">Filtre</string>
     <string name="done">Gata</string>
-    <string name="group_tasks_edit_description">Sarcinile de grup nu pot fi editate.</string>
-    <string name="group_tasks_edit_title">Nu poți edita această sarcină</string>
     <string name="groups">Grupuri</string>
     <string name="all">Toate</string>
     <string name="none">Niciuna</string>
     <string name="owned">Deținut</string>
     <string name="not_owned">Nedeținut</string>
-    <string name="new_game">Joc\nNou</string>
     <string name="login_btn_fb">Logare cu Facebook</string>
     <string name="login_btn_google">Logare cu Google</string>
     <string name="action_back">Înapoi</string>
@@ -551,18 +429,14 @@
     <string name="new_challenge_title">Titlul noii Provocări</string>
     <string name="ownership">Proprietate</string>
     <string name="inn">Han</string>
-    <string name="system">Sistem</string>
     <string name="start_quest">Începe o nouă Expediție</string>
     <string name="leave_party">Părăsește Ceata</string>
     <string name="party_description">Descrierea Cetei</string>
-    <string name="abort_confirmation">Ești sigur că vrei să abandonezi această misiune? O va abandona pentru toată lumea din ceata ta, iar progresul de până acum va fi pierdut. Răvașul Expediției va reveni deținătorului.</string>
-    <string name="leave_quest_confirmation">Ești sigur(ă) că vrei să părăsești această expediție în desfășurare? Tot progresul expediției va fi pierdut.</string>
     <string name="number_participants">%1$d Participanți</string>
     <string name="welcome_back">Bine ai Revenit</string>
     <string name="yesterdaililes_prompt">Bifează Cotidienele făcute ieri:</string>
     <string name="start_day">Începe Ziua</string>
     <string name="leave_party_confirmation">Ești sigur că vrei să părăsești această Ceată?</string>
-    <string name="nextPrizeUnlocksIn" formatted="false">Următorul Premiu în %d Check-In-uri</string>
     <string name="pending">În așteptare</string>
     <string name="accepted">Acceptat</string>
     <string name="declined">Refuzat</string>
@@ -574,7 +448,6 @@
     <string name="thousand_abbrev">k</string>
     <string name="million_abbrev">m</string>
     <string name="billion_abbrev">mld</string>
-    <string name="your_balance">Soldul tău:</string>
     <string name="available_until" formatted="false">Valabil până la %s</string>
     <string name="gems_left_max" formatted="false">Nestemate Lunare: %1$d/%2$d Rămase</string>
     <string name="gems_left_nomax" formatted="false">Nestemate Lunare: %d Rămase</string>
@@ -598,7 +471,6 @@
     <string name="reset_account_confirmation">resetează-mi contul</string>
     <string name="delete_account_confirmation">șterge-mi contul</string>
     <string name="danger_zone">Zona de Pericol</string>
-    <string name="nevermind">Nu mai contează</string>
     <string name="resetting_account">Contul se resetează</string>
     <string name="deleting_account">Contul se șterge</string>
     <string name="insufficientGold">Trebuie să mai completezi sarcini înainte să-ți permiți acest obiect!</string>
@@ -632,7 +504,6 @@
     <string name="authentication_summary">Modifică-ți opțiunile de autentificare.</string>
     <string name="change_password">Schimbă Parola</string>
     <string name="change_email">Schimbă Adresa de Email</string>
-    <string name="change_login_name">Schimbă Numele de Logare</string>
     <string name="change">Schimbă</string>
     <string name="character_level">Nivelul Personajului</string>
     <string name="auto_allocate_points">Alocă Automat Puncte</string>
@@ -663,8 +534,6 @@
     <string name="classless">Fără Clasă</string>
     <string name="class_equipment_shop_dialog">Acest obiect este disponibil doar unei anumite clase.\nÎți poți modifica clasa din Setări.</string>
     <string name="class_gear_disclaimer">Poți achiziționa doar echipament pentru clasa ta actuală</string>
-    <string name="available_stats" formatted="false">%d puncte</string>
-    <string name="toogle_emojis">Toogle Emojis</string>
     <string name="tavern_description">Bine ai venit la Han! Ia un scaun pentru a purta o discuție, sau ia o pauză de la sarcinile tale. </string>
     <string name="check_into_inn">Cazează-te în Han</string>
     <string name="community_guidelines">Ghidurile Comunității</string>
@@ -679,18 +548,12 @@
     <string name="navigation_drawer_open">Deschize sertarul de navigație</string>
     <string name="navigation_drawer_close">Închide sertarul de navigație</string>
     <string name="world_boss">Căpcăunul Global</string>
-    <string name="world_boss_art">Arta Căpcăunului</string>
     <string name="boss_art">Arta Căpcăunului</string>
     <string name="world_boss_description">Descrierea Căpcăunului Global</string>
     <string name="rage_strike_count" formatted="false">Lovituri Furioase: %d/%d</string>
-    <string name="pending_strike_description">Lovitura nu a avut încă loc!\nCăpcăunul Șef se va enerva și îl va ataca pe unul dintre negustorii noștri prietenoși atunci când bara sa de furie se umple. Ține pasul cu Activitățile tale Zilnice pentru a încerca să previi asta!</string>
     <string name="pending_strike_title">Lovitură iminentă</string>
     <string name="strike_description_title">Ce este o Lovitură Furioasă?</string>
-    <string name="strike_description_subtitle">Există 3 potențiale Lovituri Furioase</string>
-    <string name="strike_description_description">Măsurătoarea se umple atunci când Habiticanii nu-și îndeplinesc Activitățile Zilnice. Dacă se umple complet, DysHearener-ul va dezlănțui atacul său cutremurător asupra unuia dintre negustori, așa că ar trebui să te asiguri că-ți îndeplinești sarcinile!</string>
-    <string name="pending_strike_subtitle">Lovitura nu a avut încă loc!</string>
     <string name="strike_active_title" formatted="false">%s a fost Atacat!</string>
-    <string name="strike_active_subtitle" formatted="false">%s este Distrus!</string>
     <string name="strike_active_description" formatted="false">Dragul nostru %s a fost devastat atunci când %s a distrus %s. Îndeplinește-ți sarcinile rapid pentru a înfrânge monstrul și a ajuta la reconstrucție! </string>
     <string name="questShop">Magazinul de Expediții</string>
     <string name="market_owner_long">Alex Negustorul</string>
@@ -701,20 +564,15 @@
     <string name="no_party_description">Pleacă în expediții împreună cu prieteni sau singur. Luptă împotriva monștrilor, crează Provocări, și ajută-te să rămâi responsabil cu ajutorul Cetelor. </string>
     <string name="no_party_title">Joacă Habitica într-o Ceată</string>
     <string name="join_party_title">Vrei să te alături unei cete?</string>
-    <string name="create_party_website">Deschide site-ul pentru a crea o ceată</string>
     <string name="id_copied">ID copiat în clipboard</string>
     <string name="insufficientSubscriberGems">Ai cumpărat toate Nestematele pe care le poți cumpăra luna aceasta. Mai multe vor fi puse la dispuziție în primele trei zile ale fiecărei luni. Mulțumim pentru abonare!</string>
-    <string name="insufficientSubscriberGemsTitle">Limită lunară de Nestemate Atinsă</string>
-    <string name="chat_message">Mesaje în Chat</string>
     <string name="world_boss_description_title">Ce este un Căpcăun Global?</string>
-    <string name="world_boss_description_description">Un Căpcăun Șef este un eveniment special la care toată comunitatea conlucrează pentru a înfrânge un monstru puternic cu sarcinile lor!\nCompletează sarcini pentru a deteriora Căpcăunul\nCăpcăunul nu îți va afecta viața pentru sarcini ratate, dar Furia lui va crește. Dacă instrumentul de măsură se umple, Căpcăunul îl va ataca pe unul din negustori!\nPoți continua să lupți împotriva Căpcăunilor din Expediții, iar deteriorarea va fi aplicată ambilor\nMergi la Tavernă pentru a vedea progresul Căpcăunului și atacurile lui Furioase</string>
     <string name="world_boss_description_intro">Un Căpcăun Șef este un eveniment special în cadrul căruia toată comunitatea lucrează împreună pentru a răpune un monstru cu ajutorul sarcinilor lor!</string>
     <string name="world_boss_description_1">Completează sarcini pentru a deteriora Căpcăunul</string>
     <string name="world_boss_description_2">Căpcăunul nu îți va afecta viața pentru sarcini ratate, dar Furia lui va crește. Dacă instrumentul de măsură se umple, Căpcăunul îl va ataca pe unul din negustori!</string>
     <string name="world_boss_description_3">Poți continua cu Expediții normale împotriva Căpcăunilor, deteriorarea se va aplica ambelor</string>
     <string name="world_boss_description_4">Mergi în Tavernă să vezi progresul Căpcăunului și atacurile Furioase</string>
     <string name="world_boss_action_prompt" formatted="false">Răpune Căpcăunul pentru a primi recompense speciale și pentru a salva Habitica de Teroarea lui %s!</string>
-    <string name="world_boss_description_subtitle">%s atacuri!</string>
     <string name="questShop_owner_long">Ian Ghidul Expedițiilor</string>
     <string name="seasonalShop_owner_long">Vrăjitoarea Sezonului</string>
     <string name="rage_attack">Atac furios:</string>
diff --git a/Habitica/res/values-ru/strings.sidebar.xml b/Habitica/res/values-ru/strings.sidebar.xml
index a17df2a26..2b30094e6 100644
--- a/Habitica/res/values-ru/strings.sidebar.xml
+++ b/Habitica/res/values-ru/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Сообщения</string>
     <string name="sidebar_tavern">Таверна</string>
     <string name="sidebar_party">Команда</string>
-    <string name="sidebar_purchaseGems">Покупка самоцветов</string>
     <string name="sidebar_guilds">Гильдии</string>
     <string name="sidebar_challenges">Испытания</string>
     <string name="sidebar_section_inventory">Инвентарь</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index e7fbfa263..43b4142ac 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -364,9 +364,6 @@
     <string name="subscribe_prompt_thanks">Вы получаете эти преимущества за подписку</string>
     <string name="subscription_status">Статус подписки</string>
     <string name="challenge_leave_title">Покинуть испытание</string>
-    <string name="challenge_leave_text">Вы уверены, что хотите покинуть испытание “%s”?</string>
-    <string name="challenge_remove_tasks_title">Удалить задачи</string>
-    <string name="challenge_remove_tasks_text">Вы уверены, что хотите удалить задачи?</string>
     <string name="remove_tasks">Удалить</string>
     <string name="keep_tasks">Оставить</string>
     <string name="my_challenges">Мои испытания</string>
@@ -671,8 +668,6 @@
     <string name="send_gift">Отправить подарок</string>
     <string name="server">Сервер</string>
     <string name="gift_confirmation_title">Ваш подарок отправлен!</string>
-    <string name="gift_confirmation_text_g1g1">Вы отправили %s месячную подписку Habitica %s, и эта же подписка была применена к вашей учетной записи для нашей акции «Подарок один, получите один»!</string>
-    <string name="gift_confirmation_text">Вы отправили %s один %s-месячную подписку Habitica.</string>
     <string name="discover">Обнаруживать</string>
     <string name="due">Сегодня</string>
     <string name="gift_one_get_one_description">Подарите подписку и получите такую же бесплатно прямо сейчас!</string>
@@ -702,7 +697,6 @@
     <string name="switch_to_list_view">Переключиться на вид списка</string>
     <string name="quest_completed">Квест завершён!</string>
     <string name="not_participating">Вы не принимаете участие</string>
-    <string name="unlock_level_short">Уровень %d</string>
     <string name="gift_a_subscription">Подарить подписку</string>
     <string name="sale">Акция</string>
     <string name="member_group_plan">Участник группового тарифа</string>
diff --git a/Habitica/res/values-sv/strings.tutorial.xml b/Habitica/res/values-sv/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-sv/strings.tutorial.xml
+++ b/Habitica/res/values-sv/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-sv/strings.xml b/Habitica/res/values-sv/strings.xml
index c7dcdb4e2..2a3f58ba9 100755
--- a/Habitica/res/values-sv/strings.xml
+++ b/Habitica/res/values-sv/strings.xml
@@ -4,19 +4,15 @@
     <string name="XP_default">Erfarenhet</string>
     <string name="HP_default">Hälsa</string>
     <string name="MP_default">Mana</string>
-    <string name="ERR_pb_barcode">Preferenser kunde inte laddas ner från streckkoden</string>
     <!--Prefs-->
     <string name="PS_settings_title">Inställningar</string>
-    <string name="SP_address_hint">Din beställningsserver</string>
     <string name="SP_userID_title">Användar-ID</string>
     <string name="SP_userID_summary">Ditt användar-ID</string>
     <string name="SP_APIToken_title">API Token</string>
     <string name="SP_APIToken_summary">Din API Token</string>
     <string name="Language_title">Språk</string>
     <string name="Language_summary">Ändra Habiticas språk</string>
-    <string name="SP_user_qr_code">Din QR-kod</string>
     <string name="PS_contact_title">Kontakta mig</string>
-    <string name="unknown_error">Ett fel har inträffat...</string>
     <string name="pref_account_header">Konto</string>
     <string name="pref_first_day_of_the_week_title">Veckans första dag</string>
     <string name="pref_first_day_of_the_week_summary">Veckans första dag i alla kalendrar</string>
@@ -37,13 +33,7 @@
     <string name="preference_push_your_quest_has_begun">Ditt uppdrag har påbörjats</string>
     <string name="preference_push_invited_to_quest">Inbjudan till uppdrag</string>
     <!--Adding tasks-->
-    <string name="task_value">Värde</string>
-    <string name="new_todo">Ny att-göra</string>
-    <string name="new_reward">Ny Belöning</string>
-    <string name="new_daily">Ny daglig uppgift</string>
-    <string name="new_habit">Ny vana</string>
     <string name="action_edit">Redigera</string>
-    <string name="action_delete">Radera</string>
     <string name="action_cancel">Avbryt</string>
     <string name="login_btn">Logga in</string>
     <string name="register_btn">Registrera dig</string>
@@ -54,21 +44,8 @@
     <string name="confirmpassword">Godkänn lösenord</string>
     <string name="logout">Logga ut</string>
     <string name="logout_description">Logga ut från ditt konto</string>
-    <string name="account_details">Kontoinformation</string>
     <string name="LoginActivityName">Välkommen</string>
-    <string name="string_revive">Återuppliva</string>
-    <string name="please_connect">Var god anslut genom applikationen innan du använder en widget</string>
-    <string name="about.title">Om</string>
-    <string name="about.libraries">Bibliotek</string>
-    <string name="about.versionhistory">Versionhistorik</string>
-    <string name="about.habitica_open_source">Habitica finns tillgängligt som open source program på Github</string>
-    <string name="about.rate_our_app">Betygsätt vår app</string>
-    <string name="about.give_us_feedback">Skicka oss feedback</string>
-    <string name="about.bugreport">Rapportera en bugg</string>
-    <string name="about.source_code">Källkod</string>
-    <string name="repeatEvery">Upprepa varje </string>
     <!--Network Errors-->
-    <string name="network_error_title">Anslutningsfel</string>
     <string name="network_error_no_network_body">Du är inte ansluten till internet.</string>
     <string name="internal_error_api">Det verkar vara ett problem med servern. Försök igen senare.</string>
     <string name="authentication_error_title">Autentiseringsfel</string>
@@ -78,7 +55,6 @@
     <string name="save_changes">Spara</string>
     <string name="copy">Kopiera</string>
     <string name="notes">Anteckningar</string>
-    <string name="text">Text</string>
     <string name="difficulty">Svårighetsgrad</string>
     <string name="tags">Taggar</string>
     <string name="trivial">Trivial</string>
@@ -90,18 +66,7 @@
     <string name="negative_habit_form">Negativ ( - )</string>
     <string name="checklist">Checklista</string>
     <string name="reminders">Påminnelser</string>
-    <string name="actions">Handlingar</string>
     <string name="attributes">Egenskaper</string>
-    <string name="physical">Styrka</string>
-    <string name="mental">Intelligens</string>
-    <string name="social">Tålighet</string>
-    <string name="other">Uppmärksamhet</string>
-    <string name="frequency">Frekvens</string>
-    <string name="frequency_weekly">På särskilda dagar i veckan</string>
-    <string name="frequency_daily">Varje X dagar</string>
-    <string name="repeatables_summary_title">Sammanfattning</string>
-    <string name="repeatables_title">Repeterar </string>
-    <string name="repeatables_on_title">Repeterar på </string>
     <string name="repeatables_frequency_daily">Dagligen</string>
     <string name="repeatables_frequency_weekly">Veckovis</string>
     <string name="repeatables_frequency_monthly">Månadsvis</string>
@@ -115,7 +80,6 @@
     <string name="friday">Fredag</string>
     <string name="saturday">Lördag</string>
     <string name="sunday">Söndag</string>
-    <string name="levelup_button">Hurra!</string>
     <string name="faint_subtitle">Förtvivla inte!</string>
     <string name="faint_header">Din Hälsa tog slut!</string>
     <string name="faint_button">Ladda upp hälsan &amp;amp ; Försök igen</string>
@@ -133,10 +97,6 @@
     <string name="unlock_lvl_11">Låses upp vid nivå 11</string>
     <string name="no_party_message">Du är inte med i något sällskap. För att gå med i ett, besök hemsidan.</string>
     <string name="forgot_pw_btn">Glömt lösenord</string>
-    <string name="tavern.inn.checkOut">Återaktivera dina dagliga uppgifter</string>
-    <string name="tavern.inn.rest">Pausa dina dagliga uppgifter</string>
-    <string name="reward.dialog.buy">Köp</string>
-    <string name="reward.dialog.dismiss">Avfärda</string>
     <string name="party">Sällskap</string>
     <string name="chat">Chatt</string>
     <string name="members">Medlemmar</string>
@@ -144,8 +104,6 @@
     <string name="dailies">Dagliga uppgifter</string>
     <string name="todos">Att Göras</string>
     <string name="rewards">Belöningar</string>
-    <string name="taskform.delete.title">Är du säker?</string>
-    <string name="taskform.delete.message">Vill du verkligen radera?</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
     <string name="quest">Uppdrag</string>
@@ -153,14 +111,12 @@
     <string name="avatar_hair">Hår</string>
     <string name="avatar_shirt">Tröja</string>
     <string name="avatar_skin">Hud</string>
-    <string name="avatar_ears">Djuröron</string>
     <string name="avatar_base">Bas</string>
     <string name="avatar_color">Färg</string>
     <string name="avatar_beard">Skägg</string>
     <string name="avatar_mustache">Mustach</string>
     <string name="avatar_flower">Blomma</string>
     <string name="avatar_bangs">Lugg</string>
-    <string name="avatar_nothing">Inget valt</string>
     <string name="avatar_size">Storlek</string>
     <string name="avatar_size_slim">Smal</string>
     <string name="avatar_size_broad">Bred</string>
@@ -170,22 +126,11 @@
     <string name="purchase_button">Köp</string>
     <string name="purchase_set_title">Köp set %s</string>
     <string name="due_date">Förfallodatum</string>
-    <string name="quest.accept">Acceptera</string>
-    <string name="quest.reject">Avböj</string>
-    <string name="quest.begin">Starta uppdrag</string>
-    <string name="quest.cancel">Avbryt inbjudning</string>
-    <string name="quest.abort">Avbryt uppdrag</string>
-    <string name="quest.leave">Lämna uppdrag</string>
-    <string name="quest.pending">Väntar</string>
-    <string name="quest.accepted">Accepterade</string>
-    <string name="quest.rejected">Avböjde</string>
-    <string name="quest.participants">Deltagare</string>
     <string name="version_info">Version %1$s (%2$d)</string>
     <string name="sidebar_help">Hjälp &amp; FAQ</string>
     <string name="complete_tutorial">Jag fattar!</string>
     <string name="dismiss_tutorial">Påminn mig igen</string>
     <string name="intro_1_subtitle">Välkommen till</string>
-    <string name="intro_1_title">Habitica</string>
     <string name="intro_1_description">Det är dags att ha kul medans du gör saker. Anslut dig till över %s andra som förbättrar sitt liv en uppgift i taget.</string>
     <string name="intro_2_subtitle">Framgång i spelet</string>
     <string name="intro_2_title">Framgång i livet</string>
@@ -194,11 +139,8 @@
     <string name="intro_3_title">Bli social</string>
     <string name="intro_3_description">Håll koll på dina mål med hjälp av dina vänner. Stötta varandra i livet och i strider och förbättras tillsammans!</string>
     <string name="intro_finish_button">Sätt igång!</string>
-    <string name="previous_button">Tillbaka</string>
     <string name="next_button">Nästa</string>
     <string name="skip_button">Hoppa över</string>
-    <string name="setup_welcome_description">Välkommen till Habitica, här får framsteg i spelet dig förbättra ditt verkliga liv! Allteftersom du uppnår dina mål kommer du låsa upp utsustning, husdjur, uppdrag och mer.</string>
-    <string name="setup_welcome_title">Välkommen</string>
     <string name="avatar_setup_description">Så, hur vill du se ut? Ingen fara, du kan alltid ändra detta senare.</string>
     <string name="task_setup_description">Underbart! Nu så, vad är du intresserad av att jobba på genom den här resan?</string>
     <string name="setup_group_work">Arbete</string>
@@ -229,28 +171,19 @@
     <string name="setup_task_creativity_1">Studera en mästare inom hantverket</string>
     <string name="setup_task_creativity_2">Arbeta på ett kreativt projekt</string>
     <string name="setup_task_creativity_3">Slutför ett kreativt projekt</string>
-    <string name="gem.purchase.support">Vill du hjälpa oss att hålla i gång Habitica? Du kan stötta utvecklarna genom att köpa juveler!\n\nFör juveler kan du köpa roliga saker till ditt konto, bland annat: \n\n - coola kostymer för din avatar\n - Snygga bakgrunder\n - Kul uppdrag som belönar dig med husdjursägg\n - Förmågan att ändra din klass innan du når level 100\n\nTack så mycket för att du hjälper oss att göra Habitica bättre. Ditt stöd betyder mycket för oss!</string>
     <string name="my_guilds">Mina gillen</string>
     <string name="public_guilds">Allmänna gillen</string>
     <string name="guild">Gille</string>
     <string name="leave">Lämna</string>
     <string name="join">Gå med</string>
-    <string name="leader">Ledare</string>
     <string name="gems">Juveler</string>
-    <string name="copy_as_todo">Kopiera som en att-göra</string>
-    <string name="send_pm">Skicka PM</string>
-    <string name="flag">Flagga</string>
     <string name="delete">Radera</string>
     <string name="name">Namn</string>
     <string name="description">Beskrivning</string>
     <string name="add_tag">Lägg till tagg</string>
     <string name="privacy">Privat</string>
     <string name="write_message">Skriv meddelande</string>
-    <string name="post">Skicka</string>
     <string name="guild_search_hint">Sök efter gillen</string>
-    <string name="todo_due">Infaller om: %s</string>
-    <string name="daily_streak">Nuvarande följd: %d</string>
-    <string name="todo_has_duedate">Uppgiften har ett förfallodatum</string>
     <string name="battle_gear">Stridsutrustning</string>
     <string name="costume">Kostym</string>
     <string name="outfit_head">Huvud</string>
@@ -264,9 +197,7 @@
     <string name="wear_costume">Använd klädsel</string>
     <string name="equipped">Utrustad</string>
     <string name="quest_cancel_message">Är du säker på att du vill avbryta det här uppdraget? Alla accepterade inbjudningar kommer försvinna. Ägaren av  uppdraget kommer återfå uppdragsskriftrullen.</string>
-    <string name="quest.invitation">Uppdragsinbjudning</string>
     <string name="quest_begin_message">Är du säker? Bara %1$d av dina %2$d sällskapsmedlemmar har gått med i detta uppdrag! Uppdrag startar automatiskt när alla spelare har accepterat eller avvisat inbjudan.</string>
-    <string name="quest.invitation.text">Du har bjudits in att delta i ett uppdrag!</string>
     <string name="today">Idag</string>
     <string name="sidebar_items">Objekt</string>
     <string name="eggs">Ägg</string>
@@ -278,12 +209,8 @@
     <string name="armoireEquipment">Du hittade ovanlig utrustning i vapenskåpet: %s! Fantastiskt!</string>
     <string name="armoireFood">Du krafsar runt i vapenskåpet och hittar %1$s %2$s. Vad gör den här?</string>
     <string name="armoireExp">Du brottas med vapenskåpet och får erfarenhet. Touché!</string>
-    <string name="armoireNotesFull">Öppna vapenskåpet för att slumpmässigt få specialutrsutning, erfarenhet eller mat! Utrustning kvar att hitta: %d</string>
-    <string name="armoireLastItem">Du har hittat den sista ovanliga utrustningen i det förtrollade vapenskåpet.</string>
-    <string name="armoireNotesEmpty">Vapenskåpet kommer ha ny utrustning under den första veckan av varje månad. Tills dess, fortsätt klicka för erfarenhet och mat!</string>
     <string name="sell">Sälj (%d Guld)</string>
     <string name="hatch_with_potion">Kläck med kläckningsdryck</string>
-    <string name="feed_to_pet">Mata husdjur med</string>
     <string name="hatch_egg">Kläck med ägg</string>
     <string name="invite_party">Bjud in sällskap</string>
     <string name="dialog_feeding">Mata %s med:</string>
@@ -294,16 +221,7 @@
     <string name="close">Stäng</string>
     <string name="share">Dela</string>
     <string name="notification_pet_fed">Du matade din %s!</string>
-    <string name="notification_purchase">Du köpte %s</string>
     <string name="notification_purchase_reward">Du köpte en belöning</string>
-    <string name="sectionpets">Standard</string>
-    <string name="sectionpremiumPets">Magisk Dryck</string>
-    <string name="sectionquestPets">Uppdrag</string>
-    <string name="sectionspecialPets">Sällsynt</string>
-    <string name="sectionmounts">Standard</string>
-    <string name="sectionpremiumMounts">Magisk Dryck</string>
-    <string name="sectionquestMounts">Uppdrag</string>
-    <string name="sectionspecialMounts">Sällsynt</string>
     <string name="world_quest">Världsuppdrag</string>
     <string name="empty_items">Du har inga %s</string>
     <string name="user_level">Lvl %d</string>
@@ -317,7 +235,6 @@
     <string name="healer_description">Helare är ogenomträngliga för skada och delar med sig av skyddet till andra. Missade dagliga uppgifter och dåliga vanor påverkar dem inte så mycket, och de har sätt att återställa hälsan efter misslyckanden. Spela som helare om du gillar att hjälpa andra i ditt sällskap eller om tanken på att lura döden genom hårt arbete inspirerar dig!</string>
     <string name="select_class">Välja klass</string>
     <string name="opt_out_class">Välj bort</string>
-    <string name="opt_out_description">Vill du inte bekymra dig om klasser? Vill du välja senare? Välj bort - du kommer att vara en krigare utan speciella egenskaper. Du kan läsa mer om klasssystemet senare på wikin och sätta igång klasser när som helst.</string>
     <string name="class_confirmation">Är du säker på att du vill vara en %s?</string>
     <string name="class_changed">Du är nu en %s!</string>
     <string name="class_changed_description">Du har ny standard Stridsutrustning som du kan ändra under Utrustning!</string>
@@ -332,12 +249,9 @@
     <string name="invite_existing_users">Bjud in existerande användare</string>
     <string name="send">Skicka</string>
     <string name="invite">Bjud in vänner</string>
-    <string name="invite_id_description">Om du har vänner som redan använder  Habitica, bjud in dem med användar ID här.</string>
     <string name="invite_email_description">Om vänner går med i Habitica via ditt mail kommer de automatiskt att bjudas in till ditt sällskap.</string>
     <string name="add_invites">Lägg till inbjudningar</string>
-    <string name="user_id">Användar ID</string>
     <string name="email">Mail</string>
-    <string name="invite_users">Bjud in till sällskap</string>
     <string name="share_using">Dela användning</string>
     <string name="share_levelup">Jag kom till level %d i #Habitica genom att förbättra mina vanor i verkliga livet!</string>
     <string name="share_hatched">Jag kläckte just ett %1$s %2$s husdjur i #Habitica genom att slutföra mina uppgifter!</string>
@@ -345,8 +259,6 @@
     <string name="open_in_store">Öppna i Play Store</string>
     <string name="change_class_confirmation">Är du säker på att du vill ändra din klass? Det kommer kosta 3 juveler.</string>
     <string name="change_class_equipment_warning">Varning: Du kommer inte längre kunna köpa utrustning från %s klassen.</string>
-    <string name="leaderMessage">Meddelande från %1$s</string>
-    <string name="leaderName">Ledare: %1$s</string>
     <string name="confirm">Godkänn</string>
     <string name="market">Affären</string>
     <string name="timeTravelers">Tidsresande</string>
@@ -355,36 +267,15 @@
     <string name="party_invite">Lås upp genom att bjuda in vänner</string>
     <string name="login_incentive">Lås upp genom att logga in på Habitica regelbundet</string>
     <string name="create_account">Lås upp genom att skapa ett konto</string>
-    <string name="no_gold">Du har inte tillräckligt med guld</string>
-    <string name="no_potion">Du behöver inte köpa någon hälsodryck</string>
     <string name="successful_purchase">Köpt %1$s</string>
-    <string name="purchase_confirmation_title">Slutför köp</string>
-    <string name="confirm_purchase_text">Köp %1$s för %2$s %3$s</string>
-    <string name="gem">Juvel</string>
-    <string name="hourglass">Timglas</string>
-    <string name="hourglasses">Timglas</string>
-    <string name="gold_singular">Guld</string>
     <string name="gold_plural">guld</string>
     <string name="chat_message_copied">Meddelandet kopierades till anslagstavlan</string>
-    <string name="copy_chat_message">Kopiera till anslagstavlan</string>
-    <string name="edit_tag_title">Ändra tagg</string>
     <string name="edit_tag_btn_edit">Ändra</string>
-    <string name="edit_tag_btn_done">Klar</string>
-    <string name="edit_tag_btn_delete">Radera</string>
     <string name="confirm_delete_tag_title">Är du säker?</string>
     <string name="confirm_delete_tag_message">Vill du verkligen radera?</string>
-    <string name="filter_drawer_edit_tags">Ändra taggar</string>
-    <string name="filter_drawer_filter_tags">Filtrera efter taggar</string>
     <!--QR Strings-->
-    <string name="qr_section_title">Någon kan bjuda in dig med den här QR-koden</string>
-    <string name="qr_save_message">QR-kod sparad i</string>
-    <string name="qr_dialogue_title">Din QR-kod</string>
-    <string name="download">Ladda ned</string>
-    <string name="send_new_message">Skicka nytt meddelande</string>
     <string name="choose_recipient_title">Välj mottagare</string>
     <string name="action_continue">Fortsätt</string>
-    <string name="scan_qr_code">Skanna QR kod</string>
-    <string name="enter_recipient_uuid">Skriv in mottagares användar ID</string>
     <string name="invited_to_party">Du har bjudits in till ett sällskap!</string>
     <string name="stats_widget_label">Habitica statisktik</string>
     <string name="add_task">Lägg till uppgift</string>
@@ -396,15 +287,7 @@
     <string name="widget_habit_button">Habitica gör vana</string>
     <string name="widget_dailies">Habitica daglig utmaning</string>
     <string name="widget_todo_list">Habitica Att Göra-lista</string>
-    <string name="widget_add_task">Habitica lägg till uppgift</string>
     <string name="google_services_missing">Google play services kunde inte hittas.</string>
-    <string name="gem.purchase.toolbartitle">Köp</string>
-    <string name="gem.purchase.title">Att köpa ädelstenar stöttar utvecklarna och hjälper till att hålla Habitica igång</string>
-    <string name="gem.purchase.subtitle">Ädelstenar låter dig köpa roligt extramaterial till ditt konto, bland annat:</string>
-    <string name="gem.purchase.listitem1">Coola dräkter till din avatar</string>
-    <string name="gem.purchase.listitem2">Häftiga bakgrunder</string>
-    <string name="gem.purchase.listitem3">Uppdrag som belönar dig med husdjursägg</string>
-    <string name="gem.purchase.listitem4">Möjligheten att ändra klass före level 100</string>
     <string name="support_habitica">Stöd Habitica</string>
     <string name="skill_transformation_use">Använd</string>
     <string name="hatching_market_info">Får du inte rätt fynd? Kolla in Marknaden!</string>
@@ -433,8 +316,6 @@
     <string name="subscription">Prenumeration</string>
     <string name="active">Aktiv</string>
     <string name="cancel_subscription">Avbryt prenumeration</string>
-    <string name="cancel_subscription_google.description">Vill du inte längre prenumerera? Du hittar alternativet i \"Mina Appar\" sektionen i Google Play Store.</string>
-    <string name="cancel_subscription_notgoogle.description">Vill du inte längre prenumerera? P.g.a din betalningsmetod kan du bara avsluta din prenumeration genom hemsidan. Klicka på knappen under för att öppna sidan i din webbläsare!</string>
     <string name="visit_habitica_website">Besök Habiticas hemsida</string>
     <string name="current_bonuses">Aktuella bonusar</string>
     <string name="months_subscribed">Köpta månader</string>
@@ -449,52 +330,34 @@
     <string name="twelve_months">12 månader</string>
     <string name="subscribe_prompt_thanks">För att du Prenumererar så får du dessa användbara fördelar:</string>
     <string name="subscription_status">Prenumerationsstatus</string>
-    <string name="byLeader">av %s</string>
-    <string name="challenge_details">Utmaningsdetaljer</string>
     <string name="challenge_leave_title">Lämna utmaning</string>
-    <string name="challenge_leave_text">Är du säker på att du vill lämna Utmaning \"%s\"?</string>
-    <string name="challenge_remove_tasks_title">Ta bort uppgifter</string>
-    <string name="challenge_remove_tasks_text">Vill du ta bort uppgifterna?</string>
     <string name="remove_tasks">Ta bort</string>
     <string name="keep_tasks">Behåll</string>
     <string name="my_challenges">Mina utmaningar</string>
-    <string name="public_challenges">Publik</string>
-    <string name="challenges">Utmaningar</string>
     <string name="daily">Daglig</string>
     <string name="habit">Vana</string>
     <string name="reward">Belöning</string>
     <string name="todo">To-Do</string>
     <string name="official">Officiell</string>
-    <string name="participating">Deltar</string>
     <string name="challenge">Utmaning</string>
-    <string name="go_to_challenge">Gå till utmaning</string>
     <string name="not_part_of_a_challenge">Du är inte med i några utmaningar!</string>
-    <string name="add_reminder">Lägg till påminnelse</string>
-    <string name="warning">Varning</string>
-    <string name="open_settings">Öppna inställningar</string>
     <string name="inbox">Meddelanden</string>
-    <string name="FAQ">Vanliga frågor</string>
     <string name="special">Speciell</string>
     <string name="gem_for_gold_description">För att du prenumererar på Habitica så kan du köpa ett antal Juveler varje månad för Guld.</string>
-    <string name="limited_count">%d kvar</string>
     <string name="gem_shop">Juvel</string>
     <string name="mystery_item">Mysteriskt Objekt</string>
     <string name="myster_item_notes">Varje månad får prenumeranter ett mysteriskt objekt. Den är oftast utgiven ungefär en vecka innan slutet av månaden.</string>
     <string name="open">Öppna</string>
-    <string name="notification_mystery_item">Du öppnade lådan och hittade %s!</string>
     <string name="checkInRewardEarned">Du fick en %1$s som belöning för din hängivenhet till att förbättra ditt liv.</string>
     <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Ditt nästa pris låses upp vid %1$d incheckningar</string>
     <string name="pending_approval">Väntar på godkännande</string>
     <string name="filters">Filter</string>
     <string name="done">Klart</string>
-    <string name="group_tasks_edit_description">Gruppuppgifter kan inte redigeras.</string>
-    <string name="group_tasks_edit_title">Kan inte redigera den här uppgiften</string>
     <string name="groups">Grupper</string>
     <string name="all">Alla</string>
     <string name="none">Inga</string>
     <string name="owned">Äger</string>
     <string name="not_owned">Äger inte</string>
-    <string name="new_game">Nytt\nSpel</string>
     <string name="login_btn_fb">Logga in med Facebook</string>
     <string name="login_btn_google">Logga in med Google</string>
     <string name="action_back">Bakåt</string>
@@ -548,7 +411,6 @@
     <string name="yesterdaililes_prompt">Gjorde du dina dailies igår:</string>
     <string name="start_day">Starta min dag</string>
     <string name="leave_party_confirmation">Är du säker på att du vill lämna partyt?</string>
-    <string name="nextPrizeUnlocksIn" formatted="false">Nästa pris vid %d incheckningar</string>
     <string name="pending">Väntar</string>
     <string name="accepted">Accepterade</string>
     <string name="declined">Nekade</string>
@@ -560,7 +422,6 @@
     <string name="thousand_abbrev">k</string>
     <string name="million_abbrev">m</string>
     <string name="billion_abbrev">b</string>
-    <string name="your_balance">Ditt saldo:</string>
     <string name="available_until" formatted="false">Tillgänglig till %s</string>
     <string name="gems_left_max" formatted="false">Månadsvisa Juveler: %1$d/%2$d Kvarstående</string>
     <string name="gems_left_nomax" formatted="false">Månadsvisa Juveler: %d Kvarstående</string>
@@ -583,7 +444,6 @@
     <string name="reset_account_confirmation">Återställ mitt Konto</string>
     <string name="delete_account_confirmation">Radera mitt Konto</string>
     <string name="danger_zone">Farozon</string>
-    <string name="nevermind">Glöm det</string>
     <string name="resetting_account">Återställer Konto</string>
     <string name="deleting_account">Raderar Konto</string>
     <string name="insufficientGold">Du måste slutföra fler uppgifter innan du har råd med detta objekt!</string>
@@ -613,7 +473,6 @@
     <string name="authentication_summary">Ändra dina autentisering alternativ.</string>
     <string name="change_password">Ändra Lösenord</string>
     <string name="change_email">Ändra Email-address</string>
-    <string name="change_login_name">Ändra inloggningsnamn</string>
     <string name="change">Ändra</string>
     <string name="character_level">Karaktärs-nivå</string>
     <string name="auto_allocate_points">Fördela Poäng Automatiskt</string>
@@ -642,13 +501,10 @@
     <string name="classless">Klasslös</string>
     <string name="class_equipment_shop_dialog">Detta objekt är bara tillgängligt för en specifik klass. Du kan ändra din klass på Inställningar.</string>
     <string name="class_gear_disclaimer">Du kan bara köpa utrustning för din nuvarande klass</string>
-    <string name="available_stats" formatted="false">%d poäng</string>
-    <string name="toogle_emojis">Växla Emojis På &amp; Av</string>
     <string name="view_faq">Visa FAQ</string>
     <string name="report_bug">Rapportera en bugg</string>
     <string name="staff_moderators">Personal och Moderatorer</string>
     <string name="world_boss">Världsboss</string>
-    <string name="strike_active_subtitle" formatted="false">%s är förtvivlad!</string>
     <string name="market_owner_long">Köpmannen Alex</string>
     <string name="tavern_owner_long">Värden Daniel</string>
     <string name="stable_owner_long">Djurmästare Matt</string>
@@ -834,4 +690,4 @@
     <string name="owner">Ägar</string>
     <string name="stat_allocation">Egenskapsfördelning</string>
     <string name="experience_points">Erfarenhetspoäng</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-sw320dp/dimens.xml b/Habitica/res/values-sw320dp/dimens.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/Habitica/res/values-sw320dp/dimens.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-sw600dp/dimens.xml b/Habitica/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 1ba777d65..000000000
--- a/Habitica/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw600dp devices (e.g. 7" tablets) here.
-    -->
-
-</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-th/strings.profile.xml b/Habitica/res/values-th/strings.profile.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-th/strings.profile.xml
+++ b/Habitica/res/values-th/strings.profile.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-th/strings.sidebar.xml b/Habitica/res/values-th/strings.sidebar.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-th/strings.sidebar.xml
+++ b/Habitica/res/values-th/strings.sidebar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-th/strings.tutorial.xml b/Habitica/res/values-th/strings.tutorial.xml
index a6b3daec9..3a0906840 100644
--- a/Habitica/res/values-th/strings.tutorial.xml
+++ b/Habitica/res/values-th/strings.tutorial.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/Habitica/res/values-th/strings.xml b/Habitica/res/values-th/strings.xml
index dd8b0ec3c..beaf86d60 100755
--- a/Habitica/res/values-th/strings.xml
+++ b/Habitica/res/values-th/strings.xml
@@ -9,7 +9,6 @@
   <string name="pref_reminder_picker">ตั้งเวลาแจ้งเตือน</string>
   <!--Adding tasks-->
   <string name="action_edit">แก้ไข</string>
-  <string name="action_delete">ลบ</string>
   <string name="action_cancel">ยกเลิก</string>
   <string name="login_btn">ลงชื่อเข้าใช้งาน</string>
   <string name="register_btn">สมัครสมาชิก</string>
@@ -27,7 +26,6 @@
   <string name="easy">ง่าย</string>
   <string name="medium">ปานกลาง</string>
   <string name="hard">ยาก</string>
-  <string name="frequency_daily">ทุก X วัน</string>
   <string name="monday">จันทร์</string>
   <string name="tuesday">อังคาร</string>
   <string name="wednesday">พุธ</string>
@@ -35,11 +33,8 @@
   <string name="friday">ศุกร์</string>
   <string name="saturday">เสาร์</string>
   <string name="sunday">อาทิตย์</string>
-  <string name="coming_soon">เร็วๆนี้</string>
   <string name="forgot_pw_btn">ลืมรหัสผ่าน</string>
   <string name="rewards">รางวัล</string>
-  <string name="taskform.delete.title">คุณแน่ใจแล้วใช่ไหม?</string>
-  <string name="taskform.delete.message">คุณแน่ใจที่จะลบใช่ไหม?</string>
   <string name="yes">ใช่</string>
   <string name="no">ไม่</string>
   <string name="quest">ภารกิจ</string>
diff --git a/Habitica/res/values-tr/strings.sidebar.xml b/Habitica/res/values-tr/strings.sidebar.xml
index 83b5bc2c9..c20d92837 100644
--- a/Habitica/res/values-tr/strings.sidebar.xml
+++ b/Habitica/res/values-tr/strings.sidebar.xml
@@ -19,4 +19,4 @@
     <string name="sidebar_stats">İstatistikler</string>
     <string name="sidebar_gems">Elmas Satın Al</string>
     <string name="sidebar_subscription">Abonelik</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index dbc54faa5..d411f70eb 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -674,8 +674,6 @@
     <string name="gift_subscription_subtitle">Aşağıdan hediye etmek istediğin aboneliği seç! Bu satın alım otomatik olarak yenilenmeyecek.</string>
     <string name="server">Sunucu</string>
     <string name="gift_confirmation_title">Hediyen gönderildi!</string>
-    <string name="gift_confirmation_text_g1g1">Bir Hediye Et Bir Kazan promosyonuyla %s \'e/a %s-month Habitica aboneliği yolladın ve aynı abonelik sizin hesabınıza da uygulandı!</string>
-    <string name="gift_confirmation_text">%s \'e/a %s-month Habitica üyeliği gönderdin.</string>
     <string name="discover">Keşfet</string>
     <string name="damage_paused">Hasar Durduruldu</string>
     <string name="preference_push_important_announcements">Önemli Duyurular</string>
@@ -1105,4 +1103,4 @@
     <string name="not_now">Şimdi olmaz</string>
     <string name="need_help_header_description">Sorularınızın bir başka oyuncu tarafından cevaplanması için% s içinde bir mesaj gönderin.</string>
     <string name="setup_task_habit_1_notes">Bir Alışkanlık, Günlük İş veya Yapılacak İş</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-uk/strings.profile.xml b/Habitica/res/values-uk/strings.profile.xml
index 01b498387..661c1d03b 100644
--- a/Habitica/res/values-uk/strings.profile.xml
+++ b/Habitica/res/values-uk/strings.profile.xml
@@ -11,4 +11,4 @@
     <string name="profile_mounts_tamed">Приручені скакуни</string>
     <string name="profile_pets_found">Знайдені улюбленці</string>
     <string name="profile_pets_and_mounts">Улюбленці та Скакуни</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-uk/strings.sidebar.xml b/Habitica/res/values-uk/strings.sidebar.xml
index f52df0ff7..90d1b8cf6 100644
--- a/Habitica/res/values-uk/strings.sidebar.xml
+++ b/Habitica/res/values-uk/strings.sidebar.xml
@@ -18,4 +18,4 @@
     <string name="sidebar_section_social">Спілкування</string>
     <string name="sidebar_skills">Вміння</string>
     <string name="sidebar_tasks">Завдання</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-uk/strings.tutorial.xml b/Habitica/res/values-uk/strings.tutorial.xml
index c4ea5ea10..7c7d1c90d 100644
--- a/Habitica/res/values-uk/strings.tutorial.xml
+++ b/Habitica/res/values-uk/strings.tutorial.xml
@@ -16,4 +16,4 @@
     <string name="tutorial_habits_2">Кожен раз коли ви виконуєте позитивну звичку, нажміть +, щоб отримати досвід і золото!</string>
     <string name="tutorial_habits_1">Передусім це звички. Вони можуть бути позитивними, які ви хочете набути або негативними, які хочете кинути.</string>
     <string name="tutorial_overview">Чудово! Я додав кілька задач для тебе, створених на основі твоїх інтересів. Спробуйте додати кілька власних. Ти можеш редагувати будь-яку задачу натиснувши на заголовок.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml
index 0e77f6fca..2595654b5 100755
--- a/Habitica/res/values-uk/strings.xml
+++ b/Habitica/res/values-uk/strings.xml
@@ -1165,4 +1165,4 @@
     <string name="first_drop_explanation2">Перейдіть до своїх предметів та спробуйте об\'єднати яйце так інкубаційне зілля!</string>
     <string name="first_drop_explanation1">Завершення завдань дає вам шанс знайти яйця, інкубаційні зілля та їжу для тварин.</string>
     <string name="purchasedEquipmentDescription">Спорядження може бути практичним, або чисто візуальним. Підіймайте свої характеристики щоб отримати всі види покращень вашого персонажа</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-v23/styles.xml b/Habitica/res/values-v23/styles.xml
index 865537f6b..20860cee5 100644
--- a/Habitica/res/values-v23/styles.xml
+++ b/Habitica/res/values-v23/styles.xml
@@ -9,8 +9,8 @@
         <item name="android:textColor">@color/white_75_alpha</item>
         <item name="android:textColorHint">@color/white_50_alpha</item>
         <item name="android:drawableTint">@color/white_50_alpha</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
         <item name="android:paddingBottom">20dp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-vi/strings.xml b/Habitica/res/values-vi/strings.xml
index 93f4e3422..a5c3f6348 100755
--- a/Habitica/res/values-vi/strings.xml
+++ b/Habitica/res/values-vi/strings.xml
@@ -4,19 +4,15 @@
     <string name="XP_default">Điểm Kinh nghiệm</string>
     <string name="HP_default">Máu</string>
     <string name="MP_default">Mana</string>
-    <string name="ERR_pb_barcode">Không thể tải Prefs từ mã vạch</string>
     <!--Prefs-->
     <string name="PS_settings_title">Cài Đặt</string>
-    <string name="SP_address_hint">Server Tự Tạo Của Bạn</string>
     <string name="SP_userID_title">ID Người Chơi</string>
     <string name="SP_userID_summary">ID Người Chơi của Bạn</string>
     <string name="SP_APIToken_title">Mã API</string>
     <string name="SP_APIToken_summary">Mã API của Bạn</string>
     <string name="Language_title">Ngôn Ngữ</string>
     <string name="Language_summary">Thay đổi Ngôn Ngữ của Habitica</string>
-    <string name="SP_user_qr_code">Mã QR Của Bạn</string>
     <string name="PS_contact_title">Liên hệ với tôi</string>
-    <string name="unknown_error">Đã xảy ra lỗi...</string>
     <string name="pref_account_header">Tài Khoản</string>
     <string name="pref_first_day_of_the_week_title">Ngày Đầu tiên trong Tuần</string>
     <string name="pref_first_day_of_the_week_summary">Ngày Đầu tiên trong Tuần trên tất cả các lịch</string>
@@ -24,7 +20,6 @@
     <string name="pref_reminder_checkbox">Kích hoạt Nhắc Nhở</string>
     <string name="pref_reminder_picker">Thiết lập Thời gian Nhắc nhở</string>
     <string name="pref_cds_header">Tùy chỉnh Ngày Bắt đầu</string>
-    <string name="pref_cds_picker">Đặt thời gian ngày tùy chỉnh bắt đầu</string>
     <string name="pref_push_notifications_checkbox">Sử dụng thông báo đẩy</string>
     <string name="push_notifications">Thông báo Đẩy</string>
     <string name="push_notifications_sum">Thiếp lập Cài đặt Thông báo Đẩy của bạn</string>
@@ -37,13 +32,7 @@
     <string name="preference_push_your_quest_has_begun">Quest của bạn đã Bắt đầu</string>
     <string name="preference_push_invited_to_quest">Đã mời tham gia Quest</string>
     <!--Adding tasks-->
-    <string name="task_value">Giá trị</string>
-    <string name="new_todo">Việc Cần Làm mới</string>
-    <string name="new_reward">Phần Thưởng mới</string>
-    <string name="new_daily">Công Việc Hằng Ngày mới</string>
-    <string name="new_habit">Thói Quen mới</string>
     <string name="action_edit">Chỉnh sửa</string>
-    <string name="action_delete">Xóa</string>
     <string name="action_cancel">Hủy</string>
     <string name="login_btn">Đăng nhập</string>
     <string name="register_btn">Đăng ký</string>
@@ -54,20 +43,8 @@
     <string name="confirmpassword">Xác nhận mật khẩu</string>
     <string name="logout">Đăng xuất</string>
     <string name="logout_description">Thoát tài khoản của bạn</string>
-    <string name="account_details">Chi tiết Tài khoản</string>
     <string name="LoginActivityName">Chào Mừng</string>
-    <string name="string_revive">Hồi sinh</string>
-    <string name="about.title">Về chúng tôi</string>
-    <string name="about.libraries">Thư viện</string>
-    <string name="about.versionhistory">Lịch sử phiên bản</string>
-    <string name="about.habitica_open_source">Habitica là một phần mềm mã nguồn mở trên Github</string>
-    <string name="about.rate_our_app">Đánh giá Ứng dụng của chúng tôi</string>
-    <string name="about.give_us_feedback">Phản hồi cho chúng tôi!</string>
-    <string name="about.bugreport">Báo lỗi</string>
-    <string name="about.source_code">Mã Nguồn</string>
-    <string name="repeatEvery">Lặp lại mỗi</string>
     <!--Network Errors-->
-    <string name="network_error_title">Lỗi Kết nối</string>
     <string name="network_error_no_network_body">Không có kết nối Internet.</string>
     <string name="internal_error_api">Mất kết nối với máy chủ</string>
     <string name="authentication_error_title">Lỗi Ủy quyền</string>
@@ -76,7 +53,6 @@
     <string name="save_changes">Lưu</string>
     <string name="copy">Sao chép</string>
     <string name="notes">Ghi chú</string>
-    <string name="text">Văn bản</string>
     <string name="difficulty">Độ khó</string>
     <string name="tags">Thẻ/Nhãn</string>
     <string name="trivial">Không đáng kể</string>
@@ -88,18 +64,7 @@
     <string name="negative_habit_form">Tiêu cực ( - )</string>
     <string name="checklist">Danh mục</string>
     <string name="reminders">Nhắc nhở</string>
-    <string name="actions">Hành động</string>
     <string name="attributes">Thuộc tính</string>
-    <string name="physical">STR</string>
-    <string name="mental">INT</string>
-    <string name="social">CON</string>
-    <string name="other">PER</string>
-    <string name="frequency">Tần suất</string>
-    <string name="frequency_weekly">Vào những Ngày cụ thể trong Tuần</string>
-    <string name="frequency_daily">Mỗi X ngày</string>
-    <string name="repeatables_summary_title">Tóm lại</string>
-    <string name="repeatables_title">Lặp lại</string>
-    <string name="repeatables_on_title">Lặp lại vào</string>
     <string name="repeatables_frequency_daily">Mỗi ngày</string>
     <string name="repeatables_frequency_weekly">Mỗi tuần</string>
     <string name="repeatables_frequency_monthly">Mỗi tháng</string>
@@ -113,28 +78,15 @@
     <string name="friday">Thứ 6</string>
     <string name="saturday">Thứ 7</string>
     <string name="sunday">Chủ nhật</string>
-    <string name="levelup_button">Hoan hô!</string>
     <string name="faint_subtitle">Đừng tuyệt vọng!</string>
     <string name="faint_header">Bạn đã hết Máu!</string>
     <string name="faint_button">Hồi máu &amp; Thử Lại</string>
     <string name="filter">Màng lọc</string>
-    <string name="profile_image">Hình đại diện</string>
-    <string name="mana_price_button">%d MP</string>
-    <string name="used_skill">Bạn dùng %1$s tốn %2$d mana.</string>
     <string name="used_skill_without_mana">Bạn dùng %1$s.</string>
     <string name="new_checklist_item">mục mới trong danh mục</string>
-    <string name="add_checklist_item">Thêm</string>
     <string name="skill_progress_title">Sử dụng Kĩ Năng</string>
-    <string name="coming_soon">Sắp có mặt</string>
-    <string name="chat_flag_confirmation">Bạn có chắc tin nhắn này vi phạm nội quy không?</string>
-    <string name="flag_confirm">Gắn Cờ </string>
     <string name="unlock_lvl_11">Mở khóa ở Cấp 11</string>
-    <string name="no_party_message">Bạn không ở trong nhóm nào cả. Để tham gia một nhóm, vui lòng ghé thăm trang web.</string>
     <string name="forgot_pw_btn">Quên Mật khẩu</string>
-    <string name="tavern.inn.checkOut">Tái kích hoạt Công Việc Hằng Ngày</string>
-    <string name="tavern.inn.rest">Tạm dừng Công Việc Hằng Ngày</string>
-    <string name="reward.dialog.buy">Mua</string>
-    <string name="reward.dialog.dismiss">Giải tán</string>
     <string name="party">Party</string>
     <string name="chat">Chat</string>
     <string name="members">Thành viên</string>
@@ -142,8 +94,6 @@
     <string name="dailies"> Công Việc Hằng Ngày</string>
     <string name="todos">Việc Cần Làm</string>
     <string name="rewards">Phần Thưởng</string>
-    <string name="taskform.delete.title">Bạn chắc chứ?</string>
-    <string name="taskform.delete.message">Bạn có chắc là muốn xóa không?</string>
     <string name="yes">Có</string>
     <string name="no">Không</string>
     <string name="quest">Nhiệm vụ</string>
@@ -151,7 +101,6 @@
     <string name="avatar_hair">Tóc</string>
     <string name="avatar_shirt">Áo</string>
     <string name="avatar_skin">Da</string>
-    <string name="avatar_ears">Tai Động vật</string>
     <string name="avatar_base">Thân cơ thể</string>
     <string name="avatar_color">Màu da</string>
     <string name="avatar_beard">Râu</string>
@@ -165,28 +114,16 @@
     <string name="purchase_set_button">Mở khóa set với %d Đá Quý </string>
     <string name="purchase_button">Mua</string>
     <string name="purchase_set_title">Mua set %s</string>
-    <string name="quest.accept">Chấp nhận</string>
-    <string name="quest.reject">Từ chối</string>
-    <string name="quest.begin">Bắt đầu Quest</string>
-    <string name="quest.cancel">Hủy lời mời</string>
-    <string name="quest.abort">Hủy Quest</string>
-    <string name="quest.leave">Rời Quest</string>
-    <string name="quest.pending">Đang chờ</string>
-    <string name="quest.accepted">Đã chấp nhận</string>
-    <string name="quest.rejected">Đã từ chối</string>
-    <string name="quest.participants">Người tham gia</string>
     <string name="version_info">Phiên bản %1$s (%2$d)</string>
     <string name="sidebar_help">Giúp đỡ &amp; Những câu hỏi thường gặp</string>
     <string name="complete_tutorial">Đã hiểu!</string>
     <string name="dismiss_tutorial">Nhắc tôi lại lần nữa</string>
     <string name="intro_1_subtitle">Chào mừng đến</string>
-    <string name="intro_1_title">Habitica</string>
     <string name="intro_1_description">Giờ là lúc có được niềm vui khi hoàn thành công việc. Tham gia với %s người khác đang cải thiện cuộc sống của họ với một nhiệm vụ mỗi lần.</string>
     <string name="intro_2_subtitle">Tiến trình trong trò chơi</string>
     <string name="intro_2_title">Tiến trình ngoài đời thực</string>
     <string name="intro_3_subtitle">Chiến đấu quái vật</string>
     <string name="intro_finish_button">Bắt đầu nào!</string>
-    <string name="setup_welcome_description">Chào mừng tới Habitica, nơi mà tiến bộ trong game sẽ cải thiện cuộc sống thực! Khi bạn hoàn thành mục tiêu đời thực, bạn sẽ mở khóa Trang bị, Thú cưng, Nhiệm vụ, và nhiều hơn thế nữa.</string>
     <string name="setup_group_work">Việc làm</string>
     <string name="setup_group_exercise">Thể dục</string>
     <string name="setup_group_health">Sức khỏe</string>
@@ -207,10 +144,7 @@
     <string name="guild">Bang hội</string>
     <string name="leave">Rời</string>
     <string name="join">Tham gia</string>
-    <string name="leader">Người đứng đầu</string>
     <string name="gems">Đá Quý</string>
-    <string name="send_pm">Gửi Tin nhắn riêng</string>
-    <string name="flag">Gắn cờ</string>
     <string name="delete">Xóa</string>
     <string name="name">Tên</string>
     <string name="description">Mô tả</string>
@@ -228,7 +162,6 @@
     <string name="mounts">Thú cưỡi</string>
     <string name="sell">Bán (%d vàng)</string>
     <string name="hatch_with_potion">Ấp bằng Thuốc</string>
-    <string name="feed_to_pet">Cho thú cưng ăn</string>
     <string name="hatch_egg">Ấp bằng trứng</string>
     <string name="dialog_feeding">Cho %s ăn:</string>
     <string name="feed">Cho ăn</string>
@@ -464,9 +397,6 @@
     <string name="my_challenges">Những thử thách của tôi</string>
     <string name="keep_tasks">Giữ</string>
     <string name="remove_tasks">Xóa</string>
-    <string name="challenge_remove_tasks_text">Bạn có muốn xóa những công việc\?</string>
-    <string name="challenge_remove_tasks_title">Xóa công việc</string>
-    <string name="challenge_leave_text">Bạn có chắc muốn rời Thử thách \"%s\"\?</string>
     <string name="challenge_leave_title">Rời Thử thách</string>
     <string name="subscription_status">Trạng thái Gói đăng ký</string>
     <string name="subscribe_prompt_thanks">Bạn có những lợi ích này khi trở thành một Người đăng ký</string>
@@ -902,7 +832,6 @@
     <string name="gift_gems_balance_subtitle">Nhập số lượng Gem bạn muốn gửi ở dưới hoặc đổi qua mục khác để mua Gem rồi tặng</string>
     <string name="quest_completed">Nhiệm vụ hoàn thành!</string>
     <string name="not_participating">Bạn không tham gia</string>
-    <string name="unlock_level_short">Cấp độ %d</string>
     <string name="unlock_previous_short">Hoàn thành Nhiệm vụ %d</string>
     <string name="unlock_level">Mở khóa bằng cách đạt tới cấp độ %d</string>
     <string name="unlock_previous">Mở khóa bằng cách hoàn thành Nhiệm vụ %d</string>
diff --git a/Habitica/res/values-w360dp/styles.xml b/Habitica/res/values-w360dp/styles.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/Habitica/res/values-w360dp/styles.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-zh-rTW/strings.sidebar.xml b/Habitica/res/values-zh-rTW/strings.sidebar.xml
index cb52d06ad..47acf637f 100644
--- a/Habitica/res/values-zh-rTW/strings.sidebar.xml
+++ b/Habitica/res/values-zh-rTW/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">訊息</string>
     <string name="sidebar_tavern">酒館</string>
     <string name="sidebar_party">隊伍</string>
-    <string name="sidebar_purchaseGems">購買寶石</string>
     <string name="sidebar_guilds">公會</string>
     <string name="sidebar_challenges">挑戰</string>
     <string name="sidebar_section_inventory">物品欄</string>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index fda153f0d..825132fdf 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -340,14 +340,11 @@
     <string name="subscribe_listitem1_description">您將可以從市場上以每枚20金幣的價格購買寶石！</string>
     <string name="subscribe_listitem2_description">獲得神秘沙漏在時空穿越者的商店購買物品！</string>
     <string name="subscribe_listitem3_description">現在訂閱，可以得到贈品，和每月得到新的物品！</string>
-    <string name="subscribe_listitem4.description">雙倍掉落讓你每天能夠從完成的任務中得到更多的物品，幫助你更快地馴服坐騎！</string>
     <string name="subscription_hourglasses">%d 個神秘沙漏</string>
     <string name="payment_method">付款方式</string>
     <string name="subscription">訂閱</string>
     <string name="active">活躍的</string>
     <string name="cancel_subscription">取消訂閱</string>
-    <string name="cancel_subscription_google.description">想要取消訂閱嗎？你可以在 Google Play 裡的「我的應用程式」取消訂閱。</string>
-    <string name="cancel_subscription_notgoogle.description">想要取消訂閱嗎？由於你的支付方式，你只能在網站上取消訂閱，點擊下方的按鈕以打開網頁！</string>
     <string name="visit_habitica_website">查訪 Habitica 官方網站</string>
     <string name="current_bonuses">現在的加成獎勵</string>
     <string name="months_subscribed">月訂閱</string>
@@ -363,9 +360,6 @@
     <string name="subscribe_prompt_thanks">成為會員你會得到這些好處</string>
     <string name="subscription_status">訂閱狀態</string>
     <string name="challenge_leave_title">離開挑戰</string>
-    <string name="challenge_leave_text">你確認你要離開\"%s\"挑戰嗎？</string>
-    <string name="challenge_remove_tasks_title">移除任務</string>
-    <string name="challenge_remove_tasks_text">你確定要刪除這個任務嗎？</string>
     <string name="remove_tasks">刪除</string>
     <string name="keep_tasks">保留</string>
     <string name="my_challenges">我的挑戰</string>
@@ -678,8 +672,6 @@
     <string name="send_gift">贈送禮物</string>
     <string name="server">伺服器</string>
     <string name="gift_confirmation_title">你的禮物已送出！</string>
-    <string name="gift_confirmation_text_g1g1">你贈送了 %s 長達 %s 個月的 Habitica 訂閱，同樣時長的訂閱已經發放到你的帳號，這是我們的買一送一促銷活動！</string>
-    <string name="gift_confirmation_text">你贈送了%s長達 %s 個月的 Habitica 訂閱。</string>
     <string name="discover">探索</string>
     <string name="damage_paused">暫停傷害</string>
     <string name="preference_push_important_announcements">重要公告</string>
@@ -739,7 +731,6 @@
     <string name="unlock_previous">完成副本“%d”來解鎖</string>
     <string name="unlock_level">升到%d級來解鎖</string>
     <string name="unlock_previous_short">完成副本“%d”</string>
-    <string name="unlock_level_short">%d級</string>
     <string name="quest_completed">副本已完成！</string>
     <string name="not_participating">你沒有參加這個副本</string>
     <string name="login_incentive_short">定期登錄Habitica</string>
diff --git a/Habitica/res/values-zh/strings.sidebar.xml b/Habitica/res/values-zh/strings.sidebar.xml
index df4ee86dd..379071183 100644
--- a/Habitica/res/values-zh/strings.sidebar.xml
+++ b/Habitica/res/values-zh/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">讯息</string>
     <string name="sidebar_tavern">酒馆</string>
     <string name="sidebar_party">队伍</string>
-    <string name="sidebar_purchaseGems">宝石&amp;开通会员</string>
     <string name="sidebar_guilds">公会</string>
     <string name="sidebar_challenges">挑战</string>
     <string name="sidebar_section_inventory">物品栏</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index acae83aaa..b36f2c6eb 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -372,9 +372,6 @@
     <string name="subscribe_prompt_thanks">成为订阅者你会得到这些好处</string>
     <string name="subscription_status">订阅状态</string>
     <string name="challenge_leave_title">放弃挑战</string>
-    <string name="challenge_leave_text">你是否确定想放弃这个挑战“%s”？</string>
-    <string name="challenge_remove_tasks_title">删除任务</string>
-    <string name="challenge_remove_tasks_text">你确定要删除这个任务吗？</string>
     <string name="remove_tasks">删除</string>
     <string name="keep_tasks">保留</string>
     <string name="my_challenges">我的挑战</string>
@@ -674,8 +671,6 @@
     <string name="send_gift">赠送礼物</string>
     <string name="server">服务器</string>
     <string name="gift_confirmation_title">你的礼物已送出！</string>
-    <string name="gift_confirmation_text_g1g1">你赠送了 %s 长达 %s-月的Habitica会员，同样时长的会员已经发放到你的账户，这是我们的买一送一促销活动！</string>
-    <string name="gift_confirmation_text">你赠送了 %s 长达 %s-月的Habitica 会员。</string>
     <string name="discover">探索</string>
     <string name="damage_paused">暂停伤害</string>
     <string name="preference_push_important_announcements">重要通知</string>
@@ -893,7 +888,6 @@
     <string name="unlock_previous">完成副本“%d”来解锁</string>
     <string name="unlock_level">升到%d级来解锁</string>
     <string name="unlock_previous_short">完成副本“%d”</string>
-    <string name="unlock_level_short">%d级</string>
     <string name="not_participating">你没有参加这个副本</string>
     <string name="quest_completed">副本已完成！</string>
     <string name="empty_title_rewards_filtered">没有奖励</string>
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 0ecb2be9b..5732df5c4 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -131,6 +131,7 @@
     <declare-styleable name="BottomNavigationItem">
         <attr name="title" />
         <attr name="iconDrawable" />
+        <attr name="selectedIconDrawable" format="integer" />
     </declare-styleable>
     <declare-styleable name="EquipmentOverviewItem">
         <attr name="title" />
@@ -148,4 +149,8 @@
         <attr name="maxValue" format="integer" />
         <attr name="minValue" format="integer" />
     </declare-styleable>
+    <declare-styleable name="DayNightTextView">
+        <attr name="dayTextColor" format="color" />
+        <attr name="nightTextColor" format="color" />
+    </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/bools.xml b/Habitica/res/values/bools.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/Habitica/res/values/bools.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.classes.xml b/Habitica/res/values/colors.classes.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/Habitica/res/values/colors.classes.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 2239551b5..fbc8e3eef 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -7,6 +7,7 @@
     <color name="brand_300">#6133B4</color>
     <color name="brand_400">#925CF3</color>
     <color name="brand_500">#bda8ff</color>
+    <color name="brand_600">#D5C8FF</color>
     <color name="brand_700">#ede7f6</color>
     <color name="brand">@color/brand_100</color>
 
@@ -67,22 +68,16 @@
     <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>
 
-    <color name="colorPrimary">@color/brand_300</color>
-    <color name="colorPrimaryDark">@color/brand_50</color>
-    <!-- text -->
     <color name="textColorSecondaryDark">@color/brand_500</color>
-    <color name="textColorLight">#212121</color>
 
     <!-- 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,29 +89,24 @@
 
     <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="checkbox_fill">#50ffffff</color>
+    <color name="cell_separator">@color/separator</color>
+    <color name="checklist_separator">@color/offset_background</color>
     <color name="checkbox_checked_fill">#c8ffffff</color>
     <color name="checkbox_checklist_fill">#23000000</color>
 
     <color name="habit_inactive_gray">#F9F9F9</color>
 
-    <!-- Preferences -->
-    <color name="preference_fallback_accent_color">@color/colorAccent</color>
     <!-- buttons -->
     <color name="btn_success">@color/green_10</color>
     <color name="btn_danger">@color/red_10</color>
 
     <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>
@@ -144,11 +134,11 @@
     <color name="hair_red">#EC720E</color>
     <color name="hair_black">#313131</color>
     <color name="reward_buy_button_bg">#4cfedead</color>
+    <color name="reward_buy_button_text">#D9784A00</color>
     <color name="ic_launcher_background">#331960</color>
-    <color name="scrollbarThumb">@color/gray_500</color>
-    <color name="black">#000</color>
-    <color name="setup_background">#efeff4</color>
-    <color name="setup_label_background">#fafaff</color>
+    <color name="scrollbarThumb">@color/content_background_offset</color>
+    <color name="setup_background">@color/window_background</color>
+    <color name="setup_label_background">@color/offset_background_30</color>
     <color name="animalitem_all_eggs">#6ECDB2</color>
 
     <color name="dark_brown">#794b00</color>
@@ -157,4 +147,66 @@
     <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_10</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_inverted">@color/gray_700</color>
+    <color name="text_brand">@color/brand_300</color>
+    <color name="text_brand_neon">@color/brand_400</color>
+    <color name="text_red">@color/red_10</color>
+    <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_200</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="background_red">@color/red_100</color>
+    <color name="background_orange">@color/orange_100</color>
+    <color name="background_yellow">@color/yellow_100</color>
+    <color name="background_green">@color/green_100</color>
+    <color name="background_blue">@color/blue_100</color>
+    <color name="background_teal">@color/teal_100</color>
+    <color name="background_brand">@color/brand_300</color>
+
+    <color name="checkbox_fill">#50ffffff</color>
+    <color name="checkbox_fill_inactive">#99FFFFFF</color>
+    <color name="checkbox_fill_selected">@color/gray_600</color>
+    <color name="taskform_gray">#99edecee</color>
+
+    <color name="content_95_alpha">#f2ffffff</color>
+    <color name="content_80_alpha">#ccffffff</color>
+    <color name="content_75_alpha">#bfffffff</color>
+    <color name="content_50_alpha">#7fffffff</color>
+    <color name="content_15_alpha">#26ffffff</color>
+
+    <color name="text_red_white">@color/red_10</color>
+    <color name="text_orange_white">@color/orange_10</color>
+    <color name="text_yellow_white">@color/yellow_10</color>
+    <color name="text_green_white">@color/green_10</color>
+    <color name="text_blue_white">@color/blue_10</color>
+    <color name="text_teal_white">@color/teal_10</color>
+    <color name="text_brown_white">#7f3300</color>
+    <color name="text_brand_white">@color/brand_300</color>
+    <color name="lightly_tinted_background">@color/brand_700</color>
+    <color name="dialog_background">@color/white</color>
 </resources>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index d043d5668..3b44e1a66 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -13,7 +13,7 @@
     <dimen name="section_top_padding">16dp</dimen>
     <dimen name="card_margin">6dp</dimen>
 
-    <dimen name="party_invite_button">31dp</dimen>
+    <dimen name="party_invite_button">34dp</dimen>
     <dimen name="party_accept_button_start_margin">5dp</dimen>
     <dimen name="party_invite_avatar">46dp</dimen>  <!--50?-->
     <dimen name="party_invite_separator">4dp</dimen>
@@ -96,7 +96,7 @@
     <dimen name="currency_icon_size">24dp</dimen>
     <dimen name="shopitem_dialog_content_inset">24dp</dimen>
     <dimen name="reward_width">84dp</dimen>
-    <dimen name="task_min_height">50dp</dimen>
+    <dimen name="task_min_height">60dp</dimen>
 
     <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
          https://developer.android.com/design/patterns/navigation-drawer.html -->
@@ -113,7 +113,7 @@
     <dimen name="content_inset">21dp</dimen>
     <dimen name="header_border_spacing">16dp</dimen>
 
-    <dimen name="button_height">38dp</dimen>
+    <dimen name="button_height">53dp</dimen>
     <dimen name="button_height_small">24dp</dimen>
     <dimen name="alert_side_padding">26dp</dimen>
     <dimen name="downwards_drop_shadow_height">16dp</dimen>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 42bc04bfd..7d7f70615 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -169,7 +169,7 @@
     <string name="quest_abort">Abort Quest</string>
     <string name="version_info">Version %1$s (%2$d)</string>
 
-    <string name="sidebar_help">Help &amp; FAQ</string>
+    <string name="sidebar_help">Support</string>
     <string name="complete_tutorial">Got it!</string>
     <string name="dismiss_tutorial">Remind me again</string>
     <string name="intro_1_subtitle">Welcome to</string>
@@ -243,7 +243,7 @@
     <string name="quest_cancel_message">Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll.</string>
     <string name="quest_begin_message">Are you sure? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation.</string>
     <string name="ago_1month">1 month ago</string>
-    <string name="ago_months">%d month ago</string>
+    <string name="ago_months">%d months ago</string>
     <string name="ago_1week">1w ago</string>
     <string name="ago_weeks">%dw ago</string>
     <string name="ago_1day">1d ago</string>
@@ -271,8 +271,9 @@
     <string name="pets">Pets</string>
     <string name="mounts">Mounts</string>
 
+    <string name="quest_items_found">You\'ve found %d quest items</string>
     <string name="armoireEquipment">You found %s in the Armoire</string>
-    <string name="armoireFood">You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</string>
+    <string name="armoireFood">You rummage in the Armoire and find%1$s %2$s. What\'s that doing in here?</string>
     <string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
     <string name="sell">Sell (%d Gold)</string>
     <string name="hatch_with_potion">Hatch with potion</string>
@@ -437,7 +438,7 @@
     <string name="subscription_status">Subscription Status</string>
 
     <string name="challenge_leave_title">Leave Challenge</string>
-    <string name="challenge_leave_description">You can choose to keep this Challenge\'s tasks on your personal task board  or delete them when you leave</string>
+    <string name="challenge_leave_description">You can choose to keep this Challenge\'s tasks on your personal task board or delete them when you leave</string>
     <string name="leave_keep_tasks">Leave &amp; Keep Tasks</string>
     <string name="leave_delte_tasks">Leave &amp; Delete Tasks</string>
     <string name="remove_tasks">Remove</string>
@@ -549,6 +550,7 @@
     <string name="quest_leader_header">Started by %s</string>
     <string name="quest_abort_message">Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.</string>
     <string name="reloading_content">Reloading Content</string>
+    <string name="reloaded_content">Reloaded Content</string>
     <string name="thousand_abbrev">k</string>
     <string name="million_abbrev">m</string>
     <string name="billion_abbrev">b</string>
@@ -571,8 +573,8 @@
     <string name="reset_account">Reset Account</string>
     <string name="reset_account_description">WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.\n\nYou will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.</string>
     <string name="delete_account">Delete Account</string>
-    <string name="delete_account_description">This will delete your account forever, and it can never be restored! Banked or spent Gems will not be refunded. If you’re absolutely certain, type your password into the text box below.</string>
-    <string name="delete_oauth_account_description">This will delete your account forever, and it can never be restored! Banked or spent Gems will not be refunded. If you’re absolutely certain, type DELETE into the text box below.</string>
+    <string name="delete_account_description">Deleted accounts are permanent and cannot be restored. Gems cannot be refunded. If you still want to delete, type your password below.</string>
+    <string name="delete_oauth_account_description">Deleted accounts are permanent and cannot be restored. Gems cannot be refunded. If you still want to delete, type DELETE below.</string>
     <string name="reset_account_confirmation">Reset my Account</string>
     <string name="delete_account_confirmation">Delete my Account</string>
     <string name="danger_zone">Danger Zone</string>
@@ -654,7 +656,7 @@
     <string name="tiers_descriptions">The colored usernames you see in chat represent a person’s contributor tier. The higher the tier, the more the person has contributed to habitica through art, code, the community, or more!</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="world_boss">World  Boss</string>
+    <string name="world_boss">World Boss</string>
     <string name="boss_art">Boss Art</string>
     <string name="world_boss_description">World Boss Description</string>
     <string name="rage_strike_count">Rage Strikes: %d/%d</string>
@@ -875,7 +877,7 @@
     <string name="joinedGuildTitle">Joined a Guild</string>
     <string name="joinedGuildDescription">Ventured into the social side of Habitica by joining a Guild!</string>
     <string name="joinedChallengeTitle">Joined a Challenge</string>
-    <string name="joinedChallengeDescription">You put themselves to the test by joining a Challenge!</string>
+    <string name="joinedChallengeDescription">You put yourself to the test by joining a Challenge!</string>
     <string name="inviteFriendTitle">Invited a Friend</string>
     <string name="inviteFriendDescription">You invited a friend (or friends) who joined you on your adventure!</string>
     <string name="keep_challenges">Keep Challenges</string>
@@ -1045,7 +1047,7 @@
     <string name="hatchedPetDescription">There are so many Pets to collect, you’re bound to have a favorite. If you feed them, they may just grow…</string>
     <string name="fedPetDescription">Every Pet has a specific food they enjoy! Experiment to find out which will grow your Pet the fastest</string>
     <string name="purchasedEquipmentDescription">Equipment can be practical or just fashionable. Raise your stats to get all sorts of benefits to your avatar</string>
-    <string name="first_drop_explanation1">Completing tasks gives you a chance to find eggs, hatching potions,  and pet food.</string>
+    <string name="first_drop_explanation1">Completing tasks gives you a chance to find eggs, hatching potions, and pet food.</string>
     <string name="first_drop_explanation2">Head to your Items and try combining your new Egg and Hatching Potion!</string>
     <string name="go_to_items">Go to Items</string>
     <string name="first_drop_title">You found new items!</string>
@@ -1096,11 +1098,45 @@
     <string name="x_to_y">%s to %s</string>
     <string name="how_it_works">How it works</string>
     <string name="limitations">Limitations</string>
-    <string name="fall_promo_info_instructions">Between September 22nd and 30th, 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="fall_promo_info_limitations">This promotion only applies during the limited time event. This event starts on September 22nd at 8:00 AM EDT (12:00 UTC) and will end September 30th at 8:00 PM EDT (00:00 UTC). The promo offer is only available when buying Gems for yourself.</string>
+    <string name="fall_promo_info_instructions">Between %s and %s, 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="fall_promo_info_prompt">The Fall Gala is in full swing so we thought it was the perfect time to introduce our first ever Gem Sale! Now you will get more Gems with each purchase than ever before.</string>
     <string name="view_gem_bundles">View Gem Bundles</string>
-    <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_instructions">Between %s and %s, 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="gems_promo_info_limitations">This promotion only applies during the limited time event. This event starts on %s (12:00 UTC) and will end %s (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>
+    <string name="submit_feedback">Submit Feedback</string>
+    <string name="user_is_blocked">You blocked this user</string>
+    <string name="user_is_blocked_explanation">A blocked user cannot send you Private Messages but you will still see their posts in Tavern or Guilds.</string>
+    <string name="finish">Finish</string>
+    <string name="login_disclaimer">By signing up, you are indicating that you have read and agree to the <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica.com/static/privacy">Privacy Policy.</a></string>
+    <string name="you">You</string>
+    <string name="invitation_title_no_leader">You were invited to join a party</string>
+    <string name="fortify_shop">Fortify Potion</string>
+    <string name="fortify_shop_description">Return all tasks to neutral value (yellow color), and restore all lost Health</string>
+    <string name="purchase_immediately_description">This will take effect immediately after buying!</string>
+    <string name="create_guild">Create Guild</string>
+    <string name="create_guild_description">To create a Guild, log in to the Habitica website then tap the “Create” button on the “My Guilds” screen.</string>
+    <string name="open_website">Open Website</string>
+    <string name="action_end_challenge">End Challenge</string>
+    <string name="end_challenge_description">To end a Challenge, log in to the Habitica website then tap the “End Challenge” button on the right of the Challenge screen.</string>
+    <string name="hurray">Hurray!</string>
+    <string name="you_won_challenge">You won a Challenge</string>
+    <string name="congratulations">Congratulations!</string>
+    <string name="won_achievement_description"><![CDATA[<b>%s</b> selected you as the winner! Your win has been recorded in your Achievements.]]></string>
+    <string name="won_achievement_description_noname">You were selected as the winner! Your win has been recorded in your Achievements.</string>
+    <string name="claim_x_gems">Claim %d Gems</string>
+    <string name="g1g1_promo_info_prompt">In honor of the season of giving we\'re bringing back a very special promotion. Now when you gift somebody a subscription, you get the same sub for yourself for free!</string>
+    <string name="g1g1_promo_info_instructions">Tap ‘Gift a Subscription’ and type in the username of the account you’d like to gift to. From there, pick the sub length you’d like to gift and check out. Your account will automatically be rewarded with the same level of subscription you just gifted.</string>
+    <string name="g1g1_promo_info_limitations">This is a limited time event that starts on %s (13:00 UTC) and will end %s (01:00 UTC). This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is cancelled or expires.</string>
+    <string name="gift_one_get_one_purchase_banner">Gift a sub and get a sub for free until %s</string>
+    <string name="one_month_one_time">1 month one-time subscription</string>
+    <string name="three_months_one_time">3 month one-time subscription</string>
+    <string name="six_months_one_time">6 month one-time subscription</string>
+    <string name="twelve_months_one_time">12 month one-time subscription</string>
+    <string name="sidebar_teams">Teams</string>
+    <string name="team_information">Team Information</string>
+    <string name="mystery_item_title">You open the box and find...</string>
 </resources>
diff --git a/Habitica/res/values/styles.challenges.xml b/Habitica/res/values/styles.challenges.xml
index d4f01eadb..2e93580f2 100644
--- a/Habitica/res/values/styles.challenges.xml
+++ b/Habitica/res/values/styles.challenges.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-
-
     <style name="ChallengeName">
         <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_condensed
         </item>
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#000</item>
+        <item name="android:textColor">@color/text_primary</item>
     </style>
 
     <style name="ChallengeTaskDetails">
@@ -17,5 +15,4 @@
         <item name="android:textColor">#8a000000</item>
         <item name="android:maxLines">1</item>
     </style>
-
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 2b8edcef5..65ceb4ac7 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -1,14 +1,14 @@
 <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>
         <item name="elevation">0dp</item>
 
         <item name="android:windowContentOverlay">@null</item>
-        <item name="actionMenuTextColor">@color/white</item>
+        <item name="actionMenuTextColor">@color/text_primary</item>
 
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
 
@@ -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="textColorPrimaryDark">#D5C8FF</item>
+        <item name="textColorPrimary">@color/text_primary</item>
+        <item name="textColorSecondary">@color/text_secondary</item>
+        <item name="textColorPrimaryDark">@color/brand_600</item>
         <item name="textColorSecondaryDark">@color/brand_500</item>
-        <item name="barColor">@color/brand_100</item>
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_ternary</item>te
+        <item name="barColor">@color/brand_300</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,32 @@
         <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="toolbarContentColor">@color/text_primary</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_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+    </style>
+
+    <style name="MainAppTheme.TaskForm">
+        <item name="toolbarContentColor">@color/white</item>
+        <item name="headerTextColor">@color/white</item>
+    </style>
+
 
     <style name="MainAppTheme.Red">
         <item name="colorPrimary">@color/red_10</item>
@@ -78,6 +92,13 @@
         <item name="colorPrimaryText">@color/red_1</item>
     </style>
 
+    <style name="MainAppTheme.Red.Dark">
+        <item name="barColor">@color/gray_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/red_100</item>
+    </style>
+
     <style name="MainAppTheme.Maroon">
         <item name="colorPrimary">@color/red_10</item>
         <item name="colorPrimaryDark">@color/maroon_5</item>
@@ -96,6 +117,13 @@
         <item name="colorPrimaryText">@color/maroon_1</item>
     </style>
 
+    <style name="MainAppTheme.Maroon.Dark">
+        <item name="barColor">@color/gray_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/maroon_100</item>
+    </style>
+
     <style name="MainAppTheme.Orange">
         <item name="colorPrimary">@color/orange_50</item>
         <item name="colorPrimaryDark">@color/orange_10</item>
@@ -115,6 +143,13 @@
         <item name="colorPrimaryText">@color/orange_1</item>
     </style>
 
+    <style name="MainAppTheme.Orange.Dark">
+        <item name="barColor">@color/gray_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/orange_100</item>
+    </style>
+
     <style name="MainAppTheme.Yellow">
         <item name="colorPrimary">@color/yellow_50</item>
         <item name="colorPrimaryDark">@color/yellow_10</item>
@@ -134,6 +169,13 @@
         <item name="colorPrimaryText">@color/yellow_1</item>
     </style>
 
+    <style name="MainAppTheme.Yellow.Dark">
+        <item name="barColor">@color/gray_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/yellow_100</item>
+    </style>
+
     <style name="MainAppTheme.Green">
         <item name="colorPrimary">@color/green_10</item>
         <item name="colorPrimaryDark">@color/green_5</item>
@@ -153,6 +195,13 @@
         <item name="colorPrimaryText">@color/green_1</item>
     </style>
 
+    <style name="MainAppTheme.Green.Dark">
+        <item name="barColor">@color/gray_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/green_100</item>
+    </style>
+
     <style name="MainAppTheme.Teal">
         <item name="colorPrimary">@color/teal_10</item>
         <item name="colorPrimaryDark">@color/teal_5</item>
@@ -172,6 +221,13 @@
         <item name="colorPrimaryText">@color/teal_1</item>
     </style>
 
+    <style name="MainAppTheme.Teal.Dark">
+        <item name="barColor">@color/gray_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/teal_100</item>
+    </style>
+
     <style name="MainAppTheme.Blue">
         <item name="colorPrimary">@color/blue_10</item>
         <item name="colorPrimaryDark">@color/blue_5</item>
@@ -191,6 +247,13 @@
         <item name="colorPrimaryText">@color/blue_1</item>
     </style>
 
+    <style name="MainAppTheme.Blue.Dark">
+        <item name="barColor">@color/gray_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/blue_100</item>
+    </style>
+
     <style name="BottomSheetTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowIsTranslucent">false</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -207,8 +270,8 @@
     </style>
 
 
-    <style name="PopupTheme" parent="Widget.AppCompat.Light.PopupMenu">
-        <item name="android:popupBackground">@android:color/white</item>
+    <style name="PopupTheme" parent="Widget.AppCompat.PopupMenu.Overflow">
+        <item name="android:popupBackground">@color/content_background</item>
     </style>
 
     <style name="CardText">
@@ -230,10 +293,6 @@
         <item name="android:padding">@dimen/card_padding_compact</item>
     </style>
 
-    <style name="CardView.Default" parent="CardView.Light">
-        <item name="android:layout_margin">@dimen/card_margin</item>
-    </style>
-
     <style name="RowWrapper">
         <item name="android:padding">@dimen/row_padding</item>
         <item name="android:background">@drawable/selection_highlight</item>
@@ -260,7 +319,7 @@
         <item name="android:background">@drawable/border_lightgray</item>
         <item name="android:drawablePadding">4dp</item>
         <item name="android:layout_marginTop">8dp</item>
-        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingStart">4dp</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">14sp</item>
     </style>
@@ -273,7 +332,7 @@
     </style>
 
     <!-- used activity_main.xml -->
-    <style name="Toolbar" parent="Base.ThemeOverlay.AppCompat.ActionBar">
+    <style name="Toolbar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
         <item name="android:textColorPrimary">?attr/toolbarContentColor</item>
         <item name="textColorSecondary">?attr/toolbarContentColor</item>
         <item name="background">?attr/headerBackgroundColor</item>
@@ -282,12 +341,17 @@
     </style>
 
 
-    <style name="Toolbar.Modern" parent="Base.ThemeOverlay.AppCompat.ActionBar">
+    <style name="Toolbar.Modern" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
         <item name="android:textColorPrimary">?attr/headerTextColor</item>
         <item name="textColorSecondary">?attr/headerTextColor</item>
         <item name="background">?attr/headerBackgroundColor</item>
         <item name="actionMenuTextColor">?attr/toolbarContentColor</item>
         <item name="android:actionMenuTextColor">?attr/toolbarContentColor</item>
+        <item name="android:itemTextAppearance">@style/menu_item_color</item>
+    </style>
+
+    <style name="menu_item_color">
+        <item name="android:textColor">@color/text_primary</item>
     </style>
 
     <style name="HabitButton" parent="android:Widget.Button">
@@ -302,11 +366,25 @@
         <item name="android:textColor">@color/brand_100</item>
     </style>
 
-    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/brand_400</item>
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="colorPrimary">@color/text_brand_neon</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="backgroundTint">@color/dialog_background</item>
     </style>
 
-    <style name="HabiticaAlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+
+    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/text_red</item>
+    </style>
+
+    <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/dialog_button_text_color</item>
+    </style>
+
+    <style name="HabiticaAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@color/brand_400</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
@@ -319,15 +397,15 @@
     <style name="SectionTitle">
         <item name="android:textSize">@dimen/card_medium_text</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:paddingLeft">@dimen/section_leftright_padding</item>
-        <item name="android:paddingRight">@dimen/section_leftright_padding</item>
+        <item name="android:paddingStart">@dimen/section_leftright_padding</item>
+        <item name="android:paddingEnd">@dimen/section_leftright_padding</item>
         <item name="android:paddingTop">@dimen/section_top_padding</item>
     </style>
 
     <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>
@@ -355,14 +433,15 @@
         <item name="android:padding">@dimen/section_top_padding</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_marginLeft">20dp</item>
-        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:layout_marginEnd">20dp</item>
     </style>
 
     <style name="GemPurchaseListItem">
-        <item name="android:textColor">@color/brand_300</item>
+        <item name="dayTextColor">@color/text_brand</item>
+        <item name="nightTextColor">@color/gray_400</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:textSize">12sp</item>
-        <item name="android:drawableLeft">@drawable/ic_check_purple</item>
+        <item name="android:drawableStart">@drawable/ic_check_purple</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:drawablePadding">4dp</item>
     </style>
@@ -371,14 +450,14 @@
         <item name="android:layout_gravity">left|center_vertical</item>
         <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_medium</item>
         <item name="android:textSize">14sp</item>
-        <item name="paddingEnd">32px</item>
+        <item name="paddingEnd">32dp</item>
     </style>
 
     <style name="FragmentDialogTitle">
         <item name="android:textSize">@dimen/card_medium_text</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:paddingLeft">@dimen/section_leftright_padding</item>
-        <item name="android:paddingRight">@dimen/section_leftright_padding</item>
+        <item name="android:paddingStart">@dimen/section_leftright_padding</item>
+        <item name="android:paddingEnd">@dimen/section_leftright_padding</item>
         <item name="android:paddingTop">@dimen/section_top_padding</item>
         <item name="android:paddingBottom">@dimen/section_top_padding</item>
     </style>
@@ -387,7 +466,7 @@
         <item name="android:layout_gravity">center_horizontal</item>
         <item name="android:textSize">13sp</item>
         <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_marginEnd">8dp</item>
         <item name="android:textColor">@color/subscription_description_text</item>
     </style>
 
@@ -395,19 +474,19 @@
         <item name="android:textSize">11sp</item>
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:background">@drawable/pill_bg_gray</item>
-        <item name="android:paddingRight">@dimen/pill_horizontal_padding</item>
-        <item name="android:paddingLeft">@dimen/pill_horizontal_padding</item>
+        <item name="android:paddingEnd">@dimen/pill_horizontal_padding</item>
+        <item name="android:paddingStart">@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>
@@ -435,8 +514,8 @@
         <item name="android:background">@drawable/subscription_box_bg</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingBottom">16dp</item>
-        <item name="android:paddingLeft">18dp</item>
-        <item name="android:paddingRight">18dp</item>
+        <item name="android:paddingStart">18dp</item>
+        <item name="android:paddingEnd">18dp</item>
         <item name="android:layout_marginBottom">8dp</item>
     </style>
 
@@ -449,7 +528,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 +537,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">
@@ -467,25 +546,25 @@
             @string/font_family_condensed
         </item>
         <item name="android:textSize">14sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
+        <item name="android:letterSpacing">0.035</item>
         <item name="android:lineSpacingExtra">2.0dp</item>
         <item name="android:layout_marginLeft">16dp</item>
-        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:layout_marginEnd">16dp</item>
     </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">
-        <item name="android:paddingLeft">@dimen/button_padding_small</item>
-        <item name="android:paddingRight">@dimen/button_padding_small</item>
+        <item name="android:paddingStart">@dimen/button_padding_small</item>
+        <item name="android:paddingEnd">@dimen/button_padding_small</item>
         <item name="android:paddingTop">@dimen/button_padding_vertical_small</item>
         <item name="android:paddingBottom">@dimen/button_padding_vertical_small</item>
     </style>
@@ -497,26 +576,30 @@
         <item name="android:drawablePadding">@dimen/spacing_large</item>
         <item name="android:textColor">@color/white_75_alpha</item>
         <item name="android:textColorHint">@color/white_50_alpha</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
         <item name="android:paddingBottom">20dp</item>
     </style>
 
     <style name="LoginButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:shadowColor">@color/transparent</item>
         <item name="android:background">@drawable/login_button</item>
+        <item name="backgroundTint">@color/brand_50</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:layout_gravity">center_horizontal</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:paddingLeft">32dp</item>
-        <item name="android:paddingRight">32dp</item>
+        <item name="android:paddingStart">32dp</item>
+        <item name="android:paddingEnd">32dp</item>
     </style>
 
     <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:layout_height">36dp</item>
         <item name="android:background">@drawable/diamond_button</item>
-        <item name="android:paddingLeft">36dp</item>
-        <item name="android:paddingRight">36dp</item>
+        <item name="backgroundTint">@color/brand</item>
+        <item name="android:paddingStart">36dp</item>
+        <item name="android:paddingEnd">36dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:shadowColor">@color/transparent</item>
@@ -542,36 +625,39 @@
         <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:letterSpacing">0.02</item>
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:minHeight">@dimen/button_height</item>
         <item name="android:textColor">@color/white</item>
-        <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:paddingTop">@dimen/spacing_small</item>
+        <item name="android:paddingBottom">@dimen/spacing_small</item>
         <item name="android:elevation">0dp</item>
         <item name="android:minWidth">147dp</item>
+        <item name="cornerRadius">@dimen/rounded_button_radius</item>
     </style>
 
     <style name="HabiticaButton.Borderless" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0.02</item>
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:minHeight">@dimen/button_height</item>
         <item name="android:shadowColor">@color/transparent</item>
         <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:text">?textColorPrimaryDark</item>
+        <item name="android:backgroundTint">@color/color_accent</item>
+        <item name="android:textColor">@color/white</item>
     </style>
 
     <style name="HabiticaButton.Small" parent="HabiticaButton">
@@ -583,25 +669,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 +695,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">
@@ -648,18 +734,21 @@
 
     <style name="TaskFormTextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
         <!-- reference our hint & error styles -->
-        <item name="boxBackgroundColor">@color/white_75_alpha</item>
+        <item name="boxBackgroundColor">@color/white</item>
         <item name="android:textColor">?attr/colorPrimaryText</item>
-        <item name="android:textColorHint">@color/textColorLight</item>
+        <item name="android:textColorHint">?colorPrimaryText</item>
         <item name="colorControlNormal">?attr/colorPrimary</item>
         <item name="colorControlActivated">?attr/colorPrimary</item>
         <item name="colorControlHighlight">?attr/colorPrimary</item>
-        <item name="colorAccent">?attr/colorPrimary</item>
+        <item name="colorAccent">?attr/colorPrimaryText</item>
+        <item name="colorPrimary">?attr/colorPrimaryText</item>
         <item name="hintTextAppearance">@style/TaskFormHintTextAppearance</item>
     </style>
 
     <style name="TaskFormHintTextAppearance">
+        <item name="android:colorPrimary">?attr/colorPrimaryText</item>
         <item name="colorPrimary">?attr/colorPrimaryText</item>
+        <item name="textColorPrimary">?attr/colorPrimaryText</item>
         <item name="android:textSize">12sp</item>
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="fontFamily">@string/font_family_medium</item>
@@ -668,29 +757,29 @@
     <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>
-        <item name="android:colorAccent">@color/brand_400</item>
+        <item name="android:colorAccent">?colorPrimaryText</item>
     </style>
 
     <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:textColor">@color/text_primary</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 +796,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">
@@ -726,10 +815,12 @@
         <item name="searchHintIcon">@null</item>
     </style>
 
-    <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>
 
+    <style name="FlatCardView">
+        <item name="android:background">@drawable/layout_rounded_bg_window</item>
+        <item name="android:layout_margin">@dimen/spacing_medium</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..75852e598 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -82,7 +82,8 @@
                 android:persistent="false"
                 android:shouldDisableView="false"
                 android:layout="@layout/preference_child_summary"/>
-            <PreferenceCategory android:title="@string/danger_zone">
+            <PreferenceCategory android:title="@string/danger_zone"
+                android:layout="@layout/preference_category">
                 <Preference android:title="@string/reset_account"
                     android:key="reset_account"
                     android:layout="@layout/preference_child_summary" />
@@ -117,7 +118,8 @@
         <Preference
             android:key="choose_class"
             tools:title="Change Class"
-            android:layout="@layout/preference_child_summary"/>
+            android:layout="@layout/preference_child_summary"
+            app:isPreferenceVisible="false"/>
         <Preference android:title="@string/fix_character_values"
             app:key="fixCharacterValues"
             android:layout="@layout/preference_child_summary"/>
@@ -150,11 +152,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"
@@ -218,7 +225,8 @@
             android:summary="@string/push_notifications_sum"
             android:layout="@layout/preference_child_summary">
 
-            <PreferenceCategory android:title="Push Notifications">
+            <PreferenceCategory android:title="Push Notifications"
+                android:layout="@layout/preference_category">
                 <CheckBoxPreference
                     android:key="preference_push_you_won_challenge"
                     android:defaultValue="true"
@@ -304,7 +312,8 @@
             android:title="@string/emails"
             android:layout="@layout/preference_child_summary">
 
-            <PreferenceCategory android:title="@string/emails">
+            <PreferenceCategory android:title="@string/emails"
+                android:layout="@layout/preference_category">
                 <CheckBoxPreference
                     android:key="preference_email_you_won_challenge"
                     android:defaultValue="true"
diff --git a/Habitica/res/xml/remote_config_defaults.xml b/Habitica/res/xml/remote_config_defaults.xml
index 6b62b8d07..072e49af5 100644
--- a/Habitica/res/xml/remote_config_defaults.xml
+++ b/Habitica/res/xml/remote_config_defaults.xml
@@ -5,10 +5,6 @@
         <key>maxChatLength</key>
         <value>3000</value>
     </entry>
-    <entry>
-        <key>enableGiftOneGetOne</key>
-        <value>false</value>
-    </entry>
     <entry>
         <key>shopSpriteSuffix</key>
     </entry>
@@ -86,7 +82,7 @@
     </entry>
     <entry>
         <key>feedbackURL</key>
-        <value></value>
+        <value />
     </entry>
     <entry>
         <key>enableAdventureGuide</key>
@@ -96,5 +92,9 @@
         <key>activePromo</key>
         <value> </value>
     </entry>
+    <entry>
+        <key>knownIssues</key>
+        <value>[]</value>
+    </entry>
 </defaultsMap>
     <!-- END xml_defaults -->
\ No newline at end of file
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..042b6e886 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica
 
+import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -11,7 +12,6 @@ import android.database.sqlite.SQLiteDatabase
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
-import androidx.multidex.MultiDexApplication
 import androidx.preference.PreferenceManager
 import com.amplitude.api.Amplitude
 import com.amplitude.api.Identify
@@ -33,8 +33,6 @@ import com.habitrpg.android.habitica.ui.activities.IntroActivity
 import com.habitrpg.android.habitica.ui.activities.LoginActivity
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.squareup.leakcanary.LeakCanary
-import com.squareup.leakcanary.RefWatcher
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import org.solovyev.android.checkout.Billing
@@ -44,8 +42,7 @@ import org.solovyev.android.checkout.PurchaseVerifier
 import javax.inject.Inject
 
 //contains all HabiticaApplicationLogic except dagger componentInitialisation
-abstract class HabiticaBaseApplication : MultiDexApplication() {
-    var refWatcher: RefWatcher? = null
+abstract class HabiticaBaseApplication : Application() {
     @Inject
     internal lateinit var lazyApiHelper: ApiClient
     @Inject
@@ -69,16 +66,10 @@ abstract class HabiticaBaseApplication : MultiDexApplication() {
 
     override fun onCreate() {
         super.onCreate()
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return
-        }
         setupRealm()
         setupDagger()
         setupRemoteConfig()
         setupNotifications()
-        refWatcher = LeakCanary.install(this)
         createBillingAndCheckout()
         HabiticaIconsHelper.init(this)
         MarkdownParser.setup(this)
@@ -111,6 +102,7 @@ abstract class HabiticaBaseApplication : MultiDexApplication() {
         val builder = RealmConfiguration.Builder()
                 .schemaVersion(1)
                 .deleteRealmIfMigrationNeeded()
+                .allowWritesOnUiThread(true)
         try {
             Realm.setDefaultConfiguration(builder.build())
         } catch (ignored: UnsatisfiedLinkError) {
@@ -196,7 +188,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()
     }
 
@@ -235,10 +227,12 @@ abstract class HabiticaBaseApplication : MultiDexApplication() {
             val preferences = PreferenceManager.getDefaultSharedPreferences(context)
             val useReminder = preferences.getBoolean("use_reminder", false)
             val reminderTime = preferences.getString("reminder_time", "19:00")
+            val lightMode = preferences.getString("theme_mode", "system")
             preferences.edit {
                 clear()
                 putBoolean("use_reminder", useReminder)
                 putString("reminder_time", reminderTime)
+                putString("theme_mode", lightMode)
             }
             reloadUserComponent()
             getInstance(context)?.lazyApiHelper?.updateAuthenticationCredentials(null, null)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
deleted file mode 100644
index 478dc4187..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.habitrpg.android.habitica;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import androidx.annotation.NonNull;
-import androidx.preference.PreferenceManager;
-
-import com.google.firebase.analytics.FirebaseAnalytics;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent;
-import com.habitrpg.android.habitica.events.UserSubscribedEvent;
-import com.habitrpg.android.habitica.helpers.PurchaseTypes;
-import com.habitrpg.android.habitica.models.IAPGift;
-import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
-import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
-import com.habitrpg.android.habitica.models.Transaction;
-import com.habitrpg.android.habitica.models.responses.ErrorResponse;
-
-import org.greenrobot.eventbus.EventBus;
-import org.json.JSONObject;
-import org.solovyev.android.checkout.BasePurchaseVerifier;
-import org.solovyev.android.checkout.Purchase;
-import org.solovyev.android.checkout.RequestListener;
-import org.solovyev.android.checkout.ResponseCodes;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import retrofit2.HttpException;
-
-/**
- * Created by Negue on 26.11.2015.
- */
-public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
-
-    private static final String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS";
-    private static final String PENDING_GIFTS_KEY = "PENDING_GIFTS";
-    private final ApiClient apiClient;
-    private Set<String> purchasedOrderList = new HashSet<>();
-    private static Map<String, String> pendingGifts = new HashMap<>();
-    private static SharedPreferences preferences;
-    private Context context;
-
-    public HabiticaPurchaseVerifier(Context context, ApiClient apiClient) {
-        preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        this.context = context;
-
-        preferences.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
-        pendingGifts = loadPendingGifts();
-
-        this.apiClient = apiClient;
-    }
-
-    @Override
-    protected void doVerify(@NonNull final List<Purchase> purchases, @NonNull final RequestListener<List<Purchase>> requestListener) {
-        final List<Purchase> verifiedPurchases = new ArrayList<>(purchases.size());
-
-        for (final Purchase purchase : purchases) {
-            if (purchasedOrderList.contains(purchase.orderId)) {
-                verifiedPurchases.add(purchase);
-
-                requestListener.onSuccess(verifiedPurchases);
-            } else {
-                if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
-                    PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
-                    validationRequest.setSku(purchase.sku);
-                    validationRequest.setTransaction(new Transaction());
-                    validationRequest.getTransaction().setReceipt(purchase.data);
-                    validationRequest.getTransaction().setSignature(purchase.signature);
-                    if (pendingGifts.containsKey(purchase.sku)) {
-                        validationRequest.setGift(new IAPGift());
-                        validationRequest.getGift().uuid = pendingGifts.get(purchase.sku);
-                    }
-
-                    apiClient.validatePurchase(validationRequest).subscribe(purchaseValidationResult -> {
-                        purchasedOrderList.add(purchase.orderId);
-
-                        requestListener.onSuccess(verifiedPurchases);
-                        EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
-                        removeGift(purchase.sku);
-                    }, throwable -> {
-                        if (throwable.getClass().equals(retrofit2.adapter.rxjava2.HttpException.class)) {
-                            HttpException error = (HttpException) throwable;
-                            ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
-                            if (error.code() == 401) {
-                                if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
-                                    purchasedOrderList.add(purchase.orderId);
-
-                                    requestListener.onSuccess(verifiedPurchases);
-                                    EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
-                                    removeGift(purchase.sku);
-                                    return;
-                                }
-                            }
-                        }
-                        requestListener.onError(ResponseCodes.ERROR, new Exception());
-                    });
-                } else if (PurchaseTypes.allSubscriptionNoRenewTypes.contains(purchase.sku)) {
-                    PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
-                    validationRequest.setSku(purchase.sku);
-                    validationRequest.setTransaction(new Transaction());
-                    validationRequest.getTransaction().setReceipt(purchase.data);
-                    validationRequest.getTransaction().setSignature(purchase.signature);
-                    if (pendingGifts.containsKey(purchase.sku)) {
-                        validationRequest.setGift(new IAPGift());
-                        validationRequest.getGift().uuid = pendingGifts.get(purchase.sku);
-                    }
-
-                    apiClient.validateNoRenewSubscription(validationRequest).subscribe(purchaseValidationResult -> {
-                        purchasedOrderList.add(purchase.orderId);
-                        requestListener.onSuccess(verifiedPurchases);
-                        EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
-                        removeGift(purchase.sku);
-                    }, throwable -> {
-                        if (throwable.getClass().equals(retrofit2.adapter.rxjava2.HttpException.class)) {
-                            HttpException error = (HttpException)throwable;
-                            ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
-                            if (error.code() == 401) {
-                                if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
-                                    purchasedOrderList.add(purchase.orderId);
-
-                                    requestListener.onSuccess(verifiedPurchases);
-                                    EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
-                                    removeGift(purchase.sku);
-                                    return;
-                                }
-                            }
-                        }
-                        requestListener.onError(ResponseCodes.ERROR, new Exception());
-                    });
-                } else if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
-                    SubscriptionValidationRequest validationRequest = new SubscriptionValidationRequest();
-                    validationRequest.setSku(purchase.sku);
-                    validationRequest.setTransaction(new Transaction());
-                    validationRequest.getTransaction().setReceipt(purchase.data);
-                    validationRequest.getTransaction().setSignature(purchase.signature);
-                    apiClient.validateSubscription(validationRequest).subscribe(purchaseValidationResult -> {
-                        purchasedOrderList.add(purchase.orderId);
-
-                        verifiedPurchases.add(purchase);
-
-                        requestListener.onSuccess(verifiedPurchases);
-                        FirebaseAnalytics.getInstance(context).logEvent("user_subscribed", null);
-                        EventBus.getDefault().post(new UserSubscribedEvent());
-                    }, throwable -> {
-                        if (throwable.getClass().equals(retrofit2.adapter.rxjava2.HttpException.class)) {
-                            HttpException error = (HttpException) throwable;
-                            ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
-                            if (error.code() == 401) {
-                                if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
-                                    purchasedOrderList.add(purchase.orderId);
-
-                                    verifiedPurchases.add(purchase);
-
-                                    requestListener.onSuccess(verifiedPurchases);
-                                    return;
-                                }
-                            }
-                        }
-                        requestListener.onError(ResponseCodes.ERROR, new Exception());
-                    });
-                }
-            }
-        }
-
-        SharedPreferences.Editor edit = preferences.edit();
-        edit.putStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
-        edit.apply();
-
-        savePendingGifts();
-    }
-
-    public static void addGift(String sku, String userID) {
-        pendingGifts.put(sku, userID);
-        savePendingGifts();
-    }
-
-    private static void removeGift(String sku) {
-        pendingGifts.remove(sku);
-        savePendingGifts();
-    }
-
-    private static void savePendingGifts(){
-        JSONObject jsonObject = new JSONObject(pendingGifts);
-        String jsonString = jsonObject.toString();
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.remove(PENDING_GIFTS_KEY).apply();
-        editor.putString(PENDING_GIFTS_KEY, jsonString);
-        editor.commit();
-    }
-
-    private Map<String, String> loadPendingGifts() {
-        Map<String, String> outputMap = new HashMap<>();
-        try{
-                String jsonString = preferences.getString(PENDING_GIFTS_KEY, (new JSONObject()).toString());
-                JSONObject jsonObject = new JSONObject(jsonString);
-                Iterator<String> keysItr = jsonObject.keys();
-                while(keysItr.hasNext()) {
-                    String key = keysItr.next();
-                    String value = (String) jsonObject.get(key);
-                    outputMap.put(key, value);
-                }
-        }catch(Exception e){
-            e.printStackTrace();
-        }
-        return outputMap;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt
new file mode 100644
index 000000000..748d4be8f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt
@@ -0,0 +1,163 @@
+package com.habitrpg.android.habitica
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent
+import com.habitrpg.android.habitica.events.UserSubscribedEvent
+import com.habitrpg.android.habitica.helpers.PurchaseTypes
+import com.habitrpg.android.habitica.models.*
+import org.greenrobot.eventbus.EventBus
+import org.json.JSONObject
+import org.solovyev.android.checkout.BasePurchaseVerifier
+import org.solovyev.android.checkout.Purchase
+import org.solovyev.android.checkout.RequestListener
+import org.solovyev.android.checkout.ResponseCodes
+import retrofit2.HttpException
+import java.util.*
+
+/**
+ * Created by Negue on 26.11.2015.
+ */
+class HabiticaPurchaseVerifier(context: Context, apiClient: ApiClient) : BasePurchaseVerifier() {
+    private val apiClient: ApiClient
+    private val purchasedOrderList: MutableSet<String> = HashSet()
+    private val context: Context
+    override fun doVerify(purchases: List<Purchase>, requestListener: RequestListener<List<Purchase>>) {
+        val verifiedPurchases: MutableList<Purchase> = ArrayList(purchases.size)
+        for (purchase in purchases) {
+            if (purchasedOrderList.contains(purchase.orderId)) {
+                verifiedPurchases.add(purchase)
+                requestListener.onSuccess(verifiedPurchases)
+            } else {
+                when {
+                    PurchaseTypes.allGemTypes.contains(purchase.sku) -> {
+                        val validationRequest = buildValidationRequest(purchase)
+                        apiClient.validatePurchase(validationRequest).subscribe({
+                            purchasedOrderList.add(purchase.orderId)
+                            requestListener.onSuccess(verifiedPurchases)
+                            EventBus.getDefault().post(ConsumablePurchasedEvent(purchase))
+                            removeGift(purchase.sku)
+                        }) { throwable: Throwable ->
+                            handleError(throwable, purchase, requestListener, verifiedPurchases)
+                        }
+                    }
+                    PurchaseTypes.allSubscriptionNoRenewTypes.contains(purchase.sku) -> {
+                        val validationRequest = buildValidationRequest(purchase)
+                        apiClient.validateNoRenewSubscription(validationRequest).subscribe({
+                            purchasedOrderList.add(purchase.orderId)
+                            requestListener.onSuccess(verifiedPurchases)
+                            EventBus.getDefault().post(ConsumablePurchasedEvent(purchase))
+                            removeGift(purchase.sku)
+                        }) { throwable: Throwable ->
+                            handleError(throwable, purchase, requestListener, verifiedPurchases)
+                        }
+                    }
+                    PurchaseTypes.allSubscriptionTypes.contains(purchase.sku) -> {
+                        val validationRequest = SubscriptionValidationRequest()
+                        validationRequest.sku = purchase.sku
+                        validationRequest.transaction = Transaction()
+                        validationRequest.transaction?.receipt = purchase.data
+                        validationRequest.transaction?.signature = purchase.signature
+                        apiClient.validateSubscription(validationRequest).subscribe({
+                            purchasedOrderList.add(purchase.orderId)
+                            verifiedPurchases.add(purchase)
+                            requestListener.onSuccess(verifiedPurchases)
+                            FirebaseAnalytics.getInstance(context).logEvent("user_subscribed", null)
+                            EventBus.getDefault().post(UserSubscribedEvent())
+                        }) { throwable: Throwable ->
+                            handleError(throwable, purchase, requestListener, verifiedPurchases)
+                        }
+                    }
+                }
+            }
+        }
+        val edit = preferences?.edit()
+        edit?.putStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList)
+        edit?.apply()
+        savePendingGifts()
+    }
+
+    private fun buildValidationRequest(purchase: Purchase): PurchaseValidationRequest {
+        val validationRequest = PurchaseValidationRequest()
+        validationRequest.sku = purchase.sku
+        validationRequest.transaction = Transaction()
+        validationRequest.transaction?.receipt = purchase.data
+        validationRequest.transaction?.signature = purchase.signature
+        if (pendingGifts.containsKey(purchase.sku)) {
+            validationRequest.gift = IAPGift()
+            validationRequest.gift?.uuid = pendingGifts[purchase.sku]
+        }
+        return validationRequest
+    }
+
+    private fun handleError(throwable: Throwable, purchase: Purchase, requestListener: RequestListener<List<Purchase>>, verifiedPurchases: MutableList<Purchase>) {
+        (throwable as? HttpException)?.let {error ->
+            if (error.code() == 401) {
+                val res = apiClient.getErrorResponse(throwable)
+                if (res.message != null && res.message == "RECEIPT_ALREADY_USED") {
+                    purchasedOrderList.add(purchase.orderId)
+                    requestListener.onSuccess(verifiedPurchases)
+                    EventBus.getDefault().post(ConsumablePurchasedEvent(purchase))
+                    removeGift(purchase.sku)
+                    return
+                }
+            }
+        }
+        FirebaseCrashlytics.getInstance().recordException(throwable)
+        requestListener.onError(ResponseCodes.ERROR, Exception())
+    }
+
+    private fun loadPendingGifts(): MutableMap<String?, String?> {
+        val outputMap: MutableMap<String?, String?> = HashMap()
+        try {
+            val jsonString = preferences?.getString(PENDING_GIFTS_KEY, JSONObject().toString())
+            val jsonObject = JSONObject(jsonString)
+            val keysItr = jsonObject.keys()
+            while (keysItr.hasNext()) {
+                val key = keysItr.next()
+                val value = jsonObject[key] as String
+                outputMap[key] = value
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        return outputMap
+    }
+
+    companion object {
+        private const val PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS"
+        private const val PENDING_GIFTS_KEY = "PENDING_GIFTS"
+        private var pendingGifts: MutableMap<String?, String?> = HashMap()
+        private var preferences: SharedPreferences? = null
+        fun addGift(sku: String?, userID: String?) {
+            pendingGifts[sku] = userID
+            savePendingGifts()
+        }
+
+        private fun removeGift(sku: String) {
+            pendingGifts.remove(sku)
+            savePendingGifts()
+        }
+
+        private fun savePendingGifts() {
+            val jsonObject = JSONObject(pendingGifts as Map<*, *>)
+            val jsonString = jsonObject.toString()
+            val editor = preferences?.edit()
+            editor?.remove(PENDING_GIFTS_KEY)
+            editor?.putString(PENDING_GIFTS_KEY, jsonString)
+            editor?.apply()
+        }
+    }
+
+    init {
+        preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        this.context = context
+        preferences?.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList)
+        pendingGifts = loadPendingGifts()
+        this.apiClient = apiClient
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index e2c649df5..60ae8026c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import retrofit2.http.*
 
 @JvmSuppressWildcards
@@ -103,6 +103,8 @@ interface ApiService {
 
     @POST("tasks/{id}/score/{direction}")
     fun postTaskDirection(@Path("id") id: String, @Path("direction") direction: String): Flowable<HabitResponse<TaskDirectionData>>
+    @POST("tasks/bulk-score")
+    fun bulkScoreTasks(@Body data: List<Map<String, String>>): Flowable<HabitResponse<BulkTaskScoringData>>
 
     @POST("tasks/{id}/move/to/{position}")
     fun postTaskNewPosition(@Path("id") id: String, @Path("position") position: Int): Flowable<HabitResponse<List<String>>>
@@ -389,4 +391,15 @@ interface ApiService {
 
     @POST("user/block/{userID}")
     fun blockMember(@Path("userID") userID: String): Flowable<HabitResponse<List<String>>>
+
+    @POST("user/reroll")
+    fun reroll(): Flowable<HabitResponse<User>>
+
+    // Team Plans
+
+    @GET("group-plans")
+    fun getTeamPlans(): Flowable<HabitResponse<List<TeamPlan>>>
+
+    @GET("tasks/group/{groupID}")
+    fun getTeamPlanTasks(@Path("groupID") groupId: String): Flowable<HabitResponse<TaskList>>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
index e5a1c55b4..dd330d02d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.api;
 
 import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 import retrofit2.http.GET;
 
 public interface MaintenanceApiService {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java
deleted file mode 100644
index 6b0b08b27..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.habitrpg.android.habitica.api;
-
-/**
- * Created by MagicMicky on 15/06/2014.
- */
-public class Server {
-    private String addr;
-
-    public Server(String addr) {
-        this(addr, true);
-    }
-
-    private Server(String addr, boolean attachSuffix) {
-        if (attachSuffix) {
-            if (addr.endsWith("/api/v4") || addr.endsWith("/api/v4/")) {
-                this.addr = addr;
-            } else if (addr.endsWith("/")) {
-                this.addr = addr + "api/v4/";
-            } else {
-                this.addr = addr + "/api/v4/";
-            }
-        } else {
-            this.addr = addr;
-        }
-    }
-
-    public Server(Server server) {
-        this.addr = server.toString();
-    }
-
-    @Override
-    public String toString() {
-        return this.addr;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.kt
new file mode 100644
index 000000000..5a549b83b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.kt
@@ -0,0 +1,28 @@
+package com.habitrpg.android.habitica.api
+
+class Server {
+    private var addr: String
+
+    constructor(addr: String) : this(addr, true) {}
+    private constructor(addr: String, attachSuffix: Boolean) {
+        if (attachSuffix) {
+            if (addr.endsWith("/api/v4") || addr.endsWith("/api/v4/")) {
+                this.addr = addr
+            } else if (addr.endsWith("/")) {
+                this.addr = addr + "api/v4/"
+            } else {
+                this.addr = "$addr/api/v4/"
+            }
+        } else {
+            this.addr = addr
+        }
+    }
+
+    constructor(server: Server) {
+        addr = server.toString()
+    }
+
+    override fun toString(): String {
+        return addr
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
index bf33e9668..92f8124cc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
@@ -20,5 +20,5 @@ public interface AppComponent {
 
     UserComponent plus(UserModule userModule, UserRepositoryModule userRepositoryModule);
 
-    void inject(@NotNull HabiticaBaseApplication habiticaBaseApplication);
+    void inject(HabiticaBaseApplication habiticaBaseApplication);
 }
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..96ff76300 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;
@@ -55,7 +54,6 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentO
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment;
@@ -77,7 +75,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;
@@ -100,6 +97,7 @@ import com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment;
+import com.habitrpg.android.habitica.ui.fragments.tasks.TeamBoardFragment;
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel;
 import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel;
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel;
@@ -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);
@@ -213,8 +207,6 @@ public interface UserComponent {
 
     void inject(InboxMessageListFragment inboxMessageListFragment);
 
-    void inject(ShopsFragment shopsFragment);
-
     void inject(ShopFragment shopFragment);
 
     void inject(PushNotificationManager pushNotificationManager);
@@ -281,69 +273,71 @@ public interface UserComponent {
 
     void inject(PurchaseDialog purchaseDialog);
 
-    void inject(@NotNull FixCharacterValuesActivity fixCharacterValuesActivity);
+    void inject(FixCharacterValuesActivity fixCharacterValuesActivity);
 
-    void inject(@NotNull AuthenticationPreferenceFragment authenticationPreferenceFragment);
+    void inject(AuthenticationPreferenceFragment authenticationPreferenceFragment);
 
-    void inject(@NotNull ProfilePreferencesFragment profilePreferencesFragment);
+    void inject(ProfilePreferencesFragment profilePreferencesFragment);
 
-    void inject(@NotNull APIPreferenceFragment apiPreferenceFragment);
+    void inject(APIPreferenceFragment apiPreferenceFragment);
 
-    void inject(@NotNull StatsFragment statsFragment);
+    void inject(StatsFragment statsFragment);
 
-    void inject(@NotNull BulkAllocateStatsDialog bulkAllocateStatsDialog);
+    void inject(BulkAllocateStatsDialog bulkAllocateStatsDialog);
 
-    void inject(@NotNull PushNotificationsPreferencesFragment pushNotificationsPreferencesFragment);
+    void inject(PushNotificationsPreferencesFragment pushNotificationsPreferencesFragment);
 
     void inject(WelcomeFragment welcomeFragment);
 
-    void inject(@NotNull NavigationDrawerFragment navigationDrawerFragment);
+    void inject(NavigationDrawerFragment navigationDrawerFragment);
 
-    void inject(@NotNull ChallengeDetailFragment challengeDetailFragment);
+    void inject(ChallengeDetailFragment challengeDetailFragment);
 
-    void inject(@NotNull VerifyUsernameActivity verifyUsernameActivity);
+    void inject(VerifyUsernameActivity verifyUsernameActivity);
 
-    void inject(@NotNull GroupViewModel viewModel);
+    void inject(GroupViewModel viewModel);
 
-    void inject(@NotNull NotificationsViewModel viewModel);
+    void inject(NotificationsViewModel viewModel);
 
-    void inject(@NotNull ChatFragment chatFragment);
+    void inject(ChatFragment chatFragment);
 
-    void inject(@NotNull GiftSubscriptionActivity giftSubscriptionActivity);
+    void inject(GiftSubscriptionActivity giftSubscriptionActivity);
 
-    void inject(@NotNull AboutFragment aboutFragment);
+    void inject(AboutFragment aboutFragment);
 
-    void inject(@NotNull ChatBarView chatBarView);
+    void inject(ChatBarView chatBarView);
 
-    void inject(@NotNull TaskFormActivity taskFormActivity);
+    void inject(TaskFormActivity taskFormActivity);
 
-    void inject(@NotNull ReportMessageActivity reportMessageActivity);
+    void inject(ReportMessageActivity reportMessageActivity);
 
-    void inject(@NotNull GuildDetailFragment guildDetailFragment);
+    void inject(GuildDetailFragment guildDetailFragment);
 
-    void inject(@NotNull AchievementsFragment achievementsFragment);
+    void inject(AchievementsFragment achievementsFragment);
 
-    void inject(@NotNull InboxViewModel inboxViewModel);
+    void inject(InboxViewModel inboxViewModel);
 
-    void inject(@NotNull InsufficientGemsDialog insufficientGemsDialog);
+    void inject(InsufficientGemsDialog insufficientGemsDialog);
 
-    void inject(@NotNull GiftGemsActivity giftGemsActivity);
+    void inject(GiftGemsActivity giftGemsActivity);
 
-    void inject(@NotNull GiftPurchaseGemsFragment giftPurchaseGemsFragment);
+    void inject(GiftPurchaseGemsFragment giftPurchaseGemsFragment);
 
-    void inject(@NotNull GiftBalanceGemsFragment giftBalanceGemsFragment);
+    void inject(GiftBalanceGemsFragment giftBalanceGemsFragment);
 
-    void inject(@NotNull EmailNotificationsPreferencesFragment emailNotificationsPreferencesFragment);
+    void inject(EmailNotificationsPreferencesFragment emailNotificationsPreferencesFragment);
 
-    void inject(@NotNull SupportMainFragment supportMainFragment);
+    void inject(SupportMainFragment supportMainFragment);
 
-    void inject(@NotNull BugFixFragment bugFixFragment);
+    void inject(BugFixFragment bugFixFragment);
 
-    void inject(@NotNull AvatarEquipmentFragment avatarEquipmentFragment);
+    void inject(AvatarEquipmentFragment avatarEquipmentFragment);
 
-    void inject(@NotNull FAQDetailFragment faqDetailFragment);
+    void inject(FAQDetailFragment faqDetailFragment);
 
-    void inject(@NotNull AdventureGuideActivity adventureGuideFragment);
+    void inject(AdventureGuideActivity adventureGuideFragment);
 
-    void inject(@NotNull PromoInfoFragment promoInfoFragment);
+    void inject(PromoInfoFragment promoInfoFragment);
+
+    void inject(@NotNull TeamBoardFragment teamBoardFragment);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index b1b5b65f6..00acf848c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -15,8 +15,8 @@ import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.FlowableTransformer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.FlowableTransformer
 import retrofit2.HttpException
 
 
@@ -54,17 +54,17 @@ interface ApiClient {
 
     fun buyItem(itemKey: String, purchaseQuantity: Int): Flowable<BuyResponse>
 
-    fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Any>
+    fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Void>
 
-    fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Any>
+    fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Void>
 
-    fun purchaseMysterySet(itemKey: String): Flowable<Any>
+    fun purchaseMysterySet(itemKey: String): Flowable<Void>
 
-    fun purchaseQuest(key: String): Flowable<Any>
-    fun purchaseSpecialSpell(key: String): Flowable<Any>
+    fun purchaseQuest(key: String): Flowable<Void>
+    fun purchaseSpecialSpell(key: String): Flowable<Void>
     fun validateSubscription(request: SubscriptionValidationRequest): Flowable<Any>
     fun validateNoRenewSubscription(request: PurchaseValidationRequest): Flowable<Any>
-    fun cancelSubscription(): Flowable<Any>
+    fun cancelSubscription(): Flowable<Void>
 
     fun sellItem(itemType: String, itemKey: String): Flowable<User>
 
@@ -80,6 +80,7 @@ interface ApiClient {
     fun getTask(id: String): Flowable<Task>
 
     fun postTaskDirection(id: String, direction: String): Flowable<TaskDirectionData>
+    fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData>
 
     fun postTaskNewPosition(id: String, position: Int): Flowable<List<String>>
 
@@ -214,9 +215,9 @@ interface ApiClient {
     fun debugAddTenGems(): Flowable<Void>
 
     // Notifications
-    fun readNotification(notificationId: String): Flowable<List<*>>
-    fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>>
-    fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>>
+    fun readNotification(notificationId: String): Flowable<List<Any>>
+    fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
+    fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
 
     fun getErrorResponse(throwable: HttpException): ErrorResponse
 
@@ -234,6 +235,8 @@ interface ApiClient {
 
     fun runCron(): Flowable<Void>
 
+    fun reroll(): Flowable<User>
+
     fun resetAccount(): Flowable<Void>
     fun deleteAccount(password: String): Flowable<Void>
 
@@ -260,4 +263,6 @@ interface ApiClient {
     fun transferGems(giftedID: String, amount: Int): Flowable<Void>
     fun unlinkAllTasks(challengeID: String?, keepOption: String): Flowable<Void>
     fun blockMember(userID: String): Flowable<List<String>>
+    fun getTeamPlans(): Flowable<List<TeamPlan>>
+    fun getTeamPlanTasks(teamID: String): Flowable<TaskList>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
index 893c13449..1a0ad4a4f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface ChallengeRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
index cc5295c13..f72a0aa83 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
@@ -4,12 +4,12 @@ import android.content.Context
 import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 interface ContentRepository {
 
     fun retrieveContent(context: Context?): Flowable<ContentResult>
     fun retrieveContent(context: Context?, forced: Boolean): Flowable<ContentResult>
 
-    fun retrieveWorldState(): Flowable<WorldState>
+    fun retrieveWorldState(context: Context?): Flowable<WorldState>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
index 2e47c0c25..8f946aaf6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.inventory.Customization
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface CustomizationRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
index 878bdaf22..ce59effda 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.FAQArticle
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface FAQRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
index b75880b2a..d64964f95 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.models.responses.FeedResponse
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.*
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 
@@ -65,14 +65,14 @@ interface InventoryRepository : BaseRepository {
     fun retrieveShopInventory(identifier: String): Flowable<Shop>
     fun retrieveMarketGear(): Flowable<Shop>
 
-    fun purchaseMysterySet(categoryIdentifier: String): Flowable<Any>
+    fun purchaseMysterySet(categoryIdentifier: String): Flowable<Void>
 
-    fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Any>
+    fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Void>
 
-    fun purchaseQuest(key: String): Flowable<Any>
-    fun purchaseSpecialSpell(key: String): Flowable<Any>
+    fun purchaseQuest(key: String): Flowable<Void>
+    fun purchaseSpecialSpell(key: String): Flowable<Void>
 
-    fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Any>
+    fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Void>
 
     fun togglePinnedItem(item: ShopItem): Flowable<List<ShopItem>>
     fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flowable<out RealmResults<out Item>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
index 5f4d7ff9c..951ced677 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
@@ -6,8 +6,8 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
 import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 import java.util.*
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
index 519e2dba5..b93950bb8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
@@ -2,8 +2,8 @@ package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.Tag
 
-import io.reactivex.Flowable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 
 interface TagRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
index 05447f8ef..fabe38ec6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
@@ -1,14 +1,16 @@
 package com.habitrpg.android.habitica.data
 
+import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData
 import com.habitrpg.android.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.tasks.RemindersItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.Single
 import io.realm.Realm
 import io.realm.RealmResults
 import java.util.*
@@ -40,7 +42,7 @@ interface TaskRepository : BaseRepository {
 
     fun saveReminder(remindersItem: RemindersItem)
 
-    fun executeTransaction(transaction: Realm.Transaction)
+    fun <T: BaseObject> modify(obj: T, transaction: (T) -> Unit)
 
     fun swapTaskPosition(firstPosition: Int, secondPosition: Int)
 
@@ -61,4 +63,5 @@ interface TaskRepository : BaseRepository {
     fun syncErroredTasks(): Single<List<Task>>
     fun unlinkAllTasks(challengeID: String?, keepOption: String): Flowable<Void>
     fun getTasksForChallenge(challengeID: String?): Flowable<RealmResults<Task>>
+    fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
index 3bf5b3dfc..0703472e8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface TutorialRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
index d4fdf1409..2cd201072 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
@@ -1,33 +1,36 @@
 package com.habitrpg.android.habitica.data
 
+import com.habitrpg.android.habitica.data.local.UserQuestStatus
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.QuestAchievement
 import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.inventory.Customization
 import com.habitrpg.android.habitica.models.inventory.CustomizationSet
 import com.habitrpg.android.habitica.models.responses.SkillResponse
 import com.habitrpg.android.habitica.models.responses.UnlockResponse
 import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse
+import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.RealmResults
 
 interface UserRepository : BaseRepository {
     fun getUser(): Flowable<User>
 
     fun getUser(userID: String): Flowable<User>
-    fun updateUser(user: User?, updateData: Map<String, Any>): Flowable<User>
-    fun updateUser(user: User?, key: String, value: Any): Flowable<User>
+    fun updateUser(updateData: Map<String, Any>): Flowable<User>
+    fun updateUser(key: String, value: Any): Flowable<User>
 
     fun retrieveUser(withTasks: Boolean): Flowable<User>
-    fun retrieveUser(withTasks: Boolean = false, forced: Boolean = false): Flowable<User>
+    fun retrieveUser(withTasks: Boolean = false, forced: Boolean = false, overrideExisting: Boolean = false): Flowable<User>
 
     fun revive(user: User): Flowable<User>
 
-    fun resetTutorial(user: User?)
+    fun resetTutorial()
 
     fun sleep(user: User): Flowable<User>
 
@@ -45,19 +48,19 @@ interface UserRepository : BaseRepository {
 
     fun changeClass(selectedClass: String): Flowable<User>
 
-    fun unlockPath(user: User, customization: Customization): Flowable<UnlockResponse>
-    fun unlockPath(user: User, set: CustomizationSet): Flowable<UnlockResponse>
+    fun unlockPath(user: User?, customization: Customization): Flowable<UnlockResponse>
+    fun unlockPath(set: CustomizationSet): Flowable<UnlockResponse>
 
     fun runCron(tasks: MutableList<Task>)
     fun runCron()
 
-    fun readNotification(id: String): Flowable<List<*>>
-    fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>>
-    fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>>
+    fun readNotification(id: String): Flowable<List<Any>>
+    fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
+    fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
 
     fun changeCustomDayStart(dayStartTime: Int): Flowable<User>
 
-    fun updateLanguage(user: User?, languageCode: String): Flowable<User>
+    fun updateLanguage(languageCode: String): Flowable<User>
 
     fun resetAccount(): Flowable<User>
     fun deleteAccount(password: String): Flowable<Void>
@@ -69,7 +72,7 @@ interface UserRepository : BaseRepository {
     fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Flowable<Void>
     fun verifyUsername(username: String): Flowable<VerifyUsernameResponse>
 
-    fun allocatePoint(user: User?, stat: String): Flowable<Stats>
+    fun allocatePoint(stat: String): Flowable<Stats>
 
     fun bulkAllocatePoints(user: User?, strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable<Stats>
     fun useCustomization(user: User?, type: String, category: String?, identifier: String): Flowable<User>
@@ -77,5 +80,11 @@ interface UserRepository : BaseRepository {
     fun getAchievements(): Flowable<RealmResults<Achievement>>
     fun getQuestAchievements(): Flowable<RealmResults<QuestAchievement>>
 
-    fun getIsUserOnQuest(): Flowable<Boolean>
+    fun getUserQuestStatus(): Flowable<UserQuestStatus>
+
+    fun reroll(): Flowable<User>
+    fun retrieveTeamPlans(): Flowable<List<TeamPlan>>
+    fun getTeamPlans(): Flowable<RealmResults<TeamPlan>>
+    fun retrieveTeamPlan(teamID: String): Flowable<Group>
+    fun getTeamPlan(teamID: String): Flowable<Group>
 }
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..bce8061e1 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
@@ -32,12 +32,11 @@ import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
-import io.reactivex.Flowable
-import io.reactivex.FlowableTransformer
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.FlowableTransformer
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -45,7 +44,7 @@ import okhttp3.logging.HttpLoggingInterceptor
 import org.greenrobot.eventbus.EventBus
 import retrofit2.HttpException
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import java.io.IOException
 import java.net.SocketException
@@ -126,9 +125,9 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
                     if (BuildConfig.STAGING_KEY.isNotEmpty()) {
                         builder = builder.header("Authorization", "Basic " + BuildConfig.STAGING_KEY)
                     }
-                    val request = builder.method(original.method(), original.body())
+                    val request = builder.method(original.method, original.body)
                             .build()
-                    lastAPICallURL = original.url().toString()
+                    lastAPICallURL = original.url.toString()
                     chain.proceed(request)
                 }
                 .readTimeout(2400, TimeUnit.SECONDS)
@@ -139,7 +138,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         retrofitAdapter = Retrofit.Builder()
                 .client(client)
                 .baseUrl(server.toString())
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .addConverterFactory(gsonConverter)
                 .build()
 
@@ -194,12 +193,12 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
             this.showConnectionProblemDialog(R.string.internal_error_api)
         } else if (throwableClass == SocketTimeoutException::class.java || UnknownHostException::class.java == throwableClass) {
             this.showConnectionProblemDialog(R.string.network_error_no_network_body)
-        } else if (throwableClass == retrofit2.adapter.rxjava2.HttpException::class.java) {
+        } else if (throwableClass == retrofit2.adapter.rxjava3.HttpException::class.java) {
             val error = throwable as HttpException
             val res = getErrorResponse(error)
             val status = error.code()
 
-            if (status == 404 || error.response()?.raw()?.request()?.url()?.toString()?.endsWith("/user/push-devices") == true) {
+            if (status == 404 || error.response()?.raw()?.request?.url?.toString()?.endsWith("/user/push-devices") == true) {
                 //workaround for an error that sometimes displays that the user already has this push device
                 return
             }
@@ -243,7 +242,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
             val tasksObservable = this.tasks
 
             userObservable = Flowable.zip(userObservable, tasksObservable,
-                    BiFunction { habitRPGUser, tasks ->
+                    { habitRPGUser, tasks ->
                         habitRPGUser.tasks = tasks
                         habitRPGUser
                     })
@@ -338,7 +337,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.blockMember(userID).compose(configureApiCallObserver())
     }
 
-    override fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Any> {
+    override fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Void> {
         return apiService.purchaseItem(type, itemKey, mapOf(Pair("quantity", purchaseQuantity))).compose(configureApiCallObserver())
     }
 
@@ -360,23 +359,23 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         }
     }
 
-    override fun cancelSubscription(): Flowable<Any> {
+    override fun cancelSubscription(): Flowable<Void> {
         return apiService.cancelSubscription().compose(configureApiCallObserver())
     }
 
-    override fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Any> {
+    override fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Void> {
         return apiService.purchaseHourglassItem(type, itemKey).compose(configureApiCallObserver())
     }
 
-    override fun purchaseMysterySet(itemKey: String): Flowable<Any> {
+    override fun purchaseMysterySet(itemKey: String): Flowable<Void> {
         return apiService.purchaseMysterySet(itemKey).compose(configureApiCallObserver())
     }
 
-    override fun purchaseQuest(key: String): Flowable<Any> {
+    override fun purchaseQuest(key: String): Flowable<Void> {
         return apiService.purchaseQuest(key).compose(configureApiCallObserver())
     }
 
-    override fun purchaseSpecialSpell(key: String): Flowable<Any> {
+    override fun purchaseSpecialSpell(key: String): Flowable<Void> {
         return apiService.purchaseSpecialSpell(key).compose(configureApiCallObserver())
     }
 
@@ -422,6 +421,10 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.postTaskDirection(id, direction).compose(configureApiCallObserver())
     }
 
+    override fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData> {
+        return apiService.bulkScoreTasks(data).compose(configureApiCallObserver())
+    }
+
     override fun postTaskNewPosition(id: String, position: Int): Flowable<List<String>> {
         return apiService.postTaskNewPosition(id, position).compose(configureApiCallObserver())
     }
@@ -691,15 +694,15 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.debugAddTenGems().compose(configureApiCallObserver())
     }
 
-    override fun readNotification(notificationId: String): Flowable<List<*>> {
+    override fun readNotification(notificationId: String): Flowable<List<Any>> {
         return apiService.readNotification(notificationId).compose(configureApiCallObserver())
     }
 
-    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>> {
+    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> {
         return apiService.readNotifications(notificationIds).compose(configureApiCallObserver())
     }
 
-    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>> {
+    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> {
         return apiService.seeNotifications(notificationIds).compose(configureApiCallObserver())
     }
 
@@ -714,6 +717,11 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.runCron().compose(configureApiCallObserver())
     }
 
+
+    override fun reroll(): Flowable<User> {
+        return apiService.reroll().compose(configureApiCallObserver())
+    }
+
     override fun resetAccount(): Flowable<Void> {
         return apiService.resetAccount().compose(configureApiCallObserver())
     }
@@ -776,6 +784,14 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.transferGems(mapOf(Pair("toUserId", giftedID), Pair("gemAmount", amount))).compose(configureApiCallObserver())
     }
 
+    override fun getTeamPlans(): Flowable<List<TeamPlan>> {
+        return apiService.getTeamPlans().compose(configureApiCallObserver())
+    }
+
+    override fun getTeamPlanTasks(teamID: String): Flowable<TaskList> {
+        return apiService.getTeamPlanTasks(teamID).compose(configureApiCallObserver())
+    }
+
     override fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable<Stats> {
         val body = HashMap<String, Map<String, Int>>()
         val stats = HashMap<String, Int>()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
index 32db15bf1..effa4d57b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
index 88949f64a..61caa63e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
@@ -1,13 +1,14 @@
 package com.habitrpg.android.habitica.data.implementation
 
 import android.content.Context
+import androidx.preference.PreferenceManager
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.data.local.ContentLocalRepository
 import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
 import com.habitrpg.android.habitica.models.inventory.SpecialItem
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmList
 import java.util.*
 
@@ -36,11 +37,20 @@ abstract class ContentRepositoryImpl<T : ContentLocalRepository>(localRepository
         }
     }
 
-    override fun retrieveWorldState(): Flowable<WorldState> {
+    override fun retrieveWorldState(context: Context?): Flowable<WorldState> {
         val now = Date().time
         return if (now - this.lastWorldStateSync > 3600000) {
             lastWorldStateSync = now
-            apiClient.worldState.doOnNext { localRepository.saveWorldState(it) }
+            apiClient.worldState.doOnNext {
+                localRepository.saveWorldState(it)
+
+                val editor = PreferenceManager.getDefaultSharedPreferences(context).edit()
+                editor.putString("currentEvent", it.currentEventKey)
+                editor.putString("currentEventPromo", it.currentEventPromo)
+                editor.putLong("currentEventStartDate", it.currentEventStartDate?.time ?: 0)
+                editor.putLong("currentEventEndDate", it.currentEventEndDate?.time ?: 0)
+                editor.apply()
+            }
         } else {
             Flowable.empty()
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
index ecbaf8021..2b68b5a51 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.data.CustomizationRepository
 import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository
 import com.habitrpg.android.habitica.models.inventory.Customization
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 class CustomizationRepositoryImpl(localRepository: CustomizationLocalRepository, apiClient: ApiClient, userID: String) : BaseRepositoryImpl<CustomizationLocalRepository>(localRepository, apiClient, userID), CustomizationRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
index 0425a8558..8f9127a7a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.data.FAQRepository
 import com.habitrpg.android.habitica.data.local.FAQLocalRepository
 import com.habitrpg.android.habitica.models.FAQArticle
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 
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..32e5f70ab 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
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.models.responses.FeedResponse
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.*
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClient: ApiClient, userID: String, var appConfigManager: AppConfigManager) : BaseRepositoryImpl<InventoryLocalRepository>(localRepository, apiClient, userID), InventoryRepository {
@@ -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> {
@@ -135,21 +135,23 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
     private fun sellItem(user: User?, item: Item, ownedItem: OwnedItem): Flowable<User> {
         if (user != null && appConfigManager.enableLocalChanges()) {
             localRepository.executeTransaction {
-                ownedItem.numberOwned -= 1
-                user.stats?.gp = (user.stats?.gp ?: 0.0) + item.value
+                val liveItem = localRepository.getLiveObject(ownedItem)
+                val liveUser = localRepository.getLiveObject(user)
+                liveItem?.numberOwned = (liveItem?.numberOwned ?: 0) - 1
+                liveUser?.stats?.gp = (user.stats?.gp ?: 0.0) + item.value
             }
         }
         return apiClient.sellItem(item.type, item.key)
                 .map { user1 ->
-                    localRepository.executeTransaction { realm ->
+                    localRepository.modifyWithRealm(user1) { realm, liveUser ->
                         if (user != null) {
-                            val items = user1.items
+                            val items = liveUser.items
                             if (items != null) {
                                 items.userId = user.id
                                 val newItems = realm.copyToRealmOrUpdate(items)
                                 user.items = newItems
                             }
-                            val stats = user1.stats
+                            val stats = liveUser.stats
                             if (stats != null) {
                                 stats.userId = user.id
                                 val newStats = realm.copyToRealmOrUpdate(stats)
@@ -167,16 +169,16 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
 
     override fun equip(user: User?, type: String, key: String): Flowable<Items> {
         if (user != null && appConfigManager.enableLocalChanges()) {
-            localRepository.executeTransaction {
+            localRepository.modify(user) { liveUser ->
                 if (type == "mount") {
-                    user.items?.currentMount = key
+                    liveUser.items?.currentMount = key
                 } else if (type == "pet") {
-                    user.items?.currentPet = key
+                    liveUser.items?.currentPet = key
                 }
                 val outfit = if (type == "costume") {
-                    user.items?.gear?.costume
+                    liveUser.items?.gear?.costume
                 } else {
-                    user.items?.gear?.equipped
+                    liveUser.items?.gear?.equipped
                 }
                 when (key.split("_").firstOrNull()) {
                     "weapon" -> outfit?.weapon = key
@@ -195,24 +197,24 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
                     if (user == null) {
                         return@doOnNext
                     }
-                    localRepository.executeTransaction {
+                    localRepository.modify(user) { liveUser ->
                         val newEquipped = items.gear?.equipped
-                        val oldEquipped = user.items?.gear?.equipped
+                        val oldEquipped = liveUser.items?.gear?.equipped
                         val newCostume = items.gear?.costume
-                        val oldCostume = user.items?.gear?.costume
+                        val oldCostume = liveUser.items?.gear?.costume
                         newEquipped?.let { equipped -> oldEquipped?.updateWith(equipped) }
                         newCostume?.let { costume -> oldCostume?.updateWith(costume) }
-                        user.items?.currentMount = items.currentMount
-                        user.items?.currentPet = items.currentPet
-                        user.balance = user.balance
+                        liveUser.items?.currentMount = items.currentMount
+                        liveUser.items?.currentPet = items.currentPet
+                        liveUser.balance = liveUser.balance
                     }
                 }
     }
 
     override fun feedPet(pet: Pet, food: Food): Flowable<FeedResponse> {
-        return apiClient.feedPet(pet.key, food.key)
+        return apiClient.feedPet(pet.key ?: "", food.key)
                 .doOnNext { feedResponse ->
-                    localRepository.feedPet(food.key, pet.key, feedResponse.value ?: 0, userID)
+                    localRepository.feedPet(food.key, pet.key ?: "", feedResponse.value ?: 0, userID)
                 }
     }
 
@@ -276,23 +278,23 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
         return apiClient.retrieveMarketGear()
     }
 
-    override fun purchaseMysterySet(categoryIdentifier: String): Flowable<Any> {
+    override fun purchaseMysterySet(categoryIdentifier: String): Flowable<Void> {
         return apiClient.purchaseMysterySet(categoryIdentifier)
     }
 
-    override fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Any> {
+    override fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Void> {
         return apiClient.purchaseHourglassItem(purchaseType, key)
     }
 
-    override fun purchaseQuest(key: String): Flowable<Any> {
+    override fun purchaseQuest(key: String): Flowable<Void> {
         return apiClient.purchaseQuest(key)
     }
 
-    override fun purchaseSpecialSpell(key: String): Flowable<Any> {
+    override fun purchaseSpecialSpell(key: String): Flowable<Void> {
         return apiClient.purchaseSpecialSpell(key)
     }
 
-    override fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Any> {
+    override fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Void> {
         return apiClient.purchaseItem(purchaseType, key, purchaseQuantity)
     }
 
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..331153721 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
@@ -11,10 +11,8 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
 import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Single
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 import java.util.*
 import kotlin.collections.HashMap
@@ -71,7 +69,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 +128,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
                 }
         )
@@ -268,7 +266,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
         return apiClient.markPrivateMessagesRead()
                 .doOnNext {
                     if (user?.isManaged == true) {
-                        localRepository.executeTransaction { user.inbox?.newMessages = 0 }
+                        localRepository.modify(user) { it.inbox?.newMessages = 0 }
                     }
                 }
     }
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..1ec15344d 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
@@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.TagRepository
 import com.habitrpg.android.habitica.data.local.TagLocalRepository
 import com.habitrpg.android.habitica.models.Tag
-import io.reactivex.Flowable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 
 
@@ -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..8390ee120 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
@@ -6,17 +6,17 @@ import com.habitrpg.android.habitica.data.local.TaskLocalRepository
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.interactors.ScoreTaskLocallyInteractor
+import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData
 import com.habitrpg.android.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.tasks.*
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.Single
-import io.reactivex.functions.Consumer
-import io.realm.Realm
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 import java.text.SimpleDateFormat
 import java.util.*
@@ -36,8 +36,8 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
     override fun getCurrentUserTasks(taskType: String): Flowable<RealmResults<Task>> =
             this.localRepository.getTasks(taskType, userID)
 
-    override fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList) {
-        localRepository.saveTasks(userId, order, tasks)
+    override fun saveTasks(ownerID: String, order: TasksOrder, tasks: TaskList) {
+        localRepository.saveTasks(ownerID, order, tasks)
     }
 
     override fun retrieveTasks(userId: String, tasksOrder: TasksOrder): Flowable<TaskList> {
@@ -49,9 +49,7 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
         return this.apiClient.getTasks("completedTodos")
                 .doOnNext { taskList ->
                     val tasks = taskList.tasks
-                    if (tasks != null) {
-                        this.localRepository.saveCompletedTodos(userId, tasks.values)
-                    }
+                    this.localRepository.saveCompletedTodos(userId, tasks.values)
                 }
     }
 
@@ -75,7 +73,9 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
             result.manaDelta = localData.mp - (stats?.mp ?: 0.0)
             result.goldDelta = localData.gp - (stats?.gp ?: 0.0)
             result.hasLeveledUp = localData.lvl > stats?.lvl ?: 0
+            result.level = localData.lvl
             result.questDamage = localData._tmp?.quest?.progressDelta
+            result.questItemsFound = localData._tmp?.quest?.collection
             result.drop = localData._tmp?.drop
             notifyFunc?.invoke(result)
 
@@ -107,7 +107,9 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
                     result.manaDelta = res.mp - (stats?.mp ?: 0.0)
                     result.goldDelta = res.gp - (stats?.gp ?: 0.0)
                     result.hasLeveledUp = res.lvl > stats?.lvl ?: 0
+                    result.level = res.lvl
                     result.questDamage = res._tmp?.quest?.progressDelta
+                    result.questItemsFound = res._tmp?.quest?.collection
                     result.drop = res._tmp?.drop
                     if (localData == null) {
                         notifyFunc?.invoke(result)
@@ -117,12 +119,14 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
                 }
     }
 
+    override fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData> {
+        return apiClient.bulkScoreTasks(listOf())
+    }
+
     private fun handleTaskResponse(user: User, res: TaskDirectionData, task: Task, up: Boolean, localDelta: Float) {
-        val userID = user.id
-        val taskID = task.id
         this.localRepository.executeTransaction {
-            val bgTask = it.where(Task::class.java).equalTo("id", taskID).findFirst() ?: return@executeTransaction
-            val bgUser = it.where(User::class.java).equalTo("id", userID).findFirst() ?: return@executeTransaction
+            val bgTask = localRepository.getLiveObject(task) ?: return@executeTransaction
+            val bgUser = localRepository.getLiveObject(user) ?: return@executeTransaction
             if (bgTask.type != "reward" && (bgTask.value - localDelta) + res.delta != bgTask.value) {
                 bgTask.value = (bgTask.value - localDelta) + res.delta
                 if (Task.TYPE_DAILY == bgTask.type || Task.TYPE_TODO == bgTask.type) {
@@ -178,7 +182,7 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
                 .doOnNext { task ->
                     val updatedItem: ChecklistItem? = task.checklist?.lastOrNull { itemId == it.id }
                     if (updatedItem != null) {
-                        localRepository.executeTransaction { updatedItem.completed = !updatedItem.completed }
+                        localRepository.modify(updatedItem) { liveItem -> liveItem.completed = !liveItem.completed }
                     }
                 }
     }
@@ -260,8 +264,8 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
         localRepository.saveReminder(remindersItem)
     }
 
-    override fun executeTransaction(transaction: Realm.Transaction) {
-        localRepository.executeTransaction(transaction)
+    override fun <T: BaseObject> modify(obj: T, transaction: (T) -> Unit) {
+        localRepository.modify(obj, transaction)
     }
 
     override fun swapTaskPosition(firstPosition: Int, secondPosition: Int) {
@@ -277,11 +281,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/TutorialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
index 5c18f53a0..3aa383e4d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.TutorialRepository
 import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 
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..f84e644ee 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
@@ -4,22 +4,25 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.data.local.UserLocalRepository
+import com.habitrpg.android.habitica.data.local.UserQuestStatus
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.QuestAchievement
 import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.inventory.Customization
 import com.habitrpg.android.habitica.models.inventory.CustomizationSet
 import com.habitrpg.android.habitica.models.responses.SkillResponse
+import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.responses.UnlockResponse
 import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse
+import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.RealmResults
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -33,26 +36,28 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
 
     override fun getUser(userID: String): Flowable<User> = localRepository.getUser(userID)
 
-    override fun updateUser(user: User?, updateData: Map<String, Any>): Flowable<User> {
-        return apiClient.updateUser(updateData).map { newUser -> mergeUser(user, newUser) }
+    override fun updateUser(updateData: Map<String, Any>): Flowable<User> {
+        return Flowable.zip(apiClient.updateUser(updateData),
+                localRepository.getUser(userID).firstElement().toFlowable(),
+                { newUser, user -> mergeUser(user, newUser) })
     }
 
-    override fun updateUser(user: User?, key: String, value: Any): Flowable<User> {
+    override fun updateUser(key: String, value: Any): Flowable<User> {
         val updateData = HashMap<String, Any>()
         updateData[key] = value
-        return updateUser(user, updateData)
+        return updateUser(updateData)
     }
 
     override fun retrieveUser(withTasks: Boolean): Flowable<User> =
             retrieveUser(withTasks, false)
 
     @Suppress("ReturnCount")
-    override fun retrieveUser(withTasks: Boolean, forced: Boolean): Flowable<User> {
+    override fun retrieveUser(withTasks: Boolean, forced: Boolean, overrideExisting: Boolean): Flowable<User> {
         // Only retrieve again after 3 minutes or it's forced.
         if (forced || this.lastSync == null || Date().time - (this.lastSync?.time ?: 0) > 180000) {
             lastSync = Date()
             return apiClient.retrieveUser(withTasks)
-                    .doOnNext { localRepository.saveUser(it) }
+                    .doOnNext { localRepository.saveUser(it, overrideExisting) }
                     .doOnNext { user ->
                         if (withTasks) {
                             val id = user.id
@@ -68,7 +73,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
                         val timeZone = calendar.timeZone
                         val offset = -TimeUnit.MINUTES.convert(timeZone.getOffset(calendar.timeInMillis).toLong(), TimeUnit.MILLISECONDS)
                         if (offset.toInt() != user.preferences?.timezoneOffset ?: 0) {
-                            return@flatMap updateUser(user, "preferences.timezoneOffset", offset.toString())
+                            return@flatMap updateUser("preferences.timezoneOffset", offset.toString())
                         } else {
                             return@flatMap Flowable.just(user)
                         }
@@ -80,8 +85,9 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
 
     override fun revive(user: User): Flowable<User> =
             apiClient.revive().map { newUser -> mergeUser(user, newUser) }
+                    .flatMap { retrieveUser(false, true) }
 
-    override fun resetTutorial(user: User?) {
+    override fun resetTutorial() {
         localRepository.getTutorialSteps()
                 .firstElement()
                 .map<Map<String, Any>> { tutorialSteps ->
@@ -91,12 +97,12 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
                     }
                     updateData
                 }
-                .flatMap { updateData -> updateUser(user, updateData).firstElement() }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                .flatMap { updateData -> updateUser(updateData).firstElement() }
+                .subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
     override fun sleep(user: User): Flowable<User> {
-        localRepository.executeTransaction { user.preferences?.isSleep = !(user.preferences?.sleep ?: false) }
+        localRepository.modify(user) { it.preferences?.sleep = !(it.preferences?.sleep ?: false) }
         return apiClient.sleep().map { user }
     }
 
@@ -135,19 +141,22 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
 
     override fun changeClass(selectedClass: String): Flowable<User> = apiClient.changeClass(selectedClass).flatMap { retrieveUser(false) }
 
-    override fun unlockPath(user: User, customization: Customization): Flowable<UnlockResponse> {
-        return apiClient.unlockPath(customization.path)
-                .doOnNext { unlockResponse ->
-                    val copiedUser = localRepository.getUnmanagedCopy(user)
+    override fun unlockPath(user: User?, customization: Customization): Flowable<UnlockResponse> {
+        var path = customization.path
+        if (path.last() == '.' && customization.type == "background") {
+            path += user?.preferences?.background
+        }
+        return Flowable.zip(apiClient.unlockPath(path), localRepository.getUser(userID).firstElement().toFlowable(), { unlockResponse, copiedUser ->
                     copiedUser.preferences = unlockResponse.preferences
                     copiedUser.purchased = unlockResponse.purchased
                     copiedUser.items = unlockResponse.items
                     copiedUser.balance = copiedUser.balance - (customization.price ?: 0) / 4.0
-                    localRepository.saveUser(copiedUser)
-                }
+                    localRepository.saveUser(copiedUser, false)
+            unlockResponse
+                })
     }
 
-    override fun unlockPath(user: User, set: CustomizationSet): Flowable<UnlockResponse> {
+    override fun unlockPath(set: CustomizationSet): Flowable<UnlockResponse> {
         var path = ""
         for (customization in set.customizations) {
             path = path + "," + customization.path
@@ -156,30 +165,34 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
             return Flowable.just(null)
         }
         path = path.substring(1)
-        return apiClient.unlockPath(path)
-                .doOnNext { unlockResponse ->
-                    val copiedUser = localRepository.getUnmanagedCopy(user)
+        return Flowable.zip(apiClient.unlockPath(path), localRepository.getUser(userID).firstElement().toFlowable(), { unlockResponse, copiedUser ->
                     copiedUser.preferences = unlockResponse.preferences
                     copiedUser.purchased = unlockResponse.purchased
                     copiedUser.items = unlockResponse.items
                     copiedUser.balance = copiedUser.balance - set.price / 4.0
-                    localRepository.saveUser(copiedUser)
-                }
+                    localRepository.saveUser(copiedUser, false)
+            unlockResponse
+                })
     }
 
     override fun runCron() {
         runCron(ArrayList())
     }
 
-    override fun readNotification(id: String): Flowable<List<*>> = apiClient.readNotification(id)
-    override fun getIsUserOnQuest(): Flowable<Boolean> {
-        return localRepository.getIsUserOnQuest(userID)
+    override fun readNotification(id: String): Flowable<List<Any>> = apiClient.readNotification(id)
+    override fun getUserQuestStatus(): Flowable<UserQuestStatus> {
+        return localRepository.getUserQuestStatus(userID)
     }
 
-    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>> =
+    override fun reroll(): Flowable<User> {
+        return apiClient.reroll()
+                .flatMap { retrieveUser(true, true, true) }
+    }
+
+    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> =
             apiClient.readNotifications(notificationIds)
 
-    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>> =
+    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> =
             apiClient.seeNotifications(notificationIds)
 
     override fun changeCustomDayStart(dayStartTime: Int): Flowable<User> {
@@ -188,8 +201,8 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         return apiClient.changeCustomDayStart(updateObject)
     }
 
-    override fun updateLanguage(user: User?, languageCode: String): Flowable<User> {
-        return updateUser(user, "preferences.language", languageCode)
+    override fun updateLanguage(languageCode: String): Flowable<User> {
+        return updateUser("preferences.language", languageCode)
                 .doOnNext { apiClient.setLanguageCode(languageCode) }
     }
 
@@ -210,9 +223,9 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
             apiClient.updateUsername(newLoginName.trim())
         }).flatMapMaybe { localRepository.getUser(userID).firstElement() }
                 .doOnNext { user ->
-                    localRepository.executeTransaction {
-                        user.authentication?.localAuthentication?.username = newLoginName
-                        user.flags?.isVerifiedUsername = true
+                    localRepository.modify(user) { liveUser ->
+                        liveUser.authentication?.localAuthentication?.username = newLoginName
+                        liveUser.flags?.verifiedUsername = true
                     }
                 }
                 .firstElement()
@@ -226,30 +239,26 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
     override fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Flowable<Void> =
             apiClient.updatePassword(oldPassword.trim(), newPassword.trim(), newPasswordConfirmation.trim())
 
-    override fun allocatePoint(user: User?, stat: String): Flowable<Stats> {
-        if (user != null && user.isManaged) {
-            localRepository.executeTransaction {
-                when (stat) {
-                    Stats.STRENGTH -> user.stats?.strength = user.stats?.strength?.inc()
-                    Stats.INTELLIGENCE -> user.stats?.intelligence = user.stats?.intelligence?.inc()
-                    Stats.CONSTITUTION -> user.stats?.constitution= user.stats?.constitution?.inc()
-                    Stats.PERCEPTION -> user.stats?.per = user.stats?.per?.inc()
-                }
-                user.stats?.points = user.stats?.points?.dec()
+    override fun allocatePoint(stat: String): Flowable<Stats> {
+        localRepository.getUser(userID).subscribe( { liveUser ->
+            when (stat) {
+                Stats.STRENGTH -> liveUser.stats?.strength = liveUser.stats?.strength?.inc()
+                Stats.INTELLIGENCE -> liveUser.stats?.intelligence = liveUser.stats?.intelligence?.inc()
+                Stats.CONSTITUTION -> liveUser.stats?.constitution= liveUser.stats?.constitution?.inc()
+                Stats.PERCEPTION -> liveUser.stats?.per = liveUser.stats?.per?.inc()
             }
-        }
+            liveUser.stats?.points = liveUser.stats?.points?.dec()
+        }, RxErrorHandler.handleEmptyError())
         return apiClient.allocatePoint(stat)
                 .doOnNext { stats ->
-                    if (user != null && user.isManaged) {
-                        localRepository.executeTransaction {
-                            user.stats?.strength = stats.strength
-                            user.stats?.constitution = stats.constitution
-                            user.stats?.per = stats.per
-                            user.stats?.intelligence = stats.intelligence
-                            user.stats?.points = stats.points
-                            user.stats?.mp = stats.mp
-                        }
-                    }
+                        /*localRepository.modify(user) { liveUser ->
+                            liveUser.stats?.strength = stats.strength
+                            liveUser.stats?.constitution = stats.constitution
+                            liveUser.stats?.per = stats.per
+                            liveUser.stats?.intelligence = stats.intelligence
+                            liveUser.stats?.points = stats.points
+                            liveUser.stats?.mp = stats.mp
+                        }*/
                 }
     }
 
@@ -257,13 +266,13 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
             apiClient.bulkAllocatePoints(strength, intelligence, constitution, perception)
                     .doOnNext { stats ->
                         if (user != null && user.isManaged) {
-                            localRepository.executeTransaction {
-                                user.stats?.strength = stats.strength
-                                user.stats?.constitution = stats.constitution
-                                user.stats?.per = stats.per
-                                user.stats?.intelligence = stats.intelligence
-                                user.stats?.points = stats.points
-                                user.stats?.mp = stats.mp
+                            localRepository.modify(user) { liveUser ->
+                                liveUser.stats?.strength = stats.strength
+                                liveUser.stats?.constitution = stats.constitution
+                                liveUser.stats?.per = stats.per
+                                liveUser.stats?.intelligence = stats.intelligence
+                                liveUser.stats?.points = stats.points
+                                liveUser.stats?.mp = stats.mp
                             }
                         }
                     }
@@ -271,40 +280,46 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
     override fun runCron(tasks: MutableList<Task>) {
         var observable: Maybe<Any> = localRepository.getUser(userID).firstElement()
                 .filter { it.needsCron }
-                .map {  user -> localRepository.executeTransaction {
-                    user.needsCron = false
-                    user.lastCron = Date()
-                }
+                .map {  user ->
+                    localRepository.modify(user) { liveUser ->
+                        liveUser.needsCron = false
+                        liveUser.lastCron = Date()
+                    }
                     user
                 }
         if (tasks.isNotEmpty()) {
+            val scoringList = mutableListOf<Map<String, String>>()
             for (task in tasks) {
-                observable = observable.flatMap { taskRepository.taskChecked(null, task, true, true, null).firstElement() }
+                val map = mutableMapOf<String, String>()
+                map["id"] = task.id ?: ""
+                map["direction"] = TaskDirection.UP.text
+                scoringList.add(map)
             }
+            observable = observable.flatMap { taskRepository.bulkScoreTasks(scoringList).firstElement() }
         }
         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> {
         if (user != null && appConfigManager.enableLocalChanges()) {
-            localRepository.executeTransaction {
+            localRepository.modify(user) { liveUser ->
                 when (type) {
-                    "skin" -> user.preferences?.setSkin(identifier)
-                    "shirt" -> user.preferences?.setShirt(identifier)
+                    "skin" -> liveUser.preferences?.skin =identifier
+                    "shirt" -> liveUser.preferences?.shirt = identifier
                     "hair" -> {
                         when (category) {
-                            "color" -> user.preferences?.hair?.color = identifier
-                            "flower" -> user.preferences?.hair?.flower = identifier.toInt()
-                            "mustache" -> user.preferences?.hair?.mustache = identifier.toInt()
-                            "beard" -> user.preferences?.hair?.beard = identifier.toInt()
-                            "bangs" -> user.preferences?.hair?.bangs = identifier.toInt()
-                            "base" -> user.preferences?.hair?.base = identifier.toInt()
+                            "color" -> liveUser.preferences?.hair?.color = identifier
+                            "flower" -> liveUser.preferences?.hair?.flower = identifier.toInt()
+                            "mustache" -> liveUser.preferences?.hair?.mustache = identifier.toInt()
+                            "beard" -> liveUser.preferences?.hair?.beard = identifier.toInt()
+                            "bangs" -> liveUser.preferences?.hair?.bangs = identifier.toInt()
+                            "base" -> liveUser.preferences?.hair?.base = identifier.toInt()
                         }
                     }
-                    "background" -> user.preferences?.setBackground(identifier)
-                    "chair" -> user.preferences?.setChair(identifier)
+                    "background" -> liveUser.preferences?.background = identifier
+                    "chair" -> liveUser.preferences?.chair = identifier
                 }
             }
         }
@@ -312,7 +327,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         if (category != null) {
             updatePath = "$updatePath.$category"
         }
-        return updateUser(user, updatePath, identifier)
+        return updateUser(updatePath, identifier)
     }
 
     override fun retrieveAchievements(): Flowable<List<Achievement>> {
@@ -329,6 +344,38 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         return localRepository.getQuestAchievements(userID)
     }
 
+    override fun retrieveTeamPlans(): Flowable<List<TeamPlan>> {
+        return apiClient.getTeamPlans().doOnNext { teams ->
+            teams.forEach { it.userID = userID }
+            localRepository.save(teams)
+        }
+    }
+
+    override fun getTeamPlans(): Flowable<RealmResults<TeamPlan>> {
+        return localRepository.getTeamPlans(userID)
+    }
+
+    override fun retrieveTeamPlan(teamID: String): Flowable<Group> {
+        return Flowable.zip(apiClient.getGroup(teamID), apiClient.getTeamPlanTasks(teamID),
+                { team, tasks ->
+                    team.tasks = tasks
+                    team
+                })
+                .doOnNext { localRepository.save(it) }
+                .doOnNext { team ->
+                    val id = team.id
+                    val tasksOrder = team.tasksOrder
+                    val tasks = team.tasks
+                    if (id.isNotBlank() && tasksOrder != null && tasks != null) {
+                        taskRepository.saveTasks(id, tasksOrder, tasks)
+                    }
+                }
+    }
+
+    override fun getTeamPlan(teamID: String): Flowable<Group> {
+        return localRepository.getTeamPlan(teamID)
+    }
+
     private fun mergeUser(oldUser: User?, newUser: User): User {
         if (oldUser == null || !oldUser.isValid) {
             return oldUser ?: newUser
@@ -362,7 +409,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         copiedUser.needsCron = newUser.needsCron
         copiedUser.versionNumber = newUser.versionNumber
 
-        localRepository.saveUser(copiedUser)
+        localRepository.saveUser(copiedUser, false)
         return copiedUser
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
index daab2d4ee..d4e0f027e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
@@ -1,11 +1,15 @@
 package com.habitrpg.android.habitica.data.local
 
+import android.renderscript.BaseObj
+import com.habitrpg.android.habitica.models.BaseObject
 import io.realm.Realm
+import io.realm.RealmModel
 import io.realm.RealmObject
 
 interface BaseLocalRepository {
 
     val isClosed: Boolean
+    var realm: Realm
 
     fun close()
 
@@ -13,11 +17,14 @@ interface BaseLocalRepository {
     fun executeTransaction(transaction: Realm.Transaction)
     fun executeTransactionAsync(transaction: (Realm) -> Unit)
     fun executeTransactionAsync(transaction: Realm.Transaction)
+    fun <T: BaseObject> modify(obj: T, transaction: (T) -> Unit)
+    fun <T: BaseObject> modifyWithRealm(obj: T, transaction: (Realm, T) -> Unit)
+    fun <T: RealmModel> getLiveObject(obj: T): T?
 
-    fun <T : RealmObject> getUnmanagedCopy(managedObject: T): T
-    fun <T : RealmObject> getUnmanagedCopy(list: List<T>): List<T>
+    fun <T: RealmObject> getUnmanagedCopy(managedObject: T): T
+    fun <T: RealmObject> getUnmanagedCopy(list: List<T>): List<T>
 
-    fun <T : RealmObject> save(objects: List<T>)
-    fun <T : RealmObject> save(`object`: T)
-    fun <T : RealmObject> saveSyncronous(`object`: T)
+    fun <T: RealmObject> save(objects: List<T>)
+    fun <T: RealmObject> save(`object`: T)
+    fun <T: RealmObject> saveSyncronous(`object`: T)
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
index 83c5b5917..167ef514f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface ChallengeLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
index f1dc16cd9..156e1358c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.inventory.Customization
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface CustomizationLocalRepository : ContentLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.kt
index d6d56dd16..07168e870 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.FAQArticle
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface FAQLocalRepository : ContentLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
index 861e20023..8cf45bd44 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface InventoryLocalRepository : ContentLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
index 7494528c6..ed1eec176 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.social.InboxConversation
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface SocialLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.kt
index a3776a719..e16c85263 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.Tag
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface TagLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
index 02a96642c..593ec2aef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
@@ -5,8 +5,8 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.RealmResults
 
 interface TaskLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
index 15b690c02..36338a24e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface TutorialLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
index abd490bde..508e2e775 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
@@ -1,21 +1,26 @@
 package com.habitrpg.android.habitica.data.local
 
-import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.models.QuestAchievement
-import com.habitrpg.android.habitica.models.Skill
-import com.habitrpg.android.habitica.models.TutorialStep
+import com.habitrpg.android.habitica.models.*
 import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
+enum class UserQuestStatus {
+    NO_QUEST,
+    QUEST_COLLECT,
+    QUEST_BOSS,
+    QUEST_UNKNOWN
+}
+
 interface UserLocalRepository : BaseLocalRepository {
 
     fun getTutorialSteps(): Flowable<RealmResults<TutorialStep>>
 
     fun getUser(userID: String): Flowable<User>
 
-    fun saveUser(user: User)
+    fun saveUser(user: User, overrideExisting: Boolean = true)
 
     fun saveMessages(messages: List<ChatMessage>)
 
@@ -24,5 +29,7 @@ interface UserLocalRepository : BaseLocalRepository {
     fun getSpecialItems(user: User): Flowable<RealmResults<Skill>>
     fun getAchievements(): Flowable<RealmResults<Achievement>>
     fun getQuestAchievements(userID: String): Flowable<RealmResults<QuestAchievement>>
-    fun getIsUserOnQuest(userID: String): Flowable<Boolean>
+    fun getUserQuestStatus(userID: String): Flowable<UserQuestStatus>
+    fun getTeamPlans(userID: String): Flowable<RealmResults<TeamPlan>>
+    fun getTeamPlan(teamID: String): Flowable<Group>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
index 665d94f9f..6bbf35254 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
@@ -1,11 +1,15 @@
 package com.habitrpg.android.habitica.data.local.implementation
 
+import android.renderscript.BaseObj
 import com.habitrpg.android.habitica.data.local.BaseLocalRepository
+import com.habitrpg.android.habitica.models.BaseObject
 
 import io.realm.Realm
+import io.realm.RealmModel
 import io.realm.RealmObject
+import io.realm.kotlin.where
 
-abstract class RealmBaseLocalRepository internal constructor(protected var realm: Realm) : BaseLocalRepository {
+abstract class RealmBaseLocalRepository internal constructor(override var realm: Realm) : BaseLocalRepository {
 
     override val isClosed: Boolean
         get() = realm.isClosed
@@ -65,4 +69,26 @@ abstract class RealmBaseLocalRepository internal constructor(protected var realm
         if (isClosed) { return }
         realm.executeTransaction { realm1 -> realm1.insertOrUpdate(`object`) }
     }
+
+    override fun <T: BaseObject> modify(obj: T, transaction: (T) -> Unit) {
+        if (isClosed) { return }
+        val liveObject = getLiveObject(obj) ?: return
+        realm.executeTransaction {
+            transaction(liveObject)
+        }
+    }
+
+    override fun <T: BaseObject> modifyWithRealm(obj: T, transaction: (Realm, T) -> Unit) {
+        if (isClosed) { return }
+        val liveObject = getLiveObject(obj) ?: return
+        realm.executeTransaction {
+            transaction(it, liveObject)
+        }
+    }
+
+    override fun <T: RealmModel> getLiveObject(obj: T): T? {
+        if (isClosed) return null
+        val baseObject = obj as? BaseObject ?: return null
+        return realm.where(baseObject.realmClass).equalTo(baseObject.primaryIdentifierName, baseObject.primaryIdentifier).findFirst() as? T
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
index 42954e3d7..552d84fc8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
@@ -4,7 +4,8 @@ import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 import io.realm.Sort
@@ -12,60 +13,58 @@ import java.util.*
 
 class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), ChallengeLocalRepository {
 
-    override fun isChallengeMember(userID: String, challengeID: String): Flowable<Boolean> = realm.where(ChallengeMembership::class.java)
+    override fun isChallengeMember(userID: String, challengeID: String): Flowable<Boolean> = RxJavaBridge.toV3Flowable(realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userID)
             .equalTo("challengeID", challengeID)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
-            .map { it.count() > 0 }
+            .filter { it.isLoaded }).map { it.count() > 0 }
 
-    override fun getChallengeMembership(userId: String, id: String): Flowable<ChallengeMembership> = realm.where(ChallengeMembership::class.java)
+    override fun getChallengeMembership(userId: String, id: String): Flowable<ChallengeMembership> = RxJavaBridge.toV3Flowable(realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userId)
             .equalTo("challengeID", id)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
-            .map { it.first() }
+            .filter { it.isLoaded }).map { it.first() }
 
-    override fun getChallengeMemberships(userId: String): Flowable<RealmResults<ChallengeMembership>> = realm.where(ChallengeMembership::class.java)
+    override fun getChallengeMemberships(userId: String): Flowable<RealmResults<ChallengeMembership>> = RxJavaBridge.toV3Flowable(realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userId)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
+            .filter { it.isLoaded })
 
     override fun getChallenge(id: String): Flowable<Challenge> {
-        return realm.where(Challenge::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Challenge::class.java)
                 .equalTo("id", id)
                 .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
-                .map { it.first() }
+                .map { it.first() })
     }
 
     override fun getTasks(challengeID: String): Flowable<RealmResults<Task>> {
-        return realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
                 .equalTo("userId", challengeID)
                 .findAll()
                 .asFlowable()
-                .filter { realmObject -> realmObject.isLoaded }
+                .filter { realmObject -> realmObject.isLoaded })
     }
 
     override val challenges: Flowable<RealmResults<Challenge>>
-        get() = realm.where(Challenge::class.java)
+        get() = RxJavaBridge.toV3Flowable(realm.where(Challenge::class.java)
                 .isNotNull("name")
                 .sort("official", Sort.DESCENDING, "createdAt", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
 
     override fun getUserChallenges(userId: String): Flowable<RealmResults<Challenge>> {
-        return realm.where(ChallengeMembership::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(ChallengeMembership::class.java)
                 .equalTo("userID", userId)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-                .flatMap {
+                .filter { it.isLoaded })
+.flatMap {
                     val ids = it.map {
                         return@map it.challengeID
                     }.toTypedArray()
@@ -80,7 +79,7 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
                             .findAll()
                             .asFlowable()
                             .filter { it.isLoaded }
-                }
+}
     }
 
     override fun setParticipating(userID: String, challengeID: String, isParticipating: Boolean) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
index 786ff3480..d9a21167f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
@@ -2,7 +2,8 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository
 import com.habitrpg.android.habitica.models.inventory.Customization
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 import java.util.*
@@ -29,10 +30,10 @@ class RealmCustomizationLocalRepository(realm: Realm) : RealmContentLocalReposit
                     .endGroup()
                     .endGroup()
         }
-        return query
+        return RxJavaBridge.toV3Flowable(query
                 .sort("customizationSetName")
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
index d31acc42b..fd99f0a93 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
@@ -2,23 +2,24 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.FAQLocalRepository
 import com.habitrpg.android.habitica.models.FAQArticle
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 
 class RealmFAQLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), FAQLocalRepository {
     override fun getArticle(position: Int): Flowable<FAQArticle> {
-        return realm.where(FAQArticle::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(FAQArticle::class.java)
                 .equalTo("position", position)
                 .findAll()
                 .asFlowable()
                 .filter{ it.isLoaded && it.count() > 0 }
-                .map { it.first() }
+                .map { it.first() })
     }
 
     override val articles: Flowable<RealmResults<FAQArticle>>
-        get() =  realm.where(FAQArticle::class.java)
+        get() =  RxJavaBridge.toV3Flowable(realm.where(FAQArticle::class.java)
                 .findAll()
                 .asFlowable()
-                .filter{ it.isLoaded }
+                .filter{ it.isLoaded })
 }
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..c1ed67576 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
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.data.local.implementation
 
-import android.content.Context
 import com.habitrpg.android.habitica.data.local.InventoryLocalRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.*
@@ -9,37 +8,37 @@ import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.RealmResults
 import io.realm.Sort
 
 
-class RealmInventoryLocalRepository(realm: Realm, private val context: Context) : RealmContentLocalRepository(realm), InventoryLocalRepository {
+class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), InventoryLocalRepository {
     override fun getQuestContent(keys: List<String>): Flowable<RealmResults<QuestContent>> {
-        return realm.where(QuestContent::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(QuestContent::class.java)
                 .`in`("key", keys.toTypedArray())
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getQuestContent(key: String): Flowable<QuestContent> {
-        return realm.where(QuestContent::class.java).equalTo("key", key)
+        return RxJavaBridge.toV3Flowable(realm.where(QuestContent::class.java).equalTo("key", key)
                 .findAll()
                 .asFlowable()
                 .filter { content -> content.isLoaded && content.isValid && !content.isEmpty() }
-                .map { content -> content.first() }
+                .map { content -> content.first() })
     }
 
     override fun getEquipment(searchedKeys: List<String>): Flowable<RealmResults<Equipment>> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .`in`("key", searchedKeys.toTypedArray())
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getArmoireRemainingCount(): Long {
@@ -54,29 +53,29 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
     }
 
     override fun getOwnedEquipment(type: String): Flowable<RealmResults<Equipment>> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .equalTo("type", type)
                 .equalTo("owned", true)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedEquipment(): Flowable<RealmResults<Equipment>> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .equalTo("owned", true)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getEquipmentType(type: String, set: String): Flowable<RealmResults<Equipment>> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .equalTo("type", type)
                 .equalTo("gearSet", set)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedItems(itemType: String, userID: String, includeZero: Boolean): Flowable<RealmResults<OwnedItem>> {
@@ -84,22 +83,22 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
         if (!includeZero) {
             query = query.greaterThan("numberOwned", 0)
         }
-        return query.equalTo("itemType", itemType)
+        return RxJavaBridge.toV3Flowable(query.equalTo("itemType", itemType)
                 .equalTo("userID", userID)
                 .sort("key")
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flowable<out RealmResults<out Item>> {
-        return realm.where(itemClass).`in`("key", keys).findAll().asFlowable()
-                .filter { it.isLoaded }
+        return RxJavaBridge.toV3Flowable(realm.where(itemClass).`in`("key", keys).findAll().asFlowable()
+                .filter { it.isLoaded })
     }
 
     override fun getItems(itemClass: Class<out Item>): Flowable<out RealmResults<out Item>> {
-        return realm.where(itemClass).findAll().asFlowable()
-                .filter { it.isLoaded }
+        return RxJavaBridge.toV3Flowable(realm.where(itemClass).findAll().asFlowable()
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedItems(userID: String, includeZero: Boolean): Flowable<Map<String, OwnedItem>> {
@@ -107,7 +106,7 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
         if (!includeZero) {
             query = query.greaterThan("numberOwned", 0)
         }
-        return query.equalTo("userID", userID)
+        return RxJavaBridge.toV3Flowable(query.equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
                 .map {
@@ -116,25 +115,25 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
                         items[item.key + "-" + item.itemType] = item
                     }
                     items
-                }
+                })
     }
 
     override fun getEquipment(key: String): Flowable<Equipment> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .sort("text")
                 .equalTo("key", key)
                 .findFirstAsync()
                 .asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
-                .cast(Equipment::class.java)
+                .cast(Equipment::class.java))
     }
 
     override fun getMounts(): Flowable<RealmResults<Mount>> {
-        return realm.where(Mount::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Mount::class.java)
                 .sort("type", Sort.ASCENDING, "animal", Sort.ASCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getMounts(type: String?, group: String?, color: String?): Flowable<RealmResults<Mount>> {
@@ -149,26 +148,26 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
         if (color != null) {
             query = query.equalTo("color", color)
         }
-        return query.findAll()
+        return RxJavaBridge.toV3Flowable(query.findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedMounts(userID: String): Flowable<RealmResults<OwnedMount>> {
-        return realm.where(OwnedMount::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(OwnedMount::class.java)
                 .equalTo("owned", true)
                 .equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getPets(): Flowable<RealmResults<Pet>> {
-        return realm.where(Pet::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Pet::class.java)
                 .sort("type", Sort.ASCENDING, "animal", Sort.ASCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getPets(type: String?, group: String?, color: String?): Flowable<RealmResults<Pet>> {
@@ -183,18 +182,18 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
         if (color != null) {
             query = query.equalTo("color", color)
         }
-        return query.findAll()
+        return RxJavaBridge.toV3Flowable(query.findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedPets(userID: String): Flowable<RealmResults<OwnedPet>> {
-        return realm.where(OwnedPet::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(OwnedPet::class.java)
                 .greaterThan("trained", 0)
                 .equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun updateOwnedEquipment(user: User) {
@@ -202,12 +201,13 @@ 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?) {
+        val liveItem = getLiveObject(item) ?: return
         amountToAdd?.let { amount ->
-            executeTransaction { item.numberOwned = item.numberOwned + amount }
+            executeTransaction { liveItem.numberOwned = liveItem.numberOwned + amount }
         }
     }
 
@@ -219,9 +219,9 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
         if (!includeZero) {
             query = query.greaterThan("numberOwned", 0)
         }
-        return query.findFirstAsync()
+        return RxJavaBridge.toV3Flowable(query.findFirstAsync()
                 .asFlowable<OwnedItem>()
-                .filter { realmObject -> realmObject.isLoaded }
+                .filter { realmObject -> realmObject.isLoaded })
     }
 
     override fun getItem(type: String, key: String): Flowable<Item> {
@@ -232,9 +232,9 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
             "quests" -> QuestContent::class.java
             else -> Egg::class.java
         }
-        return realm.where(itemClass).equalTo("key", key).findFirstAsync().asFlowable<RealmObject>()
+        return RxJavaBridge.toV3Flowable(realm.where(itemClass).equalTo("key", key).findFirstAsync().asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
-                .cast(Item::class.java)
+                .cast(Item::class.java))
     }
 
     override fun decrementMysteryItemCount(user: User?) {
@@ -242,21 +242,22 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
             return
         }
         val item = realm.where(OwnedItem::class.java).equalTo("combinedKey", "${user.id}specialinventory_present").findFirst()
+        val liveUser = getLiveObject(user)
         executeTransaction {
             if (item != null && item.isValid) {
                 item.numberOwned = item.numberOwned - 1
             }
-            if (user.isValid) {
-                user.purchased?.plan?.mysteryItemCount = (user.purchased?.plan?.mysteryItemCount ?: 0) - 1
+            if (liveUser?.isValid == true) {
+                liveUser.purchased?.plan?.mysteryItemCount = (user.purchased?.plan?.mysteryItemCount ?: 0) - 1
             }
         }
     }
 
     override fun getInAppRewards(): Flowable<RealmResults<ShopItem>> {
-        return realm.where(ShopItem::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(ShopItem::class.java)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun saveInAppRewards(onlineItems: List<ShopItem>) {
@@ -342,12 +343,12 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
     }
 
     override fun getLatestMysteryItem(): Flowable<Equipment> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .contains("key", "mystery_2")
                 .sort("mystery", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded && it.size > 0}
-                .map { it.first() }
+                .map { it.first() })
     }
 }
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..baf2678c3 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
@@ -5,7 +5,8 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.user.ContributorInfo
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 import io.realm.Sort
@@ -13,26 +14,26 @@ import java.util.*
 
 
 class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), SocialLocalRepository {
-    override fun getChatMessage(messageID: String): Flowable<ChatMessage> = realm.where(ChatMessage::class.java)
+    override fun getChatMessage(messageID: String): Flowable<ChatMessage> = RxJavaBridge.toV3Flowable(realm.where(ChatMessage::class.java)
             .equalTo("id", messageID)
             .findAll()
             .asFlowable()
             .filter { it.isLoaded && it.isNotEmpty() }
-            .map { it.first() }
+            .map { it.first() })
 
-    override fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership> = realm.where(GroupMembership::class.java)
+    override fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership> = RxJavaBridge.toV3Flowable(realm.where(GroupMembership::class.java)
             .equalTo("userID", userId)
             .equalTo("groupID", id)
             .findAll()
             .asFlowable()
             .filter { it.isLoaded && it.isNotEmpty() }
-            .map { it.first() }
+            .map { it.first() })
 
-    override fun getGroupMemberships(userId: String): Flowable<RealmResults<GroupMembership>> = realm.where(GroupMembership::class.java)
+    override fun getGroupMemberships(userId: String): Flowable<RealmResults<GroupMembership>> = RxJavaBridge.toV3Flowable(realm.where(GroupMembership::class.java)
             .equalTo("userID", userId)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
+            .filter { it.isLoaded })
 
     override fun updateMembership(userId: String, id: String, isMember: Boolean) {
         if (isMember) {
@@ -97,22 +98,22 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun getPublicGuilds(): Flowable<RealmResults<Group>> = realm.where(Group::class.java)
+    override fun getPublicGuilds(): Flowable<RealmResults<Group>> = RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
             .equalTo("type", "guild")
             .equalTo("privacy", "public")
             .notEqualTo("id", Group.TAVERN_ID)
             .sort("memberCount", Sort.DESCENDING)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
+            .filter { it.isLoaded })
 
-    override fun getUserGroups(userID: String, type: String?): Flowable<RealmResults<Group>> = realm.where(GroupMembership::class.java)
+    override fun getUserGroups(userID: String, type: String?): Flowable<RealmResults<Group>> = RxJavaBridge.toV3Flowable(realm.where(GroupMembership::class.java)
             .equalTo("userID", userID)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
-            .flatMap {memberships ->
-                realm.where(Group::class.java)
+            .filter { it.isLoaded })
+.flatMap {memberships ->
+                RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
                         .equalTo("type", type ?: "guild")
                         .notEqualTo("id", Group.TAVERN_ID)
                         .`in`("id", memberships.map {
@@ -121,48 +122,49 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
                         .sort("memberCount", Sort.DESCENDING)
                         .findAll()
                         .asFlowable()
-                        .filter { it.isLoaded }
+                        .filter { it.isLoaded })
             }
 
 
 
     override fun getGroups(type: String): Flowable<RealmResults<Group>> {
-        return realm.where(Group::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
                 .equalTo("type", type)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getGroup(id: String): Flowable<Group> {
-        return realm.where(Group::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
                 .equalTo("id", id)
                 .findAll()
                 .asFlowable()
                 .filter { group -> group.isLoaded && group.isValid && !group.isEmpty() }
-                .map { groups -> groups.first() }
+                .map { groups -> groups.first() })
     }
 
     override fun getGroupChat(groupId: String): Flowable<RealmResults<ChatMessage>> {
-        return realm.where(ChatMessage::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(ChatMessage::class.java)
                 .equalTo("groupId", groupId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
     override fun deleteMessage(id: String) {
-        getMessage(id).firstElement().subscribe { chatMessage -> executeTransaction { chatMessage.deleteFromRealm() } }
+        val chatMessage = realm.where(ChatMessage::class.java).equalTo("id", id).findFirst()
+        executeTransaction { chatMessage?.deleteFromRealm() }
     }
 
     override fun getGroupMembers(partyId: String): Flowable<RealmResults<Member>> {
-        return realm.where(Member::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Member::class.java)
                 .equalTo("party.id", partyId)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
     override fun updateRSVPNeeded(user: User?, newValue: Boolean) {
         executeTransaction { user?.party?.quest?.RSVPNeeded = newValue }
@@ -172,10 +174,17 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         if (chatMessage.userLikesMessage(userId) == liked) {
             return
         }
+        val liveMessage = getLiveObject(chatMessage)
         if (liked) {
-            executeTransaction { chatMessage.likes?.add(ChatMessageLike(userId, chatMessage.id)) }
+            executeTransaction {
+                liveMessage?.likes?.add(ChatMessageLike(userId, chatMessage.id))
+            }
         } else {
-            chatMessage.likes?.filter { userId == it.id }?.forEach { like -> executeTransaction { like.deleteFromRealm() } }
+            liveMessage?.likes?.filter { userId == it.id }?.forEach { like ->
+                executeTransaction(Realm.Transaction {
+                    like.deleteFromRealm()
+                })
+            }
         }
     }
 
@@ -211,8 +220,10 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
     }
 
     override fun setQuestActivity(party: Group?, active: Boolean) {
+        if (party == null) return
+        val liveParty = getLiveObject(party)
         executeTransaction {
-            party?.quest?.active = active
+            liveParty?.quest?.active = active
         }
     }
 
@@ -242,11 +253,11 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
 
 
     private fun getMessage(id: String): Flowable<ChatMessage> {
-        return realm.where(ChatMessage::class.java).equalTo("id", id)
+        return RxJavaBridge.toV3Flowable(realm.where(ChatMessage::class.java).equalTo("id", id)
                 .findAll()
                 .asFlowable()
                 .filter { messages -> messages.isLoaded && messages.isValid && !messages.isEmpty() }
-                .map { messages -> messages.first() }
+                .map { messages -> messages.first() })
     }
 
     override fun doesGroupExist(id: String): Boolean {
@@ -254,23 +265,23 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         return party != null && party.isValid
     }
 
-    override fun getInboxMessages(userID: String, replyToUserID: String?): Flowable<RealmResults<ChatMessage>> {
-        return realm.where(ChatMessage::class.java)
+    override fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<RealmResults<ChatMessage>> {
+        return RxJavaBridge.toV3Flowable(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>> {
-        return realm.where(InboxConversation::class.java)
-                .equalTo("userID", userID)
-                .sort("timestamp", Sort.DESCENDING)
-                .findAll()
-                .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
+
+    override fun getInboxConversation(userId: String): Flowable<RealmResults<InboxConversation>> {
+        return RxJavaBridge.toV3Flowable(realm.where(InboxConversation::class.java)
+                .equalTo("userID", userId)
+                .sort("timestamp", Sort.DESCENDING)
+                .findAll()
+                .asFlowable()
+                .filter { it.isLoaded })
+}
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
index f0da06d7b..ce95e38af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
@@ -2,7 +2,8 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.TagLocalRepository
 import com.habitrpg.android.habitica.models.Tag
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 
@@ -14,7 +15,7 @@ class RealmTagLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), T
     }
 
     override fun getTags(userId: String): Flowable<RealmResults<Tag>> {
-        return realm.where(Tag::class.java).equalTo("userId", userId).findAll().asFlowable()
+        return RxJavaBridge.toV3Flowable(realm.where(Tag::class.java).equalTo("userId", userId).findAll().asFlowable())
     }
 
     override fun removeOldTags(onlineTags: List<Tag>, userID: String) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
index 007c0d2bf..a6f92b7de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
@@ -3,8 +3,9 @@ package com.habitrpg.android.habitica.data.local.implementation
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository
 import com.habitrpg.android.habitica.models.tasks.*
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.RealmResults
@@ -16,42 +17,43 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         if (realm.isClosed) {
             return Flowable.empty()
         }
-        return realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
                 .equalTo("type", taskType)
                 .equalTo("userId", userID)
                 .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-                .retry(1)
+                .filter { it.isLoaded }).retry(1)
     }
 
     override fun getTasks(userId: String): Flowable<RealmResults<Task>> {
         if (realm.isClosed) {
             return Flowable.empty()
         }
-        return realm.where(Task::class.java).equalTo("userId", userId)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java).equalTo("userId", userId)
                 .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
-    override fun saveTasks(userId: String, tasksOrder: TasksOrder, tasks: TaskList) {
+    override fun saveTasks(ownerID: String, tasksOrder: TasksOrder, tasks: TaskList) {
         val sortedTasks = ArrayList<Task>()
         sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.habits))
         sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.dailys))
         sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.todos))
         sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.rewards))
-        removeOldTasks(userId, sortedTasks)
+        removeOldTasks(ownerID, sortedTasks)
 
         val allChecklistItems = ArrayList<ChecklistItem>()
-        sortedTasks.forEach { it.checklist?.let { it1 -> allChecklistItems.addAll(it1) } }
-        removeOldChecklists(allChecklistItems)
-
         val allReminders = ArrayList<RemindersItem>()
-        sortedTasks.forEach { it.reminders?.let { it1 -> allReminders.addAll(it1) } }
+        sortedTasks.forEach {
+            if (it.userId.isBlank()) it.userId = ownerID
+            it.checklist?.let { it1 -> allChecklistItems.addAll(it1) }
+            it.reminders?.let { it1 -> allReminders.addAll(it1) }
+        }
         removeOldReminders(allReminders)
+        removeOldChecklists(allChecklistItems)
 
         executeTransaction { realm1 -> realm1.insertOrUpdate(sortedTasks) }
     }
@@ -155,9 +157,9 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         if (realm.isClosed) {
             return Flowable.empty()
         }
-        return realm.where(Task::class.java).equalTo("id", taskId).findFirstAsync().asFlowable<RealmObject>()
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java).equalTo("id", taskId).findFirstAsync().asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
-                .cast(Task::class.java)
+                .cast(Task::class.java))
     }
 
     override fun getTaskCopy(taskId: String): Flowable<Task> {
@@ -192,9 +194,9 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun getTaskAtPosition(taskType: String, position: Int): Flowable<Task> {
-        return realm.where(Task::class.java).equalTo("type", taskType).equalTo("position", position).findFirstAsync().asFlowable<RealmObject>()
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java).equalTo("type", taskType).equalTo("position", position).findFirstAsync().asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
-                .cast(Task::class.java)
+                .cast(Task::class.java))
     }
 
     override fun updateIsdue(daily: TaskList): Maybe<TaskList> {
@@ -218,32 +220,31 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun getErroredTasks(userID: String): Flowable<RealmResults<Task>> {
-        return realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
                 .equalTo("userId", userID)
                 .equalTo("hasErrored", true)
                 .sort("position")
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-                .retry(1)
+                .filter { it.isLoaded }).retry(1)
     }
 
     override fun getUser(userID: String): Flowable<User> {
-        return realm.where(User::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(User::class.java)
                 .equalTo("id", userID)
                 .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
-                .map { users -> users.first() }
+                .map { users -> users.first() })
     }
 
     override fun getTasksForChallenge(challengeID: String?, userID: String?): Flowable<RealmResults<Task>> {
-        return realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
                 .equalTo("challengeID", challengeID)
                 .equalTo("userId", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-                .retry(1)
+                .filter { it.isLoaded })
+.retry(1)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
index e7a1f2883..e4661fd54 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
@@ -2,7 +2,8 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 
@@ -11,7 +12,7 @@ class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(real
 
     override fun getTutorialStep(key: String): Flowable<TutorialStep> {
         if (realm.isClosed) return Flowable.empty()
-        return realm.where(TutorialStep::class.java).equalTo("identifier", key)
+        return RxJavaBridge.toV3Flowable(realm.where(TutorialStep::class.java).equalTo("identifier", key)
                 .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && realmObject.isNotEmpty() }
@@ -27,15 +28,15 @@ class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(real
                     }
                 }
                 .map { steps -> steps.first() }
-                .cast(TutorialStep::class.java)
+                .cast(TutorialStep::class.java))
     }
 
     override fun getTutorialSteps(keys: List<String>): Flowable<RealmResults<TutorialStep>> {
         if (realm.isClosed) return Flowable.empty()
-        return realm.where(TutorialStep::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(TutorialStep::class.java)
                 .`in`("identifier", keys.toTypedArray())
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
index 75ec17204..aed8622af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.UserLocalRepository
+import com.habitrpg.android.habitica.data.local.UserQuestStatus
 import com.habitrpg.android.habitica.models.*
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.social.ChatMessage
@@ -8,56 +9,62 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 
 class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), UserLocalRepository {
-    override fun getIsUserOnQuest(userID: String): Flowable<Boolean> {
+    override fun getUserQuestStatus(userID: String): Flowable<UserQuestStatus> {
         return getUser(userID)
                 .map { it.party?.id ?: "" }
                 .filter { it.isNotBlank() }
                 .flatMap {
-                    realm.where(Group::class.java)
+                    RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
                             .equalTo("id", it)
                             .findAll()
                             .asFlowable()
                             .filter { groups -> groups.size > 0 }
-                            .map { groups -> groups.first() }
+                            .map { groups -> groups.first() })
                 }
-                .map { it.quest?.members?.find { questMember -> questMember.key == userID } != null }
+                .map { when {
+                    it?.quest?.members?.find { questMember -> questMember.key == userID } === null -> UserQuestStatus.NO_QUEST
+                    it.quest?.progress?.collect?.isNotEmpty() ?: false -> UserQuestStatus.QUEST_COLLECT
+                    it.quest?.progress?.hp ?: 0.0 > 0.0 -> UserQuestStatus.QUEST_BOSS
+                    else -> UserQuestStatus.QUEST_UNKNOWN
+                }}
     }
 
     override fun getAchievements(): Flowable<RealmResults<Achievement>> {
-        return realm.where(Achievement::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Achievement::class.java)
                 .sort("index")
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getQuestAchievements(userID: String): Flowable<RealmResults<QuestAchievement>> {
-        return realm.where(QuestAchievement::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(QuestAchievement::class.java)
                 .equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
-    override fun getTutorialSteps(): Flowable<RealmResults<TutorialStep>> = realm.where(TutorialStep::class.java).findAll().asFlowable()
-                .filter { it.isLoaded }
+    override fun getTutorialSteps(): Flowable<RealmResults<TutorialStep>> = RxJavaBridge.toV3Flowable(realm.where(TutorialStep::class.java).findAll().asFlowable()
+                .filter { it.isLoaded })
 
     override fun getUser(userID: String): Flowable<User> {
         if (realm.isClosed) return Flowable.empty()
-        return realm.where(User::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(User::class.java)
                 .equalTo("id", userID)
                 .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
-                .map { users -> users.first() }
+                .map { users -> users.first() })
     }
 
-    override fun saveUser(user: User) {
+    override fun saveUser(user: User, overrideExisting: Boolean) {
         if (realm.isClosed) return
         val oldUser = realm.where(User::class.java)
                 .equalTo("id", user.id)
@@ -68,7 +75,7 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
                     user.needsCron = false
                 }
             } else {
-                if (oldUser.versionNumber >= user.versionNumber) {
+                if (oldUser.versionNumber >= user.versionNumber && !overrideExisting) {
                     return
                 }
             }
@@ -128,15 +135,34 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         }
     }
 
-    override fun getSkills(user: User): Flowable<RealmResults<Skill>> {
-        val habitClass = if (user.preferences?.disableClasses == true) "none" else user.stats?.habitClass
-        return realm.where(Skill::class.java)
-                .equalTo("habitClass", habitClass)
+    override fun getTeamPlans(userID: String): Flowable<RealmResults<TeamPlan>> {
+        return RxJavaBridge.toV3Flowable(realm.where(TeamPlan::class.java)
+                .equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
+    override fun getTeamPlan(teamID: String): Flowable<Group> {
+        if (realm.isClosed) return Flowable.empty()
+        return RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
+                .equalTo("id", teamID)
+                .findAll()
+                .asFlowable()
+                .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
+                .map { teams -> teams.first() })
+    }
+
+    override fun getSkills(user: User): Flowable<RealmResults<Skill>> {
+        val habitClass = if (user.preferences?.disableClasses == true) "none" else user.stats?.habitClass
+        return RxJavaBridge.toV3Flowable(realm.where(Skill::class.java)
+                .equalTo("habitClass", habitClass)
+                .sort("lvl")
+                .findAll()
+                .asFlowable()
+                .filter { it.isLoaded })
+}
+
     override fun getSpecialItems(user: User): Flowable<RealmResults<Skill>> {
         val specialItems = user.items?.special
         val ownedItems = ArrayList<String>()
@@ -157,10 +183,10 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         if (ownedItems.size == 0) {
             ownedItems.add("")
         }
-        return realm.where(Skill::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Skill::class.java)
                 .`in`("key", ownedItems.toTypedArray())
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt
index 150a89d25..081a69e33 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt
@@ -1,3 +1,3 @@
 package com.habitrpg.android.habitica.events
 
-class ShowAchievementDialog(var type: String, val id: String, val isLastOnboardingAchievement: Boolean = false)
+class ShowAchievementDialog(var type: String, val id: String, val message: String? = null, val text: String? = null, val isLastOnboardingAchievement: Boolean = false)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowWonChallengeDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowWonChallengeDialog.kt
new file mode 100644
index 000000000..5a0dabdbc
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowWonChallengeDialog.kt
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica.events
+
+import com.habitrpg.android.habitica.models.notifications.ChallengeWonData
+
+class ShowWonChallengeDialog(val id: String, val data: ChallengeWonData?)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java
index 30a395db1..7c82a0751 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java
@@ -21,18 +21,14 @@ public class JobExecutor implements ThreadExecutor {
     // Sets the Time Unit to seconds
     private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS;
 
-    private final BlockingQueue<Runnable> workQueue;
-
     private final ThreadPoolExecutor threadPoolExecutor;
 
-    private final ThreadFactory threadFactory;
-
     @Inject
     public JobExecutor() {
-        this.workQueue = new LinkedBlockingQueue<>();
-        this.threadFactory = new JobThreadFactory();
+        BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>();
+        ThreadFactory threadFactory = new JobThreadFactory();
         this.threadPoolExecutor = new ThreadPoolExecutor(INITIAL_POOL_SIZE, MAX_POOL_SIZE,
-                KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, this.workQueue, this.threadFactory);
+                KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, workQueue, threadFactory);
     }
 
     @Override public void execute(Runnable runnable) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
index 234fdb1c8..a8b6b9ba5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.executors;
 
 
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 public interface PostExecutionThread {
     Scheduler getScheduler();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
index b3d7cf4ea..3a3419758 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
@@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.executors;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Scheduler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 
 @Singleton
 public class UIThread implements PostExecutionThread {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Activity-Extension.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Activity-Extension.kt
new file mode 100644
index 000000000..30f595876
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Activity-Extension.kt
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.extensions
+
+import android.app.Activity
+import android.content.Context
+import android.view.inputmethod.InputMethodManager
+
+fun Activity.hideKeyboard() {
+    val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    imm.hideSoftInputFromWindow(window.decorView.windowToken, 0)
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt
index b5d65736d..68e6d9570 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt
@@ -5,13 +5,13 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 
 fun HabiticaAlertDialog.addOkButton(isPrimary: Boolean = true, listener: ((HabiticaAlertDialog, Int) -> Unit)? = null) {
-    this.addButton(R.string.ok, isPrimary, false, listener)
+    this.addButton(R.string.ok, isPrimary, false,true, listener)
 }
 
 fun HabiticaAlertDialog.addCloseButton(isPrimary: Boolean = false, listener: ((DialogInterface, Int) -> Unit)? = null) {
-    this.addButton(R.string.close, isPrimary, false, listener)
+    this.addButton(R.string.close, isPrimary, false,true, listener)
 }
 
 fun HabiticaAlertDialog.addCancelButton(isPrimary: Boolean = false, listener: ((DialogInterface, Int) -> Unit)? = null) {
-    this.addButton(R.string.cancel, isPrimary, false, listener)
+    this.addButton(R.string.cancel, isPrimary, false,true, listener)
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
index 1f3b97fe7..ae44e22f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.inventory.Animal
 
-fun Animal.getTranslatedType(c: Context?): String {
+fun Animal.getTranslatedType(c: Context?): String? {
     if (c == null) {
         return type
     }
@@ -15,7 +15,7 @@ fun Animal.getTranslatedType(c: Context?): String {
         "wacky"   -> c.getString(R.string.wacky)
         "special" -> c.getString(R.string.special)
         "premium" -> c.getString(R.string.magic_potion)
-        else      -> {
+        else -> {
             type
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt
index c4b21c2c6..317115778 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.extensions
 
-import io.reactivex.Completable
+import io.reactivex.rxjava3.core.Completable
 import java.util.concurrent.TimeUnit
 
 /**
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/extensions/Drawable-Extendsions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Drawable-Extendsions.kt
new file mode 100644
index 000000000..a4acf1bc3
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Drawable-Extendsions.kt
@@ -0,0 +1,19 @@
+package com.habitrpg.android.habitica.extensions
+
+import android.content.Context
+import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+
+
+public fun Drawable.setTintWith(context: Context, colorResource: Int, tintMode: PorterDuff.Mode = PorterDuff.Mode.MULTIPLY) {
+    DrawableCompat.setTintMode(this, tintMode)
+    DrawableCompat.setTint(this, ContextCompat.getColor(context, colorResource))
+
+}
+
+public fun Drawable.setTintWith(color: Int, tintMode: PorterDuff.Mode = PorterDuff.Mode.MULTIPLY) {
+    DrawableCompat.setTint(this, color)
+    DrawableCompat.setTintMode(this, tintMode)
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
index cd47e6615..ab67bc6db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
@@ -1,9 +1,9 @@
 package com.habitrpg.android.habitica.extensions
 
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import io.reactivex.Flowable
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.functions.Consumer
 
 fun <T> Flowable<T>.subscribeWithErrorHandler(function: Consumer<T>): Disposable {
     return subscribe(function, RxErrorHandler.handleEmptyError())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
index e07b58243..b9faab911 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
@@ -1,9 +1,9 @@
 package com.habitrpg.android.habitica.extensions
 
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.Observable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
 
 
 fun <S, T : Optional<S>> Flowable<T>.filterOptionalDoOnEmpty(function: () -> Unit): Flowable<S> {
@@ -29,7 +29,7 @@ fun <S, T : Optional<S>> Observable<T>.filterMapEmpty(): Observable<S> {
 }
 
 fun <S, T : Optional<S>> Single<T>.filterOptionalDoOnEmpty(function: () -> Unit): Maybe<S> {
-    return this.doAfterSuccess { if (it.isEmpty) function() }
+    return this.doOnSuccess { if (it.isEmpty) function() }
             .filter { !it.isEmpty }
             .map { it.value }
 }
@@ -40,7 +40,7 @@ fun <S, T : Optional<S>> Single<T>.filterMapEmpty(): Maybe<S> {
 }
 
 fun <S, T : Optional<S>> Maybe<T>.filterOptionalDoOnEmpty(function: () -> Unit): Maybe<S> {
-    return this.doAfterSuccess { if (it.isEmpty) function() }
+    return this.doOnSuccess { if (it.isEmpty) function() }
             .filter { !it.isEmpty }
             .map { it.value }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/String-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/String-Extensions.kt
new file mode 100644
index 000000000..c0f100088
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/String-Extensions.kt
@@ -0,0 +1,12 @@
+package com.habitrpg.android.habitica.extensions
+
+import android.text.Html
+
+fun String.fromHtml(): CharSequence {
+    return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+        Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
+    } else {
+        @Suppress("DEPRECATION")
+        Html.fromHtml(this)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Window-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Window-Extensions.kt
new file mode 100644
index 000000000..5accd44e0
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Window-Extensions.kt
@@ -0,0 +1,16 @@
+package com.habitrpg.android.habitica.extensions
+
+import android.os.Build
+import android.view.View
+import android.view.Window
+import com.habitrpg.android.habitica.R
+
+fun Window.updateStatusBarColor(color: Int, isLight: Boolean) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        statusBarColor = color
+        @Suppress("DEPRECATION")
+        decorView.systemUiVisibility = if (isLight) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else View.SYSTEM_UI_FLAG_VISIBLE
+    } else {
+        statusBarColor = context.getThemeColor(R.attr.colorPrimaryDark)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
deleted file mode 100644
index 05557bb47..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.amplitude.api.Amplitude;
-import com.habitrpg.android.habitica.BuildConfig;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Map;
-
-/**
- * Created by viirus on 23-Sep-16.
- */
-public class AmplitudeManager {
-
-    public static String EVENT_CATEGORY_BEHAVIOUR = "behaviour";
-    public static String EVENT_CATEGORY_NAVIGATION = "navigation";
-
-    public static String EVENT_HITTYPE_EVENT = "event";
-    public static String EVENT_HITTYPE_PAGEVIEW = "pageview";
-    public static String EVENT_HITTYPE_CREATE_WIDGET = "create";
-    public static String EVENT_HITTYPE_REMOVE_WIDGET = "remove";
-    public static String EVENT_HITTYPE_UPDATE_WIDGET = "update";
-
-    public static void sendEvent(String eventAction, String eventCategory, String hitType) {
-        sendEvent(eventAction, eventCategory, hitType, null);
-    }
-
-    public static void sendEvent(String eventAction, String eventCategory, String hitType, Map<String, Object> additionalData) {
-        if (BuildConfig.DEBUG) {
-            return;
-        }
-            JSONObject eventProperties = new JSONObject();
-        try {
-            eventProperties.put("eventAction", eventAction);
-            eventProperties.put("eventCategory", eventCategory);
-            eventProperties.put("hitType", hitType);
-            eventProperties.put("status", "displayed");
-            if (additionalData != null) {
-                for (Map.Entry<String, Object> entry : additionalData.entrySet()) {
-                    eventProperties.put(entry.getKey(), entry.getValue());
-                }
-            }
-        } catch (JSONException exception) {
-        }
-        Amplitude.getInstance().logEvent(eventAction, eventProperties);
-    }
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.kt
new file mode 100644
index 000000000..25258e77e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.kt
@@ -0,0 +1,38 @@
+package com.habitrpg.android.habitica.helpers
+
+import com.amplitude.api.Amplitude
+import com.habitrpg.android.habitica.BuildConfig
+import org.json.JSONException
+import org.json.JSONObject
+
+
+object AmplitudeManager {
+    var EVENT_CATEGORY_BEHAVIOUR = "behaviour"
+    var EVENT_CATEGORY_NAVIGATION = "navigation"
+    var EVENT_HITTYPE_EVENT = "event"
+    var EVENT_HITTYPE_PAGEVIEW = "pageview"
+    var EVENT_HITTYPE_CREATE_WIDGET = "create"
+    var EVENT_HITTYPE_REMOVE_WIDGET = "remove"
+    var EVENT_HITTYPE_UPDATE_WIDGET = "update"
+
+    @JvmOverloads
+    fun sendEvent(eventAction: String?, eventCategory: String?, hitType: String?, additionalData: Map<String, Any>? = null) {
+        if (BuildConfig.DEBUG) {
+            return
+        }
+        val eventProperties = JSONObject()
+        try {
+            eventProperties.put("eventAction", eventAction)
+            eventProperties.put("eventCategory", eventCategory)
+            eventProperties.put("hitType", hitType)
+            eventProperties.put("status", "displayed")
+            if (additionalData != null) {
+                for ((key, value) in additionalData) {
+                    eventProperties.put(key, value)
+                }
+            }
+        } catch (exception: JSONException) {
+        }
+        Amplitude.getInstance().logEvent(eventAction, eventProperties)
+    }
+}
\ 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..53441ccdc 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
@@ -22,10 +22,6 @@ class AppConfigManager {
         return remoteConfig.getLong("maxChatLength")
     }
 
-    fun enableGiftOneGetOne(): Boolean {
-        return remoteConfig.getBoolean("enableGiftOneGetOne")
-    }
-
     fun spriteSubstitutions(): Map<String, Map<String, String>> {
         val type = object : TypeToken<Map<String, Map<String, String>>>() {}.type
         return Gson().fromJson(remoteConfig.getString("spriteSubstitutions"), type)
@@ -100,19 +96,25 @@ class AppConfigManager {
         }
     }
 
-    fun reorderMenu(): Boolean {
-        return remoteConfig.getBoolean("reorderMenu")
-    }
-
     fun enableAdventureGuide(): Boolean {
         return remoteConfig.getBoolean("enableAdventureGuide")
     }
 
-    fun activePromo(): HabiticaPromotion? {
-        val key = remoteConfig.getString("activePromo")
-        if (key.isNotBlank()) {
-            return getHabiticaPromotionFromKey(key)
+    fun activePromo(context: Context): HabiticaPromotion? {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        val key = preferences.getString("currentEvent", null)
+        if (key?.isNotBlank() == true) {
+            val startDateLong = preferences.getLong("currentEventStartDate", 0)
+            val startDate = if (startDateLong > 0) Date(startDateLong) else null
+            val endDateLong = preferences.getLong("currentEventEndDate", 0)
+            val endDate = if (endDateLong > 0) Date(endDateLong) else null
+            return getHabiticaPromotionFromKey(preferences.getString("currentEventPromo", null) ?: key, startDate, endDate)
         }
         return null
     }
+
+    fun knownIssues(): List<Map<String, String>> {
+        val type = object : TypeToken<List<Map<String, String>>>() {}.type
+        return Gson().fromJson(remoteConfig.getString("knownIssues"), type)
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/DeviceName.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/DeviceName.java
deleted file mode 100644
index 1cd8c302a..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/DeviceName.java
+++ /dev/null
@@ -1,1060 +0,0 @@
-package com.habitrpg.android.habitica.helpers;
-
-/*
- * Copyright (C) 2017 Jared Rummler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-
-import androidx.annotation.WorkerThread;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Locale;
-
-// @formatter:off
-/**
- * <p>Get the consumer friendly name of an Android device.</p>
- *
- * <p>On many popular devices the market name of the device is not available. For example, on the
- * Samsung Galaxy S6 the value of {@link Build#MODEL} could be "SM-G920F", "SM-G920I", "SM-G920W8",
- * etc.</p>
- *
- * <p>See the usages below to get the consumer friends name of a device:</p>
- *
- * <p><b>Get the name of the current device:</b></p>
- *
- * <pre>
- * String deviceName = DeviceName.getDeviceName();
- * </pre>
- *
- * <p>The above code will get the correct device name for the top 600 Android devices. If the
- * device is unrecognized, then Build.MODEL is returned.</p>
- *
- * <p><b>Get the name of a device using the device's codename:</b></p>
- *
- * <pre>
- * // Retruns "Moto X Style"
- * DeviceName.getDeviceName("clark", "Unknown device");
- * </pre>
- *
- * <p><b>Get information about the device:</b></p>
- *
- * <pre>
- * DeviceName.with(context).request(new DeviceName.Callback() {
- *
- *   &#64;Override public void onFinished(DeviceName.DeviceInfo info, Exception error) {
- *     String manufacturer = info.manufacturer;  // "Samsung"
- *     String name = info.marketName;            // "Galaxy S6 Edge"
- *     String model = info.model;                // "SM-G925I"
- *     String codename = info.codename;          // "zerolte"
- *     String deviceName = info.getName();       // "Galaxy S6 Edge"
- *     // FYI: We are on the UI thread.
- *   }
- * });
- * </pre>
- *
- * <p>The above code loads JSON from a generated list of device names based on Google's maintained
- * list. It will be up-to-date with Google's supported device list so that you will get the correct
- * name for new or unknown devices. This supports over 10,000 devices.</p>
- *
- * <p>This will only make a network call once. The value is saved to SharedPreferences for future
- * calls.</p>
- */
-public class DeviceName {
-    // @formatter:on
-
-    // JSON which is derived from Google's PDF document which contains all devices on Google Play.
-    // To get the URL to the JSON file which contains information about the device name:
-    // String url = String.format(DEVICE_JSON_URL, Build.DEVICE);
-    private static final String DEVICE_JSON_URL =
-            "https://raw.githubusercontent.com/jaredrummler/AndroidDeviceNames/master/json/devices/%s.json";
-
-    // Preference filename for storing device info so we don't need to download it again.
-    private static final String SHARED_PREF_NAME = "device_names";
-
-    /**
-     * Create a new request to get information about a device.
-     *
-     * @param context the application context
-     * @return a new Request instance.
-     */
-    public static Request with(Context context) {
-        return new Request(context.getApplicationContext());
-    }
-
-    /**
-     * Get the consumer friendly name of the device.
-     *
-     * @return the market name of the current device.
-     * @see #getDeviceName(String, String)
-     */
-    public static String getDeviceName() {
-        return getDeviceName(Build.DEVICE, Build.MODEL, capitalize(Build.MODEL));
-    }
-
-    /**
-     * Get the consumer friendly name of a device.
-     *
-     * @param codename the value of the system property "ro.product.device" ({@link Build#DEVICE})
-     * <i>or</i>
-     * the value of the system property "ro.product.model" ({@link Build#MODEL})
-     * @param fallback the fallback name if the device is unknown. Usually the value of the system property
-     * "ro.product.model" ({@link Build#MODEL})
-     * @return the market name of a device or {@code fallback} if the device is unknown.
-     */
-    public static String getDeviceName(String codename, String fallback) {
-        return getDeviceName(codename, codename, fallback);
-    }
-
-    /**
-     * Get the consumer friendly name of a device.
-     *
-     * @param codename the value of the system property "ro.product.device" ({@link Build#DEVICE}).
-     * @param model the value of the system property "ro.product.model" ({@link Build#MODEL}).
-     * @param fallback the fallback name if the device is unknown. Usually the value of the system property
-     * "ro.product.model" ({@link Build#MODEL})
-     * @return the market name of a device or {@code fallback} if the device is unknown.
-     */
-    public static String getDeviceName(String codename, String model, String fallback) {
-        // ----------------------------------------------------------------------------
-        // Google
-        if ((codename != null && codename.equals("walleye"))) {
-            return "Pixel 2";
-        }
-        if ((codename != null && codename.equals("taimen"))) {
-            return "Pixel 2 XL";
-        }
-        if ((codename != null && codename.equals("blueline"))) {
-            return "Pixel 3";
-        }
-        if ((codename != null && codename.equals("crosshatch"))) {
-            return "Pixel 3 XL";
-        }
-        if ((codename != null && codename.equals("sargo"))) {
-            return "Pixel 3a";
-        }
-        if ((codename != null && codename.equals("bonito"))) {
-            return "Pixel 3a XL";
-        }
-        // ----------------------------------------------------------------------------
-        // Huawei
-        if ((codename != null && (codename.equals("HWBND-H"))) || (model != null && (model.equals("BND-L21")
-                || model.equals("BND-L24")
-                || model.equals("BND-L31")))) {
-            return "Honor 7X";
-        }
-        if ((codename != null && (codename.equals("HWBKL"))) || (model != null && (model.equals("BKL-L04") || model.equals(
-                "BKL-L09")))) {
-            return "Honor View 10";
-        }
-        if ((codename != null && (codename.equals("HWALP"))) || (model != null && (model.equals("ALP-AL00") || model.equals(
-                "ALP-L09") || model.equals("ALP-L29") || model.equals("ALP-TL00")))) {
-            return "Mate 10";
-        }
-        if ((codename != null && (codename.equals("HWMHA"))) || (model != null && (model.equals("MHA-AL00") || model.equals(
-                "MHA-L09") || model.equals("MHA-L29") || model.equals("MHA-TL00")))) {
-            return "Mate 9";
-        }
-        if ((codename != null && codename.equals("angler"))) {
-            return "Nexus 6P";
-        }
-        // ----------------------------------------------------------------------------
-        // LGE
-        if ((codename != null && (codename.equals("h1"))) || (model != null && (model.equals("LG-F700K") || model.equals(
-                "LG-F700L") || model.equals("LG-F700S") || model.equals("LG-H820") || model.equals("LG-H820PR") || model.equals(
-                "LG-H830") || model.equals("LG-H831") || model.equals("LG-H850") || model.equals("LG-H858") || model.equals(
-                "LG-H860") || model.equals("LG-H868") || model.equals("LGAS992") || model.equals("LGLS992") || model.equals(
-                "LGUS992") || model.equals("RS988") || model.equals("VS987")))) {
-            return "LG G5";
-        }
-        if ((codename != null && (codename.equals("lucye"))) || (model != null && (model.equals("LG-AS993")
-                || model.equals("LG-H870")
-                || model.equals("LG-H870AR")
-                || model.equals("LG-H870DS")
-                || model.equals("LG-H870I")
-                || model.equals("LG-H870S")
-                || model.equals("LG-H871")
-                || model.equals("LG-H871S")
-                || model.equals("LG-H872")
-                || model.equals("LG-H872PR")
-                || model.equals("LG-H873")
-                || model.equals("LG-LS993")
-                || model.equals("LGM-G600K")
-                || model.equals("LGM-G600L")
-                || model.equals("LGM-G600S")
-                || model.equals("LGUS997")
-                || model.equals("VS988")))) {
-            return "LG G6";
-        }
-        if ((codename != null && (codename.equals("flashlmdd"))) || (model != null && (model.equals("LM-V500")
-                || model.equals("LM-V500N")))) {
-            return "LG V50 ThinQ";
-        }
-        if ((codename != null && codename.equals("mako"))) {
-            return "Nexus 4";
-        }
-        if ((codename != null && codename.equals("hammerhead"))) {
-            return "Nexus 5";
-        }
-        if ((codename != null && codename.equals("bullhead"))) {
-            return "Nexus 5X";
-        }
-        // ----------------------------------------------------------------------------
-        // Motorola
-        if ((codename != null && (codename.equals("griffin"))) || (model != null && (model.equals("XT1650") || model.equals(
-                "XT1650-05")))) {
-            return "Moto Z";
-        }
-        if ((codename != null && codename.equals("shamu"))) {
-            return "Nexus 6";
-        }
-        // ----------------------------------------------------------------------------
-        // Nokia
-        if ((codename != null && (codename.equals("RHD")
-                || codename.equals("ROO")
-                || codename.equals("ROON_sprout")
-                || codename.equals("ROO_sprout")))) {
-            return "Nokia 3.1 Plus";
-        }
-        if ((codename != null && codename.equals("CTL_sprout"))) {
-            return "Nokia 7.1";
-        }
-        // ----------------------------------------------------------------------------
-        // OnePlus
-        if ((codename != null && codename.equals("OnePlus6")) || (model != null && model.equals("ONEPLUS A6003"))) {
-            return "OnePlus 6";
-        }
-        if ((codename != null && (codename.equals("OnePlus6T") || codename.equals("OnePlus6TSingle"))) || (model != null
-                && (model.equals("ONEPLUS A6013")))) {
-            return "OnePlus 6T";
-        }
-        if ((codename != null && codename.equals("OnePlus7")) || (model != null && model.equals("GM1905"))) {
-            return "OnePlus 7";
-        }
-        if ((codename != null && (codename.equals("OnePlus7Pro") || codename.equals("OnePlus7ProTMO"))) || (model != null
-                && (model.equals("GM1915") || model.equals("GM1917")))) {
-            return "OnePlus 7 Pro";
-        }
-        // ----------------------------------------------------------------------------
-        // Samsung
-        if ((codename != null && (codename.equals("a50"))) || (model != null && (model.equals("SM-A505F")
-                || model.equals("SM-A505FM")
-                || model.equals("SM-A505FN")
-                || model.equals("SM-A505G")
-                || model.equals("SM-A505GN")
-                || model.equals("SM-A505GT")
-                || model.equals("SM-A505N")
-                || model.equals("SM-A505U")
-                || model.equals("SM-A505W")
-                || model.equals("SM-A505YN")))) {
-            return "Galaxy A50";
-        }
-        if ((codename != null && (codename.equals("a6elteaio")
-                || codename.equals("a6elteatt")
-                || codename.equals("a6eltemtr")
-                || codename.equals("a6eltespr")
-                || codename.equals("a6eltetmo")
-                || codename.equals("a6elteue")
-                || codename.equals("a6lte")
-                || codename.equals("a6lteks"))) || (model != null && (model.equals("SM-A600A")
-                || model.equals("SM-A600AZ")
-                || model.equals("SM-A600F")
-                || model.equals("SM-A600FN")
-                || model.equals("SM-A600G")
-                || model.equals("SM-A600GN")
-                || model.equals("SM-A600N")
-                || model.equals("SM-A600P")
-                || model.equals("SM-A600T")
-                || model.equals("SM-A600T1")
-                || model.equals("SM-A600U")))) {
-            return "Galaxy A6";
-        }
-        if ((codename != null && (codename.equals("SC-01J")
-                || codename.equals("SCV34")
-                || codename.equals("gracelte")
-                || codename.equals("graceltektt")
-                || codename.equals("graceltelgt")
-                || codename.equals("gracelteskt")
-                || codename.equals("graceqlteacg")
-                || codename.equals("graceqlteatt")
-                || codename.equals("graceqltebmc")
-                || codename.equals("graceqltechn")
-                || codename.equals("graceqltedcm")
-                || codename.equals("graceqltelra")
-                || codename.equals("graceqltespr")
-                || codename.equals("graceqltetfnvzw")
-                || codename.equals("graceqltetmo")
-                || codename.equals("graceqlteue")
-                || codename.equals("graceqlteusc")
-                || codename.equals("graceqltevzw"))) || (model != null && (model.equals("SAMSUNG-SM-N930A")
-                || model.equals("SC-01J")
-                || model.equals("SCV34")
-                || model.equals("SGH-N037")
-                || model.equals("SM-N9300")
-                || model.equals("SM-N930F")
-                || model.equals("SM-N930K")
-                || model.equals("SM-N930L")
-                || model.equals("SM-N930P")
-                || model.equals("SM-N930R4")
-                || model.equals("SM-N930R6")
-                || model.equals("SM-N930R7")
-                || model.equals("SM-N930S")
-                || model.equals("SM-N930T")
-                || model.equals("SM-N930U")
-                || model.equals("SM-N930V")
-                || model.equals("SM-N930VL")
-                || model.equals("SM-N930W8")
-                || model.equals("SM-N930X")))) {
-            return "Galaxy Note7";
-        }
-        if ((codename != null && (codename.equals("SC-01K")
-                || codename.equals("SCV37")
-                || codename.equals("greatlte")
-                || codename.equals("greatlteks")
-                || codename.equals("greatqlte")
-                || codename.equals("greatqltechn")
-                || codename.equals("greatqltecmcc")
-                || codename.equals("greatqltecs")
-                || codename.equals("greatqlteue"))) || (model != null && (model.equals("SC-01K")
-                || model.equals("SCV37")
-                || model.equals("SM-N9500")
-                || model.equals("SM-N9508")
-                || model.equals("SM-N950F")
-                || model.equals("SM-N950N")
-                || model.equals("SM-N950U")
-                || model.equals("SM-N950U1")
-                || model.equals("SM-N950W")
-                || model.equals("SM-N950XN")))) {
-            return "Galaxy Note8";
-        }
-        if ((codename != null && (codename.equals("SC-01L")
-                || codename.equals("SCV40")
-                || codename.equals("crownlte")
-                || codename.equals("crownlteks")
-                || codename.equals("crownqltechn")
-                || codename.equals("crownqltecs")
-                || codename.equals("crownqltesq")
-                || codename.equals("crownqlteue"))) || (model != null && (model.equals("SC-01L")
-                || model.equals("SCV40")
-                || model.equals("SM-N9600")
-                || model.equals("SM-N960F")
-                || model.equals("SM-N960N")
-                || model.equals("SM-N960U")
-                || model.equals("SM-N960U1")
-                || model.equals("SM-N960W")))) {
-            return "Galaxy Note9";
-        }
-        if ((codename != null && (codename.equals("SC-03L")
-                || codename.equals("SCV41")
-                || codename.equals("beyond1")
-                || codename.equals("beyond1q"))) || (model != null && (model.equals("SC-03L")
-                || model.equals("SCV41")
-                || model.equals("SM-G9730")
-                || model.equals("SM-G9738")
-                || model.equals("SM-G973F")
-                || model.equals("SM-G973N")
-                || model.equals("SM-G973U")
-                || model.equals("SM-G973U1")
-                || model.equals("SM-G973W")))) {
-            return "Galaxy S10";
-        }
-        if ((codename != null && (codename.equals("SC-04L")
-                || codename.equals("SCV42")
-                || codename.equals("beyond2")
-                || codename.equals("beyond2q"))) || (model != null && (model.equals("SC-04L")
-                || model.equals("SCV42")
-                || model.equals("SM-G9750")
-                || model.equals("SM-G9758")
-                || model.equals("SM-G975F")
-                || model.equals("SM-G975N")
-                || model.equals("SM-G975U")
-                || model.equals("SM-G975U1")
-                || model.equals("SM-G975W")))) {
-            return "Galaxy S10+";
-        }
-        if ((codename != null && (codename.equals("beyond0") || codename.equals("beyond0q"))) || (model != null
-                && (model.equals("SM-G9700")
-                || model.equals("SM-G9708")
-                || model.equals("SM-G970F")
-                || model.equals("SM-G970N")
-                || model.equals("SM-G970U")
-                || model.equals("SM-G970U1")
-                || model.equals("SM-G970W")))) {
-            return "Galaxy S10e";
-        }
-        if ((codename != null && (codename.equals("SC-04F")
-                || codename.equals("SCL23")
-                || codename.equals("k3g")
-                || codename.equals("klte")
-                || codename.equals("klteMetroPCS")
-                || codename.equals("klteacg")
-                || codename.equals("klteaio")
-                || codename.equals("klteatt")
-                || codename.equals("kltecan")
-                || codename.equals("klteduoszn")
-                || codename.equals("kltektt")
-                || codename.equals("kltelgt")
-                || codename.equals("kltelra")
-                || codename.equals("klteskt")
-                || codename.equals("kltespr")
-                || codename.equals("kltetfnvzw")
-                || codename.equals("kltetmo")
-                || codename.equals("klteusc")
-                || codename.equals("kltevzw")
-                || codename.equals("kwifi")
-                || codename.equals("lentisltektt")
-                || codename.equals("lentisltelgt")
-                || codename.equals("lentislteskt"))) || (model != null && (model.equals("SAMSUNG-SM-G900A")
-                || model.equals("SAMSUNG-SM-G900AZ")
-                || model.equals("SC-04F")
-                || model.equals("SCL23")
-                || model.equals("SM-G9006W")
-                || model.equals("SM-G9008W")
-                || model.equals("SM-G9009W")
-                || model.equals("SM-G900F")
-                || model.equals("SM-G900FQ")
-                || model.equals("SM-G900H")
-                || model.equals("SM-G900I")
-                || model.equals("SM-G900K")
-                || model.equals("SM-G900L")
-                || model.equals("SM-G900M")
-                || model.equals("SM-G900MD")
-                || model.equals("SM-G900P")
-                || model.equals("SM-G900R4")
-                || model.equals("SM-G900R6")
-                || model.equals("SM-G900R7")
-                || model.equals("SM-G900S")
-                || model.equals("SM-G900T")
-                || model.equals("SM-G900T1")
-                || model.equals("SM-G900T3")
-                || model.equals("SM-G900T4")
-                || model.equals("SM-G900V")
-                || model.equals("SM-G900W8")
-                || model.equals("SM-G900X")
-                || model.equals("SM-G906K")
-                || model.equals("SM-G906L")
-                || model.equals("SM-G906S")
-                || model.equals("SM-S903VL")))) {
-            return "Galaxy S5";
-        }
-        if ((codename != null && (codename.equals("s5neolte") || codename.equals("s5neoltecan"))) || (model != null && (
-                model.equals("SM-G903F")
-                        || model.equals("SM-G903M")
-                        || model.equals("SM-G903W")))) {
-            return "Galaxy S5 Neo";
-        }
-        if ((codename != null && (codename.equals("SC-05G")
-                || codename.equals("zeroflte")
-                || codename.equals("zeroflteacg")
-                || codename.equals("zeroflteaio")
-                || codename.equals("zeroflteatt")
-                || codename.equals("zerofltebmc")
-                || codename.equals("zerofltechn")
-                || codename.equals("zerofltectc")
-                || codename.equals("zerofltektt")
-                || codename.equals("zerofltelgt")
-                || codename.equals("zerofltelra")
-                || codename.equals("zerofltemtr")
-                || codename.equals("zeroflteskt")
-                || codename.equals("zerofltespr")
-                || codename.equals("zerofltetfnvzw")
-                || codename.equals("zerofltetmo")
-                || codename.equals("zeroflteusc")
-                || codename.equals("zerofltevzw"))) || (model != null && (model.equals("SAMSUNG-SM-G920A")
-                || model.equals("SAMSUNG-SM-G920AZ")
-                || model.equals("SC-05G")
-                || model.equals("SM-G9200")
-                || model.equals("SM-G9208")
-                || model.equals("SM-G9209")
-                || model.equals("SM-G920F")
-                || model.equals("SM-G920I")
-                || model.equals("SM-G920K")
-                || model.equals("SM-G920L")
-                || model.equals("SM-G920P")
-                || model.equals("SM-G920R4")
-                || model.equals("SM-G920R6")
-                || model.equals("SM-G920R7")
-                || model.equals("SM-G920S")
-                || model.equals("SM-G920T")
-                || model.equals("SM-G920T1")
-                || model.equals("SM-G920V")
-                || model.equals("SM-G920W8")
-                || model.equals("SM-G920X")
-                || model.equals("SM-S906L")
-                || model.equals("SM-S907VL")))) {
-            return "Galaxy S6";
-        }
-        if ((codename != null && (codename.equals("404SC")
-                || codename.equals("SC-04G")
-                || codename.equals("SCV31")
-                || codename.equals("zerolte")
-                || codename.equals("zerolteacg")
-                || codename.equals("zerolteatt")
-                || codename.equals("zeroltebmc")
-                || codename.equals("zeroltechn")
-                || codename.equals("zeroltektt")
-                || codename.equals("zeroltelra")
-                || codename.equals("zerolteskt")
-                || codename.equals("zeroltespr")
-                || codename.equals("zeroltetmo")
-                || codename.equals("zerolteusc")
-                || codename.equals("zeroltevzw"))) || (model != null && (model.equals("404SC")
-                || model.equals("SAMSUNG-SM-G925A")
-                || model.equals("SC-04G")
-                || model.equals("SCV31")
-                || model.equals("SM-G9250")
-                || model.equals("SM-G925I")
-                || model.equals("SM-G925K")
-                || model.equals("SM-G925P")
-                || model.equals("SM-G925R4")
-                || model.equals("SM-G925R6")
-                || model.equals("SM-G925R7")
-                || model.equals("SM-G925S")
-                || model.equals("SM-G925T")
-                || model.equals("SM-G925V")
-                || model.equals("SM-G925W8")
-                || model.equals("SM-G925X")))) {
-            return "Galaxy S6 Edge";
-        }
-        if ((codename != null && (codename.equals("zenlte")
-                || codename.equals("zenlteatt")
-                || codename.equals("zenltebmc")
-                || codename.equals("zenltechn")
-                || codename.equals("zenltektt")
-                || codename.equals("zenltekx")
-                || codename.equals("zenltelgt")
-                || codename.equals("zenlteskt")
-                || codename.equals("zenltespr")
-                || codename.equals("zenltetmo")
-                || codename.equals("zenlteusc")
-                || codename.equals("zenltevzw"))) || (model != null && (model.equals("SAMSUNG-SM-G928A")
-                || model.equals("SM-G9280")
-                || model.equals("SM-G9287C")
-                || model.equals("SM-G928C")
-                || model.equals("SM-G928G")
-                || model.equals("SM-G928I")
-                || model.equals("SM-G928K")
-                || model.equals("SM-G928L")
-                || model.equals("SM-G928N0")
-                || model.equals("SM-G928P")
-                || model.equals("SM-G928R4")
-                || model.equals("SM-G928S")
-                || model.equals("SM-G928T")
-                || model.equals("SM-G928V")
-                || model.equals("SM-G928W8")
-                || model.equals("SM-G928X")))) {
-            return "Galaxy S6 Edge+";
-        }
-        if ((codename != null && (codename.equals("herolte") || codename.equals("heroltebmc") || codename.equals(
-                "heroltektt") || codename.equals("heroltelgt") || codename.equals("herolteskt") || codename.equals(
-                "heroqlteacg") || codename.equals("heroqlteaio") || codename.equals("heroqlteatt") || codename.equals(
-                "heroqltecctvzw") || codename.equals("heroqltechn") || codename.equals("heroqltelra") || codename.equals(
-                "heroqltemtr") || codename.equals("heroqltespr") || codename.equals("heroqltetfnvzw") || codename.equals(
-                "heroqltetmo") || codename.equals("heroqlteue") || codename.equals("heroqlteusc") || codename.equals(
-                "heroqltevzw"))) || (model != null && (model.equals("SAMSUNG-SM-G930A")
-                || model.equals("SAMSUNG-SM-G930AZ")
-                || model.equals("SM-G9300")
-                || model.equals("SM-G9308")
-                || model.equals("SM-G930F")
-                || model.equals("SM-G930K")
-                || model.equals("SM-G930L")
-                || model.equals("SM-G930P")
-                || model.equals("SM-G930R4")
-                || model.equals("SM-G930R6")
-                || model.equals("SM-G930R7")
-                || model.equals("SM-G930S")
-                || model.equals("SM-G930T")
-                || model.equals("SM-G930T1")
-                || model.equals("SM-G930U")
-                || model.equals("SM-G930V")
-                || model.equals("SM-G930VC")
-                || model.equals("SM-G930VL")
-                || model.equals("SM-G930W8")
-                || model.equals("SM-G930X")))) {
-            return "Galaxy S7";
-        }
-        if ((codename != null && (codename.equals("SC-02H")
-                || codename.equals("SCV33")
-                || codename.equals("hero2lte")
-                || codename.equals("hero2ltebmc")
-                || codename.equals("hero2ltektt")
-                || codename.equals("hero2lteskt")
-                || codename.equals("hero2qlteatt")
-                || codename.equals("hero2qltecctvzw")
-                || codename.equals("hero2qltespr")
-                || codename.equals("hero2qltetmo")
-                || codename.equals("hero2qlteusc")
-                || codename.equals("hero2qltevzw"))) || (model != null && (model.equals("SAMSUNG-SM-G935A")
-                || model.equals("SC-02H")
-                || model.equals("SCV33")
-                || model.equals("SM-G935K")
-                || model.equals("SM-G935P")
-                || model.equals("SM-G935R4")
-                || model.equals("SM-G935S")
-                || model.equals("SM-G935T")
-                || model.equals("SM-G935V")
-                || model.equals("SM-G935VC")
-                || model.equals("SM-G935W8")
-                || model.equals("SM-G935X")))) {
-            return "Galaxy S7 Edge";
-        }
-        if ((codename != null && (codename.equals("SC-02J")
-                || codename.equals("SCV36")
-                || codename.equals("dreamlte")
-                || codename.equals("dreamlteks")
-                || codename.equals("dreamqltecan")
-                || codename.equals("dreamqltechn")
-                || codename.equals("dreamqltecmcc")
-                || codename.equals("dreamqltesq")
-                || codename.equals("dreamqlteue"))) || (model != null && (model.equals("SC-02J")
-                || model.equals("SCV36")
-                || model.equals("SM-G9500")
-                || model.equals("SM-G9508")
-                || model.equals("SM-G950F")
-                || model.equals("SM-G950N")
-                || model.equals("SM-G950U")
-                || model.equals("SM-G950U1")
-                || model.equals("SM-G950W")))) {
-            return "Galaxy S8";
-        }
-        if ((codename != null && (codename.equals("SC-03J")
-                || codename.equals("SCV35")
-                || codename.equals("dream2lte")
-                || codename.equals("dream2lteks")
-                || codename.equals("dream2qltecan")
-                || codename.equals("dream2qltechn")
-                || codename.equals("dream2qltesq")
-                || codename.equals("dream2qlteue"))) || (model != null && (model.equals("SC-03J")
-                || model.equals("SCV35")
-                || model.equals("SM-G9550")
-                || model.equals("SM-G955F")
-                || model.equals("SM-G955N")
-                || model.equals("SM-G955U")
-                || model.equals("SM-G955U1")
-                || model.equals("SM-G955W")))) {
-            return "Galaxy S8+";
-        }
-        if ((codename != null && (codename.equals("SC-02K")
-                || codename.equals("SCV38")
-                || codename.equals("starlte")
-                || codename.equals("starlteks")
-                || codename.equals("starqltechn")
-                || codename.equals("starqltecmcc")
-                || codename.equals("starqltecs")
-                || codename.equals("starqltesq")
-                || codename.equals("starqlteue"))) || (model != null && (model.equals("SC-02K")
-                || model.equals("SCV38")
-                || model.equals("SM-G9600")
-                || model.equals("SM-G9608")
-                || model.equals("SM-G960F")
-                || model.equals("SM-G960N")
-                || model.equals("SM-G960U")
-                || model.equals("SM-G960U1")
-                || model.equals("SM-G960W")))) {
-            return "Galaxy S9";
-        }
-        if ((codename != null && (codename.equals("SC-03K")
-                || codename.equals("SCV39")
-                || codename.equals("star2lte")
-                || codename.equals("star2lteks")
-                || codename.equals("star2qltechn")
-                || codename.equals("star2qltecs")
-                || codename.equals("star2qltesq")
-                || codename.equals("star2qlteue"))) || (model != null && (model.equals("SC-03K")
-                || model.equals("SCV39")
-                || model.equals("SM-G9650")
-                || model.equals("SM-G965F")
-                || model.equals("SM-G965N")
-                || model.equals("SM-G965U")
-                || model.equals("SM-G965U1")
-                || model.equals("SM-G965W")))) {
-            return "Galaxy S9+";
-        }
-        // ----------------------------------------------------------------------------
-        // Sony
-        if ((codename != null && (codename.equals("802SO")
-                || codename.equals("J8110")
-                || codename.equals("J8170")
-                || codename.equals("J9110")
-                || codename.equals("SO-03L")
-                || codename.equals("SOV40"))) || (model != null && (model.equals("802SO")
-                || model.equals("J8110")
-                || model.equals("J8170")
-                || model.equals("J9110")
-                || model.equals("SO-03L")
-                || model.equals("SOV40")))) {
-            return "Xperia 1";
-        }
-        if ((codename != null && (codename.equals("I3113")
-                || codename.equals("I3123")
-                || codename.equals("I4113")
-                || codename.equals("I4193"))) || (model != null && (model.equals("I3113")
-                || model.equals("I3123")
-                || model.equals("I4113")
-                || model.equals("I4193")))) {
-            return "Xperia 10";
-        }
-        if ((codename != null && (codename.equals("I3213")
-                || codename.equals("I3223")
-                || codename.equals("I4213")
-                || codename.equals("I4293"))) || (model != null && (model.equals("I3213")
-                || model.equals("I3223")
-                || model.equals("I4213")
-                || model.equals("I4293")))) {
-            return "Xperia 10 Plus";
-        }
-        if ((codename != null && (codename.equals("702SO")
-                || codename.equals("H8216")
-                || codename.equals("H8266")
-                || codename.equals("H8276")
-                || codename.equals("H8296")
-                || codename.equals("SO-03K")
-                || codename.equals("SOV37"))) || (model != null && (model.equals("702SO")
-                || model.equals("H8216")
-                || model.equals("H8266")
-                || model.equals("H8276")
-                || model.equals("H8296")
-                || model.equals("SO-03K")
-                || model.equals("SOV37")))) {
-            return "Xperia XZ2";
-        }
-        if ((codename != null && (codename.equals("H8116")
-                || codename.equals("H8166")
-                || codename.equals("SO-04K")
-                || codename.equals("SOV38"))) || (model != null && (model.equals("H8116")
-                || model.equals("H8166")
-                || model.equals("SO-04K")
-                || model.equals("SOV38")))) {
-            return "Xperia XZ2 Premium";
-        }
-        if ((codename != null && (codename.equals("801SO")
-                || codename.equals("H8416")
-                || codename.equals("H9436")
-                || codename.equals("H9493")
-                || codename.equals("SO-01L")
-                || codename.equals("SOV39"))) || (model != null && (model.equals("801SO")
-                || model.equals("H8416")
-                || model.equals("H9436")
-                || model.equals("H9493")
-                || model.equals("SO-01L")
-                || model.equals("SOV39")))) {
-            return "Xperia XZ3";
-        }
-        return fallback;
-    }
-
-    /**
-     * Get the {@link DeviceInfo} for the current device. Do not run on the UI thread, as this may
-     * download JSON to retrieve the {@link DeviceInfo}. JSON is only downloaded once and then
-     * stored to {@link SharedPreferences}.
-     *
-     * @param context the application context.
-     * @return {@link DeviceInfo} for the current device.
-     */
-    @WorkerThread public static DeviceInfo getDeviceInfo(Context context) {
-        return getDeviceInfo(context.getApplicationContext(), Build.DEVICE, Build.MODEL);
-    }
-
-    /**
-     * Get the {@link DeviceInfo} for the current device. Do not run on the UI thread, as this may
-     * download JSON to retrieve the {@link DeviceInfo}. JSON is only downloaded once and then
-     * stored to {@link SharedPreferences}.
-     *
-     * @param context the application context.
-     * @param codename the codename of the device
-     * @return {@link DeviceInfo} for the current device.
-     */
-    @WorkerThread public static DeviceInfo getDeviceInfo(Context context, String codename) {
-        return getDeviceInfo(context, codename, null);
-    }
-
-    /**
-     * Get the {@link DeviceInfo} for the current device. Do not run on the UI thread, as this may
-     * download JSON to retrieve the {@link DeviceInfo}. JSON is only downloaded once and then
-     * stored to {@link SharedPreferences}.
-     *
-     * @param context the application context.
-     * @param codename the codename of the device
-     * @param model the model of the device
-     * @return {@link DeviceInfo} for the current device.
-     */
-    @WorkerThread public static DeviceInfo getDeviceInfo(Context context, String codename, String model) {
-        SharedPreferences prefs = context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE);
-        String key = String.format("%s:%s", codename, model);
-        String savedJson = prefs.getString(key, null);
-        if (savedJson != null) {
-            try {
-                return new DeviceInfo(new JSONObject(savedJson));
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        }
-
-        // check if we have an internet connection
-        int ret = context.checkCallingOrSelfPermission(Manifest.permission.ACCESS_NETWORK_STATE);
-        boolean isConnectedToNetwork = false;
-        if (ret == PackageManager.PERMISSION_GRANTED) {
-            ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            @SuppressLint("MissingPermission") NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
-            if (networkInfo != null && networkInfo.isConnected()) {
-                isConnectedToNetwork = true;
-            }
-        } else {
-            // assume we are connected.
-            isConnectedToNetwork = true;
-        }
-
-        if (isConnectedToNetwork) {
-            try {
-                // Get the device name from the generated JSON files created from Google's device list.
-                String url = String.format(DEVICE_JSON_URL, codename.toLowerCase(Locale.ENGLISH));
-                String jsonString = downloadJson(url);
-                JSONArray jsonArray = new JSONArray(jsonString);
-                for (int i = 0, len = jsonArray.length(); i < len; i++) {
-                    JSONObject json = jsonArray.getJSONObject(i);
-                    DeviceInfo info = new DeviceInfo(json);
-                    if ((codename.equalsIgnoreCase(info.codename) && model == null)
-                            || codename.equalsIgnoreCase(info.codename) && model.equalsIgnoreCase(info.model)) {
-                        // Save to SharedPreferences so we don't need to make another request.
-                        SharedPreferences.Editor editor = prefs.edit();
-                        editor.putString(key, json.toString());
-                        editor.apply();
-                        return info;
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (codename.equals(Build.DEVICE) && Build.MODEL.equals(model)) {
-            return new DeviceInfo(Build.MANUFACTURER, getDeviceName(), codename, model); // current device
-        }
-
-        return new DeviceInfo(null, null, codename, model); // unknown device
-    }
-
-    /**
-     * <p>Capitalizes getAllProcesses the whitespace separated words in a String. Only the first
-     * letter of each word is changed.</p>
-     *
-     * Whitespace is defined by {@link Character#isWhitespace(char)}.
-     *
-     * @param str the String to capitalize
-     * @return capitalized The capitalized String
-     */
-    private static String capitalize(String str) {
-        if (TextUtils.isEmpty(str)) {
-            return str;
-        }
-        char[] arr = str.toCharArray();
-        boolean capitalizeNext = true;
-        String phrase = "";
-        for (char c : arr) {
-            if (capitalizeNext && Character.isLetter(c)) {
-                phrase += Character.toUpperCase(c);
-                capitalizeNext = false;
-                continue;
-            } else if (Character.isWhitespace(c)) {
-                capitalizeNext = true;
-            }
-            phrase += c;
-        }
-        return phrase;
-    }
-
-    /** Download URL to String */
-    @WorkerThread private static String downloadJson(String myurl) throws IOException {
-        StringBuilder sb = new StringBuilder();
-        BufferedReader reader = null;
-        try {
-            URL url = new URL(myurl);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setReadTimeout(10000);
-            conn.setConnectTimeout(15000);
-            conn.setRequestMethod("GET");
-            conn.setDoInput(true);
-            conn.connect();
-            if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    sb.append(line).append('\n');
-                }
-            }
-            return sb.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-
-    public static final class Request {
-
-        final Context context;
-        final Handler handler;
-        String codename;
-        String model;
-
-        private Request(Context ctx) {
-            context = ctx;
-            handler = new Handler(ctx.getMainLooper());
-        }
-
-        /**
-         * Set the device codename to query. You should also set the model.
-         *
-         * @param codename the value of the system property "ro.product.device"
-         * @return This Request object to allow for chaining of calls to set methods.
-         * @see Build#DEVICE
-         */
-        public Request setCodename(String codename) {
-            this.codename = codename;
-            return this;
-        }
-
-        /**
-         * Set the device model to query. You should also set the codename.
-         *
-         * @param model the value of the system property "ro.product.model"
-         * @return This Request object to allow for chaining of calls to set methods.
-         * @see Build#MODEL
-         */
-        public Request setModel(String model) {
-            this.model = model;
-            return this;
-        }
-
-        /**
-         * Download information about the device. This saves the results in shared-preferences so
-         * future requests will not need a network connection.
-         *
-         * @param callback the callback to retrieve the {@link DeviceName.DeviceInfo}
-         */
-        public void request(Callback callback) {
-            if (codename == null && model == null) {
-                codename = Build.DEVICE;
-                model = Build.MODEL;
-            }
-            GetDeviceRunnable runnable = new GetDeviceRunnable(callback);
-            if (Looper.myLooper() == Looper.getMainLooper()) {
-                new Thread(runnable).start();
-            } else {
-                runnable.run(); // already running in background thread.
-            }
-        }
-
-        private final class GetDeviceRunnable implements Runnable {
-
-            final Callback callback;
-            DeviceInfo deviceInfo;
-            Exception error;
-
-            public GetDeviceRunnable(Callback callback) {
-                this.callback = callback;
-            }
-
-            @Override public void run() {
-                try {
-                    deviceInfo = getDeviceInfo(context, codename, model);
-                } catch (Exception e) {
-                    error = e;
-                }
-                handler.post(new Runnable() {
-
-                    @Override public void run() {
-                        callback.onFinished(deviceInfo, error);
-                    }
-                });
-            }
-        }
-    }
-
-    /**
-     * Callback which is invoked when the {@link DeviceName.DeviceInfo} is finished loading.
-     */
-    public interface Callback {
-
-        /**
-         * Callback to get the device info. This is run on the UI thread.
-         *
-         * @param info the requested {@link DeviceName.DeviceInfo}
-         * @param error {@code null} if nothing went wrong.
-         */
-        void onFinished(DeviceInfo info, Exception error);
-    }
-
-    /**
-     * Device information based on
-     * <a href="https://support.google.com/googleplay/answer/1727131">Google's maintained list</a>.
-     */
-    public static final class DeviceInfo {
-
-        /** Retail branding */
-        public final String manufacturer;
-
-        /** Marketing name */
-        public final String marketName;
-
-        /** the value of the system property "ro.product.device" */
-        public final String codename;
-
-        /** the value of the system property "ro.product.model" */
-        public final String model;
-
-        public DeviceInfo(String manufacturer, String marketName, String codename, String model) {
-            this.manufacturer = manufacturer;
-            this.marketName = marketName;
-            this.codename = codename;
-            this.model = model;
-        }
-
-        private DeviceInfo(JSONObject jsonObject) throws JSONException {
-            manufacturer = jsonObject.getString("manufacturer");
-            marketName = jsonObject.getString("market_name");
-            codename = jsonObject.getString("codename");
-            model = jsonObject.getString("model");
-        }
-
-        /**
-         * @return the consumer friendly name of the device.
-         */
-        public String getName() {
-            if (!TextUtils.isEmpty(marketName)) {
-                return marketName;
-            }
-            return capitalize(model);
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/DeviceName.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/DeviceName.kt
new file mode 100644
index 000000000..ee634fb33
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/DeviceName.kt
@@ -0,0 +1,573 @@
+package com.habitrpg.android.habitica.helpers
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.net.ConnectivityManager
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.text.TextUtils
+import androidx.annotation.WorkerThread
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.*
+
+/*
+* Copyright (C) 2017 Jared Rummler
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/ // @formatter:off
+/**
+ *
+ * Get the consumer friendly name of an Android device.
+ *
+ *
+ * On many popular devices the market name of the device is not available. For example, on the
+ * Samsung Galaxy S6 the value of [Build.MODEL] could be "SM-G920F", "SM-G920I", "SM-G920W8",
+ * etc.
+ *
+ *
+ * See the usages below to get the consumer friends name of a device:
+ *
+ *
+ * **Get the name of the current device:**
+ *
+ * <pre>
+ * String deviceName = DeviceName.getDeviceName();
+</pre> *
+ *
+ *
+ * The above code will get the correct device name for the top 600 Android devices. If the
+ * device is unrecognized, then Build.MODEL is returned.
+ *
+ *
+ * **Get the name of a device using the device's codename:**
+ *
+ * <pre>
+ * // Retruns "Moto X Style"
+ * DeviceName.getDeviceName("clark", "Unknown device");
+</pre> *
+ *
+ *
+ * **Get information about the device:**
+ *
+ * <pre>
+ * DeviceName.with(context).request(new DeviceName.Callback() {
+ *
+ * &#64;Override public void onFinished(DeviceName.DeviceInfo info, Exception error) {
+ * String manufacturer = info.manufacturer;  // "Samsung"
+ * String name = info.marketName;            // "Galaxy S6 Edge"
+ * String model = info.model;                // "SM-G925I"
+ * String codename = info.codename;          // "zerolte"
+ * String deviceName = info.getName();       // "Galaxy S6 Edge"
+ * // FYI: We are on the UI thread.
+ * }
+ * });
+</pre> *
+ *
+ *
+ * The above code loads JSON from a generated list of device names based on Google's maintained
+ * list. It will be up-to-date with Google's supported device list so that you will get the correct
+ * name for new or unknown devices. This supports over 10,000 devices.
+ *
+ *
+ * This will only make a network call once. The value is saved to SharedPreferences for future
+ * calls.
+ */
+object DeviceName {
+    // @formatter:on
+    // JSON which is derived from Google's PDF document which contains all devices on Google Play.
+    // To get the URL to the JSON file which contains information about the device name:
+    // String url = String.format(DEVICE_JSON_URL, Build.DEVICE);
+    private const val DEVICE_JSON_URL = "https://raw.githubusercontent.com/jaredrummler/AndroidDeviceNames/master/json/devices/%s.json"
+
+    // Preference filename for storing device info so we don't need to download it again.
+    private const val SHARED_PREF_NAME = "device_names"
+
+    /**
+     * Create a new request to get information about a device.
+     *
+     * @param context the application context
+     * @return a new Request instance.
+     */
+    fun with(context: Context): Request {
+        return Request(context.applicationContext)
+    }
+
+    /**
+     * Get the consumer friendly name of the device.
+     *
+     * @return the market name of the current device.
+     * @see .getDeviceName
+     */
+    val deviceName: String?
+        get() = getDeviceName(Build.DEVICE, Build.MODEL, Build.MODEL.capitalize(Locale.getDefault()))
+
+    /**
+     * Get the consumer friendly name of a device.
+     *
+     * @param codename the value of the system property "ro.product.device" ([Build.DEVICE])
+     * *or*
+     * the value of the system property "ro.product.model" ([Build.MODEL])
+     * @param fallback the fallback name if the device is unknown. Usually the value of the system property
+     * "ro.product.model" ([Build.MODEL])
+     * @return the market name of a device or `fallback` if the device is unknown.
+     */
+    fun getDeviceName(codename: String?, fallback: String?): String? {
+        return getDeviceName(codename, codename, fallback)
+    }
+
+    /**
+     * Get the consumer friendly name of a device.
+     *
+     * @param codename the value of the system property "ro.product.device" ([Build.DEVICE]).
+     * @param model the value of the system property "ro.product.model" ([Build.MODEL]).
+     * @param fallback the fallback name if the device is unknown. Usually the value of the system property
+     * "ro.product.model" ([Build.MODEL])
+     * @return the market name of a device or `fallback` if the device is unknown.
+     */
+    fun getDeviceName(codename: String?, model: String?, fallback: String?): String? {
+        // ----------------------------------------------------------------------------
+        // Google
+        if (codename != null && codename == "walleye") {
+            return "Pixel 2"
+        }
+        if (codename != null && codename == "taimen") {
+            return "Pixel 2 XL"
+        }
+        if (codename != null && codename == "blueline") {
+            return "Pixel 3"
+        }
+        if (codename != null && codename == "crosshatch") {
+            return "Pixel 3 XL"
+        }
+        if (codename != null && codename == "sargo") {
+            return "Pixel 3a"
+        }
+        if (codename != null && codename == "bonito") {
+            return "Pixel 3a XL"
+        }
+        // ----------------------------------------------------------------------------
+        // Huawei
+        if (codename != null && codename == "HWBND-H" || model != null && (model == "BND-L21" || model == "BND-L24" || model == "BND-L31")) {
+            return "Honor 7X"
+        }
+        if (codename != null && codename == "HWBKL" || model != null && (model == "BKL-L04" || model ==
+                        "BKL-L09")) {
+            return "Honor View 10"
+        }
+        if (codename != null && codename == "HWALP" || model != null && (model == "ALP-AL00" || model ==
+                        "ALP-L09" || model == "ALP-L29" || model == "ALP-TL00")) {
+            return "Mate 10"
+        }
+        if (codename != null && codename == "HWMHA" || model != null && (model == "MHA-AL00" || model ==
+                        "MHA-L09" || model == "MHA-L29" || model == "MHA-TL00")) {
+            return "Mate 9"
+        }
+        if (codename != null && codename == "angler") {
+            return "Nexus 6P"
+        }
+        // ----------------------------------------------------------------------------
+        // LGE
+        if (codename != null && codename == "h1" || model != null && (model == "LG-F700K" || model ==
+                        "LG-F700L" || model == "LG-F700S" || model == "LG-H820" || model == "LG-H820PR" || model ==
+                        "LG-H830" || model == "LG-H831" || model == "LG-H850" || model == "LG-H858" || model ==
+                        "LG-H860" || model == "LG-H868" || model == "LGAS992" || model == "LGLS992" || model ==
+                        "LGUS992" || model == "RS988" || model == "VS987")) {
+            return "LG G5"
+        }
+        if (codename != null && codename == "lucye" || model != null && (model == "LG-AS993" || model == "LG-H870" || model == "LG-H870AR" || model == "LG-H870DS" || model == "LG-H870I" || model == "LG-H870S" || model == "LG-H871" || model == "LG-H871S" || model == "LG-H872" || model == "LG-H872PR" || model == "LG-H873" || model == "LG-LS993" || model == "LGM-G600K" || model == "LGM-G600L" || model == "LGM-G600S" || model == "LGUS997" || model == "VS988")) {
+            return "LG G6"
+        }
+        if (codename != null && codename == "flashlmdd" || model != null && (model == "LM-V500" || model == "LM-V500N")) {
+            return "LG V50 ThinQ"
+        }
+        if (codename != null && codename == "mako") {
+            return "Nexus 4"
+        }
+        if (codename != null && codename == "hammerhead") {
+            return "Nexus 5"
+        }
+        if (codename != null && codename == "bullhead") {
+            return "Nexus 5X"
+        }
+        // ----------------------------------------------------------------------------
+        // Motorola
+        if (codename != null && codename == "griffin" || model != null && (model == "XT1650" || model ==
+                        "XT1650-05")) {
+            return "Moto Z"
+        }
+        if (codename != null && codename == "shamu") {
+            return "Nexus 6"
+        }
+        // ----------------------------------------------------------------------------
+        // Nokia
+        if (codename != null && (codename == "RHD" || codename == "ROO" || codename == "ROON_sprout" || codename == "ROO_sprout")) {
+            return "Nokia 3.1 Plus"
+        }
+        if (codename != null && codename == "CTL_sprout") {
+            return "Nokia 7.1"
+        }
+        // ----------------------------------------------------------------------------
+        // OnePlus
+        if (codename != null && codename == "OnePlus6" || model != null && model == "ONEPLUS A6003") {
+            return "OnePlus 6"
+        }
+        if (codename != null && (codename == "OnePlus6T" || codename == "OnePlus6TSingle") || (model != null
+                        && model == "ONEPLUS A6013")) {
+            return "OnePlus 6T"
+        }
+        if (codename != null && codename == "OnePlus7" || model != null && model == "GM1905") {
+            return "OnePlus 7"
+        }
+        if (codename != null && (codename == "OnePlus7Pro" || codename == "OnePlus7ProTMO") || (model != null
+                        && (model == "GM1915" || model == "GM1917"))) {
+            return "OnePlus 7 Pro"
+        }
+        // ----------------------------------------------------------------------------
+        // Samsung
+        if (codename != null && codename == "a50" || model != null && (model == "SM-A505F" || model == "SM-A505FM" || model == "SM-A505FN" || model == "SM-A505G" || model == "SM-A505GN" || model == "SM-A505GT" || model == "SM-A505N" || model == "SM-A505U" || model == "SM-A505W" || model == "SM-A505YN")) {
+            return "Galaxy A50"
+        }
+        if (codename != null && (codename == "a6elteaio" || codename == "a6elteatt" || codename == "a6eltemtr" || codename == "a6eltespr" || codename == "a6eltetmo" || codename == "a6elteue" || codename == "a6lte" || codename == "a6lteks") || model != null && (model == "SM-A600A" || model == "SM-A600AZ" || model == "SM-A600F" || model == "SM-A600FN" || model == "SM-A600G" || model == "SM-A600GN" || model == "SM-A600N" || model == "SM-A600P" || model == "SM-A600T" || model == "SM-A600T1" || model == "SM-A600U")) {
+            return "Galaxy A6"
+        }
+        if (codename != null && (codename == "SC-01J" || codename == "SCV34" || codename == "gracelte" || codename == "graceltektt" || codename == "graceltelgt" || codename == "gracelteskt" || codename == "graceqlteacg" || codename == "graceqlteatt" || codename == "graceqltebmc" || codename == "graceqltechn" || codename == "graceqltedcm" || codename == "graceqltelra" || codename == "graceqltespr" || codename == "graceqltetfnvzw" || codename == "graceqltetmo" || codename == "graceqlteue" || codename == "graceqlteusc" || codename == "graceqltevzw") || model != null && (model == "SAMSUNG-SM-N930A" || model == "SC-01J" || model == "SCV34" || model == "SGH-N037" || model == "SM-N9300" || model == "SM-N930F" || model == "SM-N930K" || model == "SM-N930L" || model == "SM-N930P" || model == "SM-N930R4" || model == "SM-N930R6" || model == "SM-N930R7" || model == "SM-N930S" || model == "SM-N930T" || model == "SM-N930U" || model == "SM-N930V" || model == "SM-N930VL" || model == "SM-N930W8" || model == "SM-N930X")) {
+            return "Galaxy Note7"
+        }
+        if (codename != null && (codename == "SC-01K" || codename == "SCV37" || codename == "greatlte" || codename == "greatlteks" || codename == "greatqlte" || codename == "greatqltechn" || codename == "greatqltecmcc" || codename == "greatqltecs" || codename == "greatqlteue") || model != null && (model == "SC-01K" || model == "SCV37" || model == "SM-N9500" || model == "SM-N9508" || model == "SM-N950F" || model == "SM-N950N" || model == "SM-N950U" || model == "SM-N950U1" || model == "SM-N950W" || model == "SM-N950XN")) {
+            return "Galaxy Note8"
+        }
+        if (codename != null && (codename == "SC-01L" || codename == "SCV40" || codename == "crownlte" || codename == "crownlteks" || codename == "crownqltechn" || codename == "crownqltecs" || codename == "crownqltesq" || codename == "crownqlteue") || model != null && (model == "SC-01L" || model == "SCV40" || model == "SM-N9600" || model == "SM-N960F" || model == "SM-N960N" || model == "SM-N960U" || model == "SM-N960U1" || model == "SM-N960W")) {
+            return "Galaxy Note9"
+        }
+        if (codename != null && (codename == "SC-03L" || codename == "SCV41" || codename == "beyond1" || codename == "beyond1q") || model != null && (model == "SC-03L" || model == "SCV41" || model == "SM-G9730" || model == "SM-G9738" || model == "SM-G973F" || model == "SM-G973N" || model == "SM-G973U" || model == "SM-G973U1" || model == "SM-G973W")) {
+            return "Galaxy S10"
+        }
+        if (codename != null && (codename == "SC-04L" || codename == "SCV42" || codename == "beyond2" || codename == "beyond2q") || model != null && (model == "SC-04L" || model == "SCV42" || model == "SM-G9750" || model == "SM-G9758" || model == "SM-G975F" || model == "SM-G975N" || model == "SM-G975U" || model == "SM-G975U1" || model == "SM-G975W")) {
+            return "Galaxy S10+"
+        }
+        if (codename != null && (codename == "beyond0" || codename == "beyond0q") || (model != null
+                        && (model == "SM-G9700" || model == "SM-G9708" || model == "SM-G970F" || model == "SM-G970N" || model == "SM-G970U" || model == "SM-G970U1" || model == "SM-G970W"))) {
+            return "Galaxy S10e"
+        }
+        if (codename != null && (codename == "SC-04F" || codename == "SCL23" || codename == "k3g" || codename == "klte" || codename == "klteMetroPCS" || codename == "klteacg" || codename == "klteaio" || codename == "klteatt" || codename == "kltecan" || codename == "klteduoszn" || codename == "kltektt" || codename == "kltelgt" || codename == "kltelra" || codename == "klteskt" || codename == "kltespr" || codename == "kltetfnvzw" || codename == "kltetmo" || codename == "klteusc" || codename == "kltevzw" || codename == "kwifi" || codename == "lentisltektt" || codename == "lentisltelgt" || codename == "lentislteskt") || model != null && (model == "SAMSUNG-SM-G900A" || model == "SAMSUNG-SM-G900AZ" || model == "SC-04F" || model == "SCL23" || model == "SM-G9006W" || model == "SM-G9008W" || model == "SM-G9009W" || model == "SM-G900F" || model == "SM-G900FQ" || model == "SM-G900H" || model == "SM-G900I" || model == "SM-G900K" || model == "SM-G900L" || model == "SM-G900M" || model == "SM-G900MD" || model == "SM-G900P" || model == "SM-G900R4" || model == "SM-G900R6" || model == "SM-G900R7" || model == "SM-G900S" || model == "SM-G900T" || model == "SM-G900T1" || model == "SM-G900T3" || model == "SM-G900T4" || model == "SM-G900V" || model == "SM-G900W8" || model == "SM-G900X" || model == "SM-G906K" || model == "SM-G906L" || model == "SM-G906S" || model == "SM-S903VL")) {
+            return "Galaxy S5"
+        }
+        if (codename != null && (codename == "s5neolte" || codename == "s5neoltecan") || model != null && (model == "SM-G903F" || model == "SM-G903M" || model == "SM-G903W")) {
+            return "Galaxy S5 Neo"
+        }
+        if (codename != null && (codename == "SC-05G" || codename == "zeroflte" || codename == "zeroflteacg" || codename == "zeroflteaio" || codename == "zeroflteatt" || codename == "zerofltebmc" || codename == "zerofltechn" || codename == "zerofltectc" || codename == "zerofltektt" || codename == "zerofltelgt" || codename == "zerofltelra" || codename == "zerofltemtr" || codename == "zeroflteskt" || codename == "zerofltespr" || codename == "zerofltetfnvzw" || codename == "zerofltetmo" || codename == "zeroflteusc" || codename == "zerofltevzw") || model != null && (model == "SAMSUNG-SM-G920A" || model == "SAMSUNG-SM-G920AZ" || model == "SC-05G" || model == "SM-G9200" || model == "SM-G9208" || model == "SM-G9209" || model == "SM-G920F" || model == "SM-G920I" || model == "SM-G920K" || model == "SM-G920L" || model == "SM-G920P" || model == "SM-G920R4" || model == "SM-G920R6" || model == "SM-G920R7" || model == "SM-G920S" || model == "SM-G920T" || model == "SM-G920T1" || model == "SM-G920V" || model == "SM-G920W8" || model == "SM-G920X" || model == "SM-S906L" || model == "SM-S907VL")) {
+            return "Galaxy S6"
+        }
+        if (codename != null && (codename == "404SC" || codename == "SC-04G" || codename == "SCV31" || codename == "zerolte" || codename == "zerolteacg" || codename == "zerolteatt" || codename == "zeroltebmc" || codename == "zeroltechn" || codename == "zeroltektt" || codename == "zeroltelra" || codename == "zerolteskt" || codename == "zeroltespr" || codename == "zeroltetmo" || codename == "zerolteusc" || codename == "zeroltevzw") || model != null && (model == "404SC" || model == "SAMSUNG-SM-G925A" || model == "SC-04G" || model == "SCV31" || model == "SM-G9250" || model == "SM-G925I" || model == "SM-G925K" || model == "SM-G925P" || model == "SM-G925R4" || model == "SM-G925R6" || model == "SM-G925R7" || model == "SM-G925S" || model == "SM-G925T" || model == "SM-G925V" || model == "SM-G925W8" || model == "SM-G925X")) {
+            return "Galaxy S6 Edge"
+        }
+        if (codename != null && (codename == "zenlte" || codename == "zenlteatt" || codename == "zenltebmc" || codename == "zenltechn" || codename == "zenltektt" || codename == "zenltekx" || codename == "zenltelgt" || codename == "zenlteskt" || codename == "zenltespr" || codename == "zenltetmo" || codename == "zenlteusc" || codename == "zenltevzw") || model != null && (model == "SAMSUNG-SM-G928A" || model == "SM-G9280" || model == "SM-G9287C" || model == "SM-G928C" || model == "SM-G928G" || model == "SM-G928I" || model == "SM-G928K" || model == "SM-G928L" || model == "SM-G928N0" || model == "SM-G928P" || model == "SM-G928R4" || model == "SM-G928S" || model == "SM-G928T" || model == "SM-G928V" || model == "SM-G928W8" || model == "SM-G928X")) {
+            return "Galaxy S6 Edge+"
+        }
+        if (codename != null && (codename == "herolte" || codename == "heroltebmc" || codename ==
+                        "heroltektt" || codename == "heroltelgt" || codename == "herolteskt" || codename ==
+                        "heroqlteacg" || codename == "heroqlteaio" || codename == "heroqlteatt" || codename ==
+                        "heroqltecctvzw" || codename == "heroqltechn" || codename == "heroqltelra" || codename ==
+                        "heroqltemtr" || codename == "heroqltespr" || codename == "heroqltetfnvzw" || codename ==
+                        "heroqltetmo" || codename == "heroqlteue" || codename == "heroqlteusc" || codename ==
+                        "heroqltevzw") || model != null && (model == "SAMSUNG-SM-G930A" || model == "SAMSUNG-SM-G930AZ" || model == "SM-G9300" || model == "SM-G9308" || model == "SM-G930F" || model == "SM-G930K" || model == "SM-G930L" || model == "SM-G930P" || model == "SM-G930R4" || model == "SM-G930R6" || model == "SM-G930R7" || model == "SM-G930S" || model == "SM-G930T" || model == "SM-G930T1" || model == "SM-G930U" || model == "SM-G930V" || model == "SM-G930VC" || model == "SM-G930VL" || model == "SM-G930W8" || model == "SM-G930X")) {
+            return "Galaxy S7"
+        }
+        if (codename != null && (codename == "SC-02H" || codename == "SCV33" || codename == "hero2lte" || codename == "hero2ltebmc" || codename == "hero2ltektt" || codename == "hero2lteskt" || codename == "hero2qlteatt" || codename == "hero2qltecctvzw" || codename == "hero2qltespr" || codename == "hero2qltetmo" || codename == "hero2qlteusc" || codename == "hero2qltevzw") || model != null && (model == "SAMSUNG-SM-G935A" || model == "SC-02H" || model == "SCV33" || model == "SM-G935K" || model == "SM-G935P" || model == "SM-G935R4" || model == "SM-G935S" || model == "SM-G935T" || model == "SM-G935V" || model == "SM-G935VC" || model == "SM-G935W8" || model == "SM-G935X")) {
+            return "Galaxy S7 Edge"
+        }
+        if (codename != null && (codename == "SC-02J" || codename == "SCV36" || codename == "dreamlte" || codename == "dreamlteks" || codename == "dreamqltecan" || codename == "dreamqltechn" || codename == "dreamqltecmcc" || codename == "dreamqltesq" || codename == "dreamqlteue") || model != null && (model == "SC-02J" || model == "SCV36" || model == "SM-G9500" || model == "SM-G9508" || model == "SM-G950F" || model == "SM-G950N" || model == "SM-G950U" || model == "SM-G950U1" || model == "SM-G950W")) {
+            return "Galaxy S8"
+        }
+        if (codename != null && (codename == "SC-03J" || codename == "SCV35" || codename == "dream2lte" || codename == "dream2lteks" || codename == "dream2qltecan" || codename == "dream2qltechn" || codename == "dream2qltesq" || codename == "dream2qlteue") || model != null && (model == "SC-03J" || model == "SCV35" || model == "SM-G9550" || model == "SM-G955F" || model == "SM-G955N" || model == "SM-G955U" || model == "SM-G955U1" || model == "SM-G955W")) {
+            return "Galaxy S8+"
+        }
+        if (codename != null && (codename == "SC-02K" || codename == "SCV38" || codename == "starlte" || codename == "starlteks" || codename == "starqltechn" || codename == "starqltecmcc" || codename == "starqltecs" || codename == "starqltesq" || codename == "starqlteue") || model != null && (model == "SC-02K" || model == "SCV38" || model == "SM-G9600" || model == "SM-G9608" || model == "SM-G960F" || model == "SM-G960N" || model == "SM-G960U" || model == "SM-G960U1" || model == "SM-G960W")) {
+            return "Galaxy S9"
+        }
+        if (codename != null && (codename == "SC-03K" || codename == "SCV39" || codename == "star2lte" || codename == "star2lteks" || codename == "star2qltechn" || codename == "star2qltecs" || codename == "star2qltesq" || codename == "star2qlteue") || model != null && (model == "SC-03K" || model == "SCV39" || model == "SM-G9650" || model == "SM-G965F" || model == "SM-G965N" || model == "SM-G965U" || model == "SM-G965U1" || model == "SM-G965W")) {
+            return "Galaxy S9+"
+        }
+        // ----------------------------------------------------------------------------
+        // Sony
+        if (codename != null && (codename == "802SO" || codename == "J8110" || codename == "J8170" || codename == "J9110" || codename == "SO-03L" || codename == "SOV40") || model != null && (model == "802SO" || model == "J8110" || model == "J8170" || model == "J9110" || model == "SO-03L" || model == "SOV40")) {
+            return "Xperia 1"
+        }
+        if (codename != null && (codename == "I3113" || codename == "I3123" || codename == "I4113" || codename == "I4193") || model != null && (model == "I3113" || model == "I3123" || model == "I4113" || model == "I4193")) {
+            return "Xperia 10"
+        }
+        if (codename != null && (codename == "I3213" || codename == "I3223" || codename == "I4213" || codename == "I4293") || model != null && (model == "I3213" || model == "I3223" || model == "I4213" || model == "I4293")) {
+            return "Xperia 10 Plus"
+        }
+        if (codename != null && (codename == "702SO" || codename == "H8216" || codename == "H8266" || codename == "H8276" || codename == "H8296" || codename == "SO-03K" || codename == "SOV37") || model != null && (model == "702SO" || model == "H8216" || model == "H8266" || model == "H8276" || model == "H8296" || model == "SO-03K" || model == "SOV37")) {
+            return "Xperia XZ2"
+        }
+        if (codename != null && (codename == "H8116" || codename == "H8166" || codename == "SO-04K" || codename == "SOV38") || model != null && (model == "H8116" || model == "H8166" || model == "SO-04K" || model == "SOV38")) {
+            return "Xperia XZ2 Premium"
+        }
+        return if (codename != null && (codename == "801SO" || codename == "H8416" || codename == "H9436" || codename == "H9493" || codename == "SO-01L" || codename == "SOV39") || model != null && (model == "801SO" || model == "H8416" || model == "H9436" || model == "H9493" || model == "SO-01L" || model == "SOV39")) {
+            "Xperia XZ3"
+        } else fallback
+    }
+
+    /**
+     * Get the [DeviceInfo] for the current device. Do not run on the UI thread, as this may
+     * download JSON to retrieve the [DeviceInfo]. JSON is only downloaded once and then
+     * stored to [SharedPreferences].
+     *
+     * @param context the application context.
+     * @return [DeviceInfo] for the current device.
+     */
+    @WorkerThread
+    fun getDeviceInfo(context: Context): DeviceInfo {
+        return getDeviceInfo(context.applicationContext, Build.DEVICE, Build.MODEL)
+    }
+
+    /**
+     * Get the [DeviceInfo] for the current device. Do not run on the UI thread, as this may
+     * download JSON to retrieve the [DeviceInfo]. JSON is only downloaded once and then
+     * stored to [SharedPreferences].
+     *
+     * @param context the application context.
+     * @param codename the codename of the device
+     * @return [DeviceInfo] for the current device.
+     */
+    @WorkerThread
+    fun getDeviceInfo(context: Context, codename: String?): DeviceInfo {
+        return getDeviceInfo(context, codename, null)
+    }
+
+    /**
+     * Get the [DeviceInfo] for the current device. Do not run on the UI thread, as this may
+     * download JSON to retrieve the [DeviceInfo]. JSON is only downloaded once and then
+     * stored to [SharedPreferences].
+     *
+     * @param context the application context.
+     * @param codename the codename of the device
+     * @param model the model of the device
+     * @return [DeviceInfo] for the current device.
+     */
+    @WorkerThread
+    fun getDeviceInfo(context: Context, codename: String?, model: String?): DeviceInfo {
+        val prefs = context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
+        val key = String.format("%s:%s", codename, model)
+        val savedJson = prefs.getString(key, null)
+        if (savedJson != null) {
+            try {
+                return DeviceInfo(JSONObject(savedJson))
+            } catch (e: JSONException) {
+                e.printStackTrace()
+            }
+        }
+
+        // check if we have an internet connection
+        val ret = context.checkCallingOrSelfPermission(Manifest.permission.ACCESS_NETWORK_STATE)
+        var isConnectedToNetwork = false
+        if (ret == PackageManager.PERMISSION_GRANTED) {
+            val connMgr = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            @SuppressLint("MissingPermission") val networkInfo = connMgr.activeNetworkInfo
+            if (networkInfo != null && networkInfo.isConnected) {
+                isConnectedToNetwork = true
+            }
+        } else {
+            // assume we are connected.
+            isConnectedToNetwork = true
+        }
+        if (isConnectedToNetwork) {
+            try {
+                // Get the device name from the generated JSON files created from Google's device list.
+                val url = String.format(DEVICE_JSON_URL, codename!!.toLowerCase(Locale.ENGLISH))
+                val jsonString = downloadJson(url)
+                val jsonArray = JSONArray(jsonString)
+                var i = 0
+                val len = jsonArray.length()
+                while (i < len) {
+                    val json = jsonArray.getJSONObject(i)
+                    val info = DeviceInfo(json)
+                    if (codename.equals(info.codename, ignoreCase = true) && model == null
+                            || codename.equals(info.codename, ignoreCase = true) && model.equals(info.model, ignoreCase = true)) {
+                        // Save to SharedPreferences so we don't need to make another request.
+                        val editor = prefs.edit()
+                        editor.putString(key, json.toString())
+                        editor.apply()
+                        return info
+                    }
+                    i++
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+        return if (codename == Build.DEVICE && Build.MODEL == model) {
+            DeviceInfo(Build.MANUFACTURER, deviceName, codename, model) // current device
+        } else DeviceInfo(null, null, codename, model)
+        // unknown device
+    }
+
+    /** Download URL to String  */
+    @WorkerThread
+    @Throws(IOException::class)
+    private fun downloadJson(myurl: String): String {
+        val sb = StringBuilder()
+        var reader: BufferedReader? = null
+        return try {
+            val url = URL(myurl)
+            val conn = url.openConnection() as HttpURLConnection
+            conn.readTimeout = 10000
+            conn.connectTimeout = 15000
+            conn.requestMethod = "GET"
+            conn.doInput = true
+            conn.connect()
+            if (conn.responseCode == HttpURLConnection.HTTP_OK) {
+                reader = BufferedReader(InputStreamReader(conn.inputStream))
+                var line: String?
+                while (reader.readLine().also { line = it } != null) {
+                    sb.append(line).append('\n')
+                }
+            }
+            sb.toString()
+        } finally {
+            reader?.close()
+        }
+    }
+
+    class Request internal constructor(val context: Context) {
+        val handler: Handler
+        var codename: String? = null
+        var model: String? = null
+
+        /**
+         * Set the device codename to query. You should also set the model.
+         *
+         * @param codename the value of the system property "ro.product.device"
+         * @return This Request object to allow for chaining of calls to set methods.
+         * @see Build.DEVICE
+         */
+        fun setCodename(codename: String?): Request {
+            this.codename = codename
+            return this
+        }
+
+        /**
+         * Set the device model to query. You should also set the codename.
+         *
+         * @param model the value of the system property "ro.product.model"
+         * @return This Request object to allow for chaining of calls to set methods.
+         * @see Build.MODEL
+         */
+        fun setModel(model: String?): Request {
+            this.model = model
+            return this
+        }
+
+        /**
+         * Download information about the device. This saves the results in shared-preferences so
+         * future requests will not need a network connection.
+         *
+         * @param callback the callback to retrieve the [DeviceName.DeviceInfo]
+         */
+        fun request(callback: Callback) {
+            if (codename == null && model == null) {
+                codename = Build.DEVICE
+                model = Build.MODEL
+            }
+            val runnable = GetDeviceRunnable(callback)
+            if (Looper.myLooper() == Looper.getMainLooper()) {
+                Thread(runnable).start()
+            } else {
+                runnable.run() // already running in background thread.
+            }
+        }
+
+        private inner class GetDeviceRunnable(val callback: Callback) : Runnable {
+            var deviceInfo: DeviceInfo? = null
+            var error: Exception? = null
+            override fun run() {
+                try {
+                    deviceInfo = getDeviceInfo(context, codename, model)
+                } catch (e: Exception) {
+                    error = e
+                }
+                handler.post { callback.onFinished(deviceInfo, error) }
+            }
+        }
+
+        init {
+            handler = Handler(context.mainLooper)
+        }
+    }
+
+    /**
+     * Callback which is invoked when the [DeviceName.DeviceInfo] is finished loading.
+     */
+    interface Callback {
+        /**
+         * Callback to get the device info. This is run on the UI thread.
+         *
+         * @param info the requested [DeviceName.DeviceInfo]
+         * @param error `null` if nothing went wrong.
+         */
+        fun onFinished(info: DeviceInfo?, error: Exception?)
+    }
+
+    /**
+     * Device information based on
+     * [Google's maintained list](https://support.google.com/googleplay/answer/1727131).
+     */
+    class DeviceInfo {
+        /** Retail branding  */
+        val manufacturer: String?
+
+        /** Marketing name  */
+        val marketName: String?
+
+        /** the value of the system property "ro.product.device"  */
+        val codename: String?
+
+        /** the value of the system property "ro.product.model"  */
+        val model: String?
+
+        constructor(manufacturer: String?, marketName: String?, codename: String?, model: String?) {
+            this.manufacturer = manufacturer
+            this.marketName = marketName
+            this.codename = codename
+            this.model = model
+        }
+
+        constructor(jsonObject: JSONObject) {
+            manufacturer = jsonObject.getString("manufacturer")
+            marketName = jsonObject.getString("market_name")
+            codename = jsonObject.getString("codename")
+            model = jsonObject.getString("model")
+        }
+
+        /**
+         * @return the consumer friendly name of the device.
+         */
+        val name: String?
+            get() = if (!TextUtils.isEmpty(marketName)) {
+                marketName
+            } else model?.capitalize(Locale.getDefault())
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.kt
index eb734a4c6..31c9e4f78 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.kt
@@ -4,13 +4,13 @@ import java.util.*
 
 class LanguageHelper(languageSharedPref: String?) {
 
-    var locale: Locale? = null
+    var locale: Locale
         private set
     var languageCode: String? = null
         private set
 
     init {
-        when (languageSharedPref) {
+        when (val pref = languageSharedPref ?: "en") {
             "iw" -> {
                 locale = Locale("iw")
                 languageCode = "he"
@@ -28,13 +28,11 @@ class LanguageHelper(languageSharedPref: String?) {
                 languageCode = "pt"
             }
             else -> {
-                languageSharedPref?.let { pref ->
-                    locale = if (pref.contains("_")) {
-                        val languageCodeParts = pref.split("_".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-                        Locale(languageCodeParts[0], languageCodeParts[1])
-                    } else {
-                        Locale(languageSharedPref)
-                    }
+                locale = if (pref.contains("_")) {
+                    val languageCodeParts = pref.split("_".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                    Locale(languageCodeParts[0], languageCodeParts[1])
+                } else {
+                    Locale(pref)
                 }
                 languageCode = languageSharedPref
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
index f90bb8e51..dcbf71eca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.helpers
 
 import android.os.Bundle
+import android.util.Log
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
 import java.lang.ref.WeakReference
@@ -21,7 +22,11 @@ object MainNavigationController {
             lastNavigation = Date()
             try {
                 navController?.get()?.navigate(transactionId, args)
-            } catch (_: IllegalArgumentException) {}
+            } catch (e: IllegalArgumentException) {
+                Log.e("Main Navigation", e.localizedMessage)
+            } catch (error: Exception) {
+                Log.e("Main Navigation", error.localizedMessage)
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
index eadbedfee..8891e9b35 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
@@ -5,25 +5,30 @@ import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
 import com.habitrpg.android.habitica.models.user.User
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 
 class NotificationOpenHandler {
 
     companion object {
 
         fun handleOpenedByNotification(identifier: String, intent: Intent, user: User?) {
-            when (identifier) {
-                PushNotificationManager.PARTY_INVITE_PUSH_NOTIFICATION_KEY -> openPartyScreen()
-                PushNotificationManager.QUEST_BEGUN_PUSH_NOTIFICATION_KEY -> openQuestDetailSCreen(user?.party?.id,
-                        user?.party?.quest?.key)
-                PushNotificationManager.QUEST_INVITE_PUSH_NOTIFICATION_KEY -> openQuestDetailSCreen(user?.party?.id,
-                        user?.party?.quest?.key)
-                PushNotificationManager.GUILD_INVITE_PUSH_NOTIFICATION_KEY -> openGuildDetailScreen(intent.getStringExtra("groupID"))
-                PushNotificationManager.RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY -> openPrivateMessageScreen(intent.getStringExtra("replyTo"))
-                PushNotificationManager.CHANGE_USERNAME_PUSH_NOTIFICATION_KEY -> openSettingsScreen()
-                PushNotificationManager.GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY -> openSubscriptionScreen()
-                PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
-                PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
-                PushNotificationManager.G1G1_PROMO_KEY -> openGiftOneGetOneInfoScreen()
+            GlobalScope.launch(context = Dispatchers.Main) {
+                when (identifier) {
+                    PushNotificationManager.PARTY_INVITE_PUSH_NOTIFICATION_KEY -> openPartyScreen()
+                    PushNotificationManager.QUEST_BEGUN_PUSH_NOTIFICATION_KEY -> openQuestDetailSCreen(user?.party?.id,
+                            user?.party?.quest?.key)
+                    PushNotificationManager.QUEST_INVITE_PUSH_NOTIFICATION_KEY -> openQuestDetailSCreen(user?.party?.id,
+                            user?.party?.quest?.key)
+                    PushNotificationManager.GUILD_INVITE_PUSH_NOTIFICATION_KEY -> openGuildDetailScreen(intent.getStringExtra("groupID"))
+                    PushNotificationManager.RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY -> openPrivateMessageScreen(intent.getStringExtra("replyTo"))
+                    PushNotificationManager.CHANGE_USERNAME_PUSH_NOTIFICATION_KEY -> openSettingsScreen()
+                    PushNotificationManager.GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY -> openSubscriptionScreen()
+                    PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
+                    PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
+                    PushNotificationManager.G1G1_PROMO_KEY -> openGiftOneGetOneInfoScreen()
+                }
             }
         }
 
@@ -44,7 +49,7 @@ class NotificationOpenHandler {
         }
 
         private fun openGiftOneGetOneInfoScreen() {
-            MainNavigationController.navigate(R.id.giftOneGetOneInfoActivity)
+            MainNavigationController.navigate(R.id.subscriptionPurchaseActivity)
         }
 
         private fun openQuestDetailSCreen(partyId: String?, questKey: String?) {
@@ -56,10 +61,10 @@ class NotificationOpenHandler {
 
         private fun openGuildDetailScreen(groupID: String?) {
             if (groupID?.isNotEmpty() != true) {
-                return
+                MainNavigationController.navigate(R.id.guildsOverviewFragment)
+            } else {
+                MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to groupID))
             }
-            MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to groupID))
-
         }
 
         private fun openSettingsScreen() {
@@ -68,9 +73,9 @@ class NotificationOpenHandler {
 
         private fun handleChatMessage(type: String?, groupID: String?) {
             when (type) {
-                "party" -> MainNavigationController.navigate(R.id.partyFragment)
+                "party" -> openPartyScreen()
                 "tavern" -> MainNavigationController.navigate(R.id.tavernFragment)
-                "guild" -> MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to groupID))
+                "guild" -> openGuildDetailScreen(groupID)
             }
         }
     }
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..beb79e512 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
@@ -1,28 +1,21 @@
 package com.habitrpg.android.habitica.helpers
 
 import android.content.Context
-import androidx.core.os.bundleOf
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.events.ShowAchievementDialog
-import com.habitrpg.android.habitica.events.ShowCheckinDialog
-import com.habitrpg.android.habitica.events.ShowFirstDropDialog
-import com.habitrpg.android.habitica.events.ShowSnackbarEvent
+import com.habitrpg.android.habitica.events.*
 import com.habitrpg.android.habitica.models.Notification
 import com.habitrpg.android.habitica.models.notifications.AchievementData
+import com.habitrpg.android.habitica.models.notifications.ChallengeWonData
 import com.habitrpg.android.habitica.models.notifications.FirstDropData
 import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDialog
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Completable
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import org.greenrobot.eventbus.EventBus
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -47,8 +40,7 @@ class NotificationsManager (private val context: Context) {
     }
 
     fun getNotifications(): Flowable<List<Notification>> {
-        return this.notifications
-                .startWith(emptyList<Notification>())
+        return this.notifications.startWithArray(emptyList())
                 .toFlowable(BackpressureStrategy.LATEST)
     }
 
@@ -79,6 +71,32 @@ class NotificationsManager (private val context: Context) {
                         Notification.Type.ACHIEVEMENT_GUILD_JOINED.type -> displayAchievementNotification(it)
                         Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -> displayAchievementNotification(it)
                         Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -> displayAchievementNotification(it)
+                        Notification.Type.WON_CHALLENGE.type -> displayWonChallengeNotificaiton(it)
+
+                        Notification.Type.ACHIEVEMENT_ALL_YOUR_BASE.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_BACK_TO_BASICS.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_JUST_ADD_WATER.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_LOST_MASTERCLASSER.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_MIND_OVER_MATTER.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_DUST_DEVIL.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_ARID_AUTHORITY.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_MONSTER_MAGUS.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_PEARLY_PRO.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_TICKLED_PINK.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_ROSY_OUTLOOK.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_BUG_BONANZA.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_BARE_NECESSITIES.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_BONE_COLLECTOR.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_SKELETON_CREW.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_SEEING_RED.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_RED_LETTER_DAY.type -> displayAchievementNotification(it)
+
                         Notification.Type.ACHIEVEMENT_GENERIC.type -> displayAchievementNotification(it, notifications.find { notif ->
                             notif.type == Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type
                         } != null)
@@ -96,6 +114,11 @@ class NotificationsManager (private val context: Context) {
         return true
     }
 
+    private fun displayWonChallengeNotificaiton(notification: Notification): Boolean {
+        EventBus.getDefault().post(ShowWonChallengeDialog(notification.id, notification.data as? ChallengeWonData))
+        return true
+    }
+
     private fun displayFirstDropNotification(notification: Notification): Boolean {
         val data = (notification.data as? FirstDropData)
         EventBus.getDefault().post(ShowFirstDropDialog(data?.egg ?: "", data?.hatchingPotion ?: "", notification.id))
@@ -116,14 +139,15 @@ 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
     }
 
     private fun displayAchievementNotification(notification: Notification, isLastOnboardingAchievement: Boolean = false): Boolean {
-        val achievement = (notification.data as? AchievementData)?.achievement ?: notification.type ?: ""
+        val data = (notification.data as? AchievementData)
+        val achievement = data?.achievement ?: notification.type ?: ""
         val delay: Long = if (achievement == "createdTask" || achievement == Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type) {
             1000
         } else {
@@ -131,8 +155,8 @@ class NotificationsManager (private val context: Context) {
         }
         val sub = Completable.complete()
                 .delay(delay, TimeUnit.MILLISECONDS)
-                .subscribe(Action {
-                    EventBus.getDefault().post(ShowAchievementDialog(achievement, notification.id, isLastOnboardingAchievement))
+                .subscribe({
+                    EventBus.getDefault().post(ShowAchievementDialog(achievement, notification.id, data?.message, data?.modalText, isLastOnboardingAchievement))
                 }, RxErrorHandler.handleEmptyError())
         logOnboardingEvents(achievement)
         return true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
index 6fdaf2fcb..53a40845d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
@@ -5,9 +5,8 @@ import android.content.Intent
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import org.solovyev.android.checkout.*
-import java.lang.NullPointerException
+import retrofit2.Response
 import java.util.*
-import javax.annotation.Nonnull
 
 class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy) {
     private val billing = HabiticaBaseApplication.getInstance(activity.applicationContext)?.billing
@@ -186,7 +185,10 @@ class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy
                 }
 
                 override fun onError(response: Int, e: java.lang.Exception) {
-                    e.printStackTrace()
+                    crashlyticsProxy.logException(e)
+                    if (response == ResponseCodes.ITEM_ALREADY_OWNED) {
+                        checkIfPendingPurchases()
+                    }
                 }
             }))
         }
@@ -205,7 +207,9 @@ class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy
                     })
                 }
 
-                override fun onError(response: Int, e: java.lang.Exception) { /* no-op */ }
+                override fun onError(response: Int, e: java.lang.Exception) {
+                    crashlyticsProxy.logException(e)
+                }
             }))
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
index dc51b50ba..8902fd7f2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.helpers
 import android.util.Log
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import okhttp3.internal.http2.ConnectionShutdownException
 import retrofit2.HttpException
 import java.io.EOFException
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
index 5796ec71a..ff608eb2f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
@@ -32,16 +32,11 @@ class SoundFile(val theme: String, private val fileName: String) : MediaPlayer.O
 
         try {
             m.setDataSource(file?.path)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                val attributes = AudioAttributes.Builder()
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                        .setLegacyStreamType(AudioManager.STREAM_NOTIFICATION)
-                        .build()
-                m.setAudioAttributes(attributes)
-            } else {
-                @Suppress("Deprecation")
-                m.setAudioStreamType(AudioManager.STREAM_NOTIFICATION)
-            }
+            val attributes = AudioAttributes.Builder()
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .setLegacyStreamType(AudioManager.STREAM_NOTIFICATION)
+                    .build()
+            m.setAudioAttributes(attributes)
             m.prepare()
 
             playerPrepared = true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
index 8ffe59438..cda1cf7be 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
@@ -4,13 +4,14 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Environment
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okio.Okio
+import okio.buffer
+import okio.sink
 import java.io.File
 import java.io.IOException
 
@@ -24,7 +25,7 @@ class SoundFileLoader(private val context: Context) {
             return cacheDir?.path
         }
 
-    @SuppressLint("SetWorldReadable", "ObsoleteSdkInt", "ReturnCount")
+    @SuppressLint("SetWorldReadable", "ReturnCount")
     fun download(files: List<SoundFile>): Single<List<SoundFile>> {
         return Observable.fromIterable(files)
                 .flatMap({ audioFile ->
@@ -50,22 +51,20 @@ class SoundFileLoader(private val context: Context) {
                             return@create
                         }
 
-                        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-                            try {
-                                val sink = Okio.buffer(Okio.sink(file))
-                                sink.writeAll(response.body()!!.source())
-                                sink.flush()
-                                sink.close()
-                            } catch (io: IOException) {
-                                sub.onComplete()
-                                return@create
-                            }
-
-                            file.setReadable(true, false)
-                            audioFile.file = file
-                            sub.onNext(audioFile)
+                        try {
+                            val sink = file.sink().buffer()
+                            sink.writeAll(response.body!!.source())
+                            sink.flush()
+                            sink.close()
+                        } catch (io: IOException) {
                             sub.onComplete()
+                            return@create
                         }
+
+                        file.setReadable(true, false)
+                        audioFile.file = file
+                        sub.onNext(audioFile)
+                        sub.onComplete()
                     }
                     fileObservable.subscribeOn(Schedulers.io())
                 }, 5)
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..235822d1a 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
@@ -1,9 +1,8 @@
 package com.habitrpg.android.habitica.helpers
 
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import io.reactivex.Maybe
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.schedulers.Schedulers
 import javax.inject.Inject
 
 class SoundManager {
@@ -48,7 +47,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..b7d3f407d 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
@@ -5,7 +5,6 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.os.Build.VERSION.SDK_INT
 import androidx.preference.PreferenceManager
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.models.tasks.RemindersItem
@@ -14,8 +13,7 @@ import com.habitrpg.android.habitica.receivers.NotificationPublisher
 import com.habitrpg.android.habitica.receivers.TaskReceiver
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
 import java.util.*
 
 class TaskAlarmManager(private var context: Context, private var taskRepository: TaskRepository, private var userId: String) {
@@ -49,15 +47,15 @@ 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) {
         taskRepository.getTaskCopies(userId)
                 .firstElement()
                 .toFlowable()
-                .flatMap<Task> { Flowable.fromIterable(it) }
-                .subscribe(Consumer { this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError())
+                .flatMap { Flowable.fromIterable(it) }
+                .subscribe({ this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError())
 
         if (!preventDailyReminder) {
             scheduleDailyReminder(context)
@@ -173,9 +171,9 @@ class TaskAlarmManager(private var context: Context, private var taskRepository:
                 return
             }
 
-            if (Build.VERSION_CODES.KITKAT <= SDK_INT && SDK_INT < Build.VERSION_CODES.M) {
-                alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, time + 60000, pendingIntent)
-            } else if (SDK_INT >= Build.VERSION_CODES.M) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, 60000, pendingIntent)
+            } else {
                 alarmManager?.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, time, pendingIntent)
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
index 7b9c6db69..e4ebe9147 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
@@ -33,10 +33,6 @@ class TaskFilterHelper {
         }
     }
 
-    fun isTagChecked(tagID: String): Boolean {
-        return this.tagsId.contains(tagID)
-    }
-
     fun filter(tasks: List<Task>): List<Task> {
         if (tasks.isEmpty()) {
             return tasks
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt
index a0b1062d8..2ded314fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt
@@ -11,7 +11,7 @@ import androidx.core.app.RemoteInput
 import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
-import net.pherth.android.emoji_library.EmojiParser
+import com.habitrpg.android.habitica.ui.helpers.EmojiParser
 import java.text.SimpleDateFormat
 import java.util.*
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
index a895ba525..b9971cebe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
@@ -3,10 +3,10 @@ package com.habitrpg.android.habitica.helpers.notifications
 import com.google.firebase.iid.FirebaseInstanceId
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import com.habitrpg.android.habitica.HabiticaApplication
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.components.UserComponent
-import java.util.*
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import javax.inject.Inject
 
 class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
@@ -17,10 +17,17 @@ class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
     @Inject
     internal lateinit var pushNotificationManager: PushNotificationManager
 
+    @Inject
+    internal lateinit var userRepository: UserRepository
+
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         userComponent?.inject(this)
         if (this::pushNotificationManager.isInitialized) {
             pushNotificationManager.displayNotification(remoteMessage)
+
+            if (remoteMessage.data["identifier"]?.contains(PushNotificationManager.WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true) {
+                userRepository.retrieveUser(true).subscribe({}, RxErrorHandler.handleEmptyError())
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
index 846c6596c..bc39291dd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
@@ -57,6 +57,7 @@ abstract class HabiticaLocalNotification(protected var context: Context, protect
     protected open fun setNotificationActions(data: Map<String, String>)  {
         val intent = Intent(context, MainActivity::class.java)
         intent.putExtra("notificationIdentifier", identifier)
+        intent.putExtra("notificationTimeStamp", Date().time)
         configureMainIntent(intent)
         val pendingIntent = PendingIntent.getActivity(
                 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..02272b51b 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
@@ -9,7 +9,6 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.functions.Consumer
 import java.util.*
 
 class PushNotificationManager(var apiClient: ApiClient, private val sharedPreferences: SharedPreferences, private val context: Context) {
@@ -43,14 +42,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/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
index f62447497..a606dce0f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
@@ -10,7 +10,7 @@ import androidx.core.app.RemoteInput
 import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
-import net.pherth.android.emoji_library.EmojiParser
+import com.habitrpg.android.habitica.ui.helpers.EmojiParser
 
 
 class ReceivedPrivateMessageLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
index 4b8d590d0..c78f9bcea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.models.user.User
 
 import javax.inject.Inject
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 class BuyRewardUseCase @Inject
 constructor(private val taskRepository: TaskRepository, private val soundManager: SoundManager,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
index d7bf998a2..d581f7382 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
 
 import javax.inject.Inject
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 import com.habitrpg.android.habitica.ui.activities.MainActivity.Companion.SELECT_CLASS_RESULT
 
@@ -32,7 +32,7 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh
                 displayClassSelectionActivity(requestValues.isInitialSelection, requestValues.currentClass, requestValues.activity)
             }
 
-            Flowable.empty<Void>()
+            Flowable.empty()
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
index 5776d9cb9..eb7ebf3bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
@@ -1,14 +1,18 @@
 package com.habitrpg.android.habitica.interactors
 
+import android.content.Context
 import android.os.Handler
+import android.provider.Settings.Global.getString
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.executors.PostExecutionThread
 import com.habitrpg.android.habitica.executors.ThreadExecutor
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
+import java.lang.StringBuilder
 import javax.inject.Inject
 
 class DisplayItemDropUseCase @Inject
@@ -17,18 +21,25 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
     override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<Void> {
         return Flowable.defer {
             val data = requestValues.data
+            var snackbarText = StringBuilder(data?.drop?.dialog ?: "")
 
-            if (data?.drop != null) {
+            if (data?.questItemsFound ?: 0 > 0 && requestValues.showQuestItems) {
+                if (snackbarText.isNotEmpty())
+                    snackbarText.append('\n')
+                snackbarText.append(requestValues.context.getString(R.string.quest_items_found, data!!.questItemsFound))
+            }
+
+            if (snackbarText.isNotEmpty()) {
                 Handler().postDelayed({
                     HabiticaSnackbar.showSnackbar(requestValues.snackbarTargetView,
-                            data.drop?.dialog, HabiticaSnackbar.SnackbarDisplayType.DROP)
+                            snackbarText, HabiticaSnackbar.SnackbarDisplayType.DROP)
                     soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop)
                 }, 3000L)
             }
 
-            Flowable.empty<Void>()
+            Flowable.empty()
         }
     }
 
-    class RequestValues(val data: TaskScoringResult?, val context: AppCompatActivity, val snackbarTargetView: ViewGroup) : UseCase.RequestValues
+    class RequestValues(val data: TaskScoringResult?, val context: AppCompatActivity, val snackbarTargetView: ViewGroup, val showQuestItems: Boolean) : UseCase.RequestValues
 }
\ No newline at end of file
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..81311c32e 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
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.interactors
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.DialogLevelup10Binding
 import com.habitrpg.android.habitica.events.ShareEvent
 import com.habitrpg.android.habitica.executors.PostExecutionThread
 import com.habitrpg.android.habitica.executors.ThreadExecutor
@@ -13,8 +14,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
@@ -32,18 +32,16 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 return@defer Flowable.just<Stats>(requestValues.user.stats)
             }
 
-            if (requestValues.newLevel == 10) {
-                val customView = requestValues.activity.layoutInflater.inflate(R.layout.dialog_levelup_10, null)
-                if (customView != null) {
-                    customView.findViewById<ImageView>(R.id.healer_icon_view).setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
-                    customView.findViewById<ImageView>(R.id.mage_icon_view).setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
-                    customView.findViewById<ImageView>(R.id.rogue_icon_view).setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
-                    customView.findViewById<ImageView>(R.id.warrior_icon_view).setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
-                }
+            if (requestValues.newLevel == 10L) {
+                val binding = DialogLevelup10Binding.inflate(requestValues.activity.layoutInflater)
+                binding.healerIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
+                binding.mageIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
+                binding.rogueIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
+                binding.warriorIconView.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
 
                 val alert = HabiticaAlertDialog(requestValues.activity)
                 alert.setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
-                alert.setAdditionalContentView(customView)
+                alert.setAdditionalContentView(binding.root)
                 alert.addButton(R.string.select_class, true) { _, _ ->
                     showClassSelection(requestValues)
                 }
@@ -64,7 +62,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))
@@ -75,6 +73,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 alert.addButton(R.string.share, false) { _, _ ->
                     EventBus.getDefault().post(event)
                 }
+                alert.isCelebratory = true
 
                 if (!requestValues.activity.isFinishing) {
                     alert.enqueue()
@@ -87,10 +86,10 @@ 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 {
-        val newLevel: Int = (user.stats?.lvl ?: 0 )
+    class RequestValues(val user: User, val level: Long?, val activity: AppCompatActivity) : UseCase.RequestValues {
+        val newLevel: Long = level ?: 0
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
index e076e92ed..aa30bb7d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
@@ -22,7 +22,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
 import kotlin.math.abs
 
@@ -38,8 +38,8 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh
             val stats = requestValues.user.stats
 
             if (requestValues.hasLeveledUp == true) {
-                return@defer levelUpUseCase.observable(LevelUpUseCase.RequestValues(requestValues.user, requestValues.context))
-                        .flatMap<User> { userRepository.retrieveUser(true) }
+                return@defer levelUpUseCase.observable(LevelUpUseCase.RequestValues(requestValues.user, requestValues.level, requestValues.context))
+                        .flatMap { userRepository.retrieveUser(true) }
                         .map { it.stats }
             } else {
                 val pair = getNotificationAndAddStatsToUser(requestValues.context, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp, requestValues.questDamage, requestValues.user)
@@ -53,7 +53,7 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh
         }
     }
 
-    class RequestValues( val context: AppCompatActivity, val snackbarTargetView: ViewGroup, val user: User?, val xp: Double?, val hp: Double?, val gold: Double?, val mp: Double?, val questDamage: Double?, val hasLeveledUp: Boolean?) : UseCase.RequestValues
+    class RequestValues( val context: AppCompatActivity, val snackbarTargetView: ViewGroup, val user: User?, val xp: Double?, val hp: Double?, val gold: Double?, val mp: Double?, val questDamage: Double?, val hasLeveledUp: Boolean?, val level: Long?) : UseCase.RequestValues
 
     companion object {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
index ee1853576..71c44d2cf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
@@ -123,10 +123,10 @@ class ScoreTaskLocallyInteractor {
             var totalConstitution = levelStat
             var totalPerception = levelStat
 
-            totalStrength += user.stats?.buffs?.getStr()?.toInt() ?: 0
-            totalIntelligence += user.stats?.buffs?.get_int()?.toInt() ?: 0
-            totalConstitution += user.stats?.buffs?.getCon()?.toInt() ?: 0
-            totalPerception += user.stats?.buffs?.getPer()?.toInt() ?: 0
+            totalStrength += user.stats?.buffs?.str?.toInt() ?: 0
+            totalIntelligence += user.stats?.buffs?._int?.toInt() ?: 0
+            totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0
+            totalPerception += user.stats?.buffs?.per?.toInt() ?: 0
 
             totalStrength += user.stats?.strength ?: 0
             totalIntelligence += user.stats?.intelligence ?: 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
index 900ec24ef..9d6efe349 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
@@ -3,25 +3,19 @@ package com.habitrpg.android.habitica.interactors;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 public abstract class UseCase<Q extends UseCase.RequestValues, T> {
 
-    private final ThreadExecutor threadExecutor;
     private final PostExecutionThread postExecutionThread;
 
     protected UseCase(ThreadExecutor threadExecutor,
                       PostExecutionThread postExecutionThread) {
-        this.threadExecutor = threadExecutor;
         this.postExecutionThread = postExecutionThread;
     }
 
-    /**
-     * Builds an {@link rx.Flowable} which will be used when executing the current {@link UseCase}.
-     */
     protected abstract Flowable<T> buildUseCaseObservable(Q requestValues);
 
-    @SuppressWarnings("unchecked")
     public Flowable<T> observable(Q requestValues) {
         return this.buildUseCaseObservable(requestValues)
                 .subscribeOn(postExecutionThread.getScheduler())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java
deleted file mode 100644
index 66a77e762..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-
-import androidx.annotation.Nullable;
-
-import com.habitrpg.android.habitica.models.user.Outfit;
-import com.habitrpg.android.habitica.models.user.Stats;
-
-/**
- * Created by phillip on 29.06.17.
- */
-
-public interface Avatar {
-    @Nullable
-    String getCurrentMount();
-
-    @Nullable
-    String getCurrentPet();
-
-    boolean getSleep();
-
-    @Nullable
-    Stats getStats();
-
-    @Nullable
-    AvatarPreferences getPreferences();
-
-    @Nullable
-    Integer getGemCount();
-
-    @Nullable
-    Integer getHourglassCount();
-
-    @Nullable
-    Outfit getCostume();
-    @Nullable
-    Outfit getEquipped();
-
-    boolean hasClass();
-
-    boolean isValid();
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
new file mode 100644
index 000000000..24e37bd57
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
@@ -0,0 +1,21 @@
+package com.habitrpg.android.habitica.models
+
+import com.habitrpg.android.habitica.models.user.Outfit
+import com.habitrpg.android.habitica.models.user.Stats
+
+/**
+ * Created by phillip on 29.06.17.
+ */
+interface Avatar {
+    val currentMount: String?
+    val currentPet: String?
+    val sleep: Boolean
+    val stats: Stats?
+    val preferences: AvatarPreferences?
+    val gemCount: Int
+    val hourglassCount: Int
+    val costume: Outfit?
+    val equipped: Outfit?
+    fun hasClass(): Boolean
+    fun isValid(): Boolean
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.java
deleted file mode 100644
index 36d4a4e6f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.models.user.Hair;
-
-/**
- * Created by phillip on 15.09.17.
- */
-
-public interface AvatarPreferences {
-
-    String getUserId();
-
-    Hair getHair();
-
-    boolean getCostume();
-
-    boolean getSleep();
-
-    String getShirt();
-
-    String getSkin();
-    String getSize();
-
-    String getBackground();
-
-    String getChair();
-
-    boolean getDisableClasses();
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt
new file mode 100644
index 000000000..e271c00e6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt
@@ -0,0 +1,16 @@
+package com.habitrpg.android.habitica.models
+
+import com.habitrpg.android.habitica.models.user.Hair
+
+interface AvatarPreferences {
+    val userId: String?
+    val hair: Hair?
+    val costume: Boolean
+    val sleep: Boolean
+    val shirt: String?
+    val skin: String?
+    val size: String?
+    val background: String?
+    val chair: String?
+    val disableClasses: Boolean
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/BaseObject.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/BaseObject.kt
new file mode 100644
index 000000000..1442596b7
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/BaseObject.kt
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.models
+
+import io.realm.RealmModel
+
+
+interface BaseObject: RealmModel {
+    val realmClass: Class<out RealmModel>
+    val primaryIdentifier: String?
+    val primaryIdentifierName: String
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java
deleted file mode 100644
index d7004f308..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-/**
- * Created by MagicMicky on 16/03/14.
- */
-public enum HabitRpgClass {
-    rogue,
-    wizard,
-    warrior,
-    healer,
-    base
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
index 95c75dc70..5ccf6e63b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
@@ -13,6 +13,7 @@ class Notification {
         GROUP_TASK_APPROVED("GROUP_TASK_APPROVED"),
         GROUP_TASK_REQUIRES_APPROVAL("GROUP_TASK_REQUIRES_APPROVAL"),
         UNALLOCATED_STATS_POINTS("UNALLOCATED_STATS_POINTS"),
+        WON_CHALLENGE("WON_CHALLENGE"),
 
         //Achievements
         ACHIEVEMENT_PARTY_UP("ACHIEVEMENT_PARTY_UP"),
@@ -26,6 +27,29 @@ class Notification {
         ACHIEVEMENT_GENERIC("ACHIEVEMENT"),
         ACHIEVEMENT_ONBOARDING_COMPLETE("ONBOARDING_COMPLETE"),
 
+        ACHIEVEMENT_ALL_YOUR_BASE("ACHIEVEMENT_ALL_YOUR_BASE"),
+        ACHIEVEMENT_BACK_TO_BASICS("ACHIEVEMENT_BACK_TO_BASICS"),
+        ACHIEVEMENT_JUST_ADD_WATER("ACHIEVEMENT_JUST_ADD_WATER"),
+        ACHIEVEMENT_LOST_MASTERCLASSER("ACHIEVEMENT_LOST_MASTERCLASSER"),
+        ACHIEVEMENT_MIND_OVER_MATTER("ACHIEVEMENT_MIND_OVER_MATTER"),
+        ACHIEVEMENT_DUST_DEVIL("ACHIEVEMENT_DUST_DEVIL"),
+        ACHIEVEMENT_ARID_AUTHORITY("ACHIEVEMENT_ARID_AUTHORITY"),
+        ACHIEVEMENT_MONSTER_MAGUS("ACHIEVEMENT_MONSTER_MAGUS"),
+        ACHIEVEMENT_UNDEAD_UNDERTAKER("ACHIEVEMENT_UNDEAD_UNDERTAKER"),
+        ACHIEVEMENT_PRIMED_FOR_PAINTING("ACHIEVEMENT_PRIMED_FOR_PAINTING"),
+        ACHIEVEMENT_PEARLY_PRO("ACHIEVEMENT_PEARLY_PRO"),
+        ACHIEVEMENT_TICKLED_PINK("ACHIEVEMENT_TICKLED_PINK"),
+        ACHIEVEMENT_ROSY_OUTLOOK("ACHIEVEMENT_ROSY_OUTLOOK"),
+        ACHIEVEMENT_BUG_BONANZA("ACHIEVEMENT_BUG_BONANZA"),
+        ACHIEVEMENT_BARE_NECESSITIES("ACHIEVEMENT_BARE_NECESSITIES"),
+        ACHIEVEMENT_FRESHWATER_FRIENDS("ACHIEVEMENT_FRESHWATER_FRIENDS"),
+        ACHIEVEMENT_GOOD_AS_GOLD("ACHIEVEMENT_GOOD_AS_GOLD"),
+        ACHIEVEMENT_ALL_THAT_GLITTERS("ACHIEVEMENT_ALL_THAT_GLITTERS"),
+        ACHIEVEMENT_BONE_COLLECTOR("ACHIEVEMENT_BONE_COLLECTOR"),
+        ACHIEVEMENT_SKELETON_CREW("ACHIEVEMENT_SKELETON_CREW"),
+        ACHIEVEMENT_SEEING_RED("ACHIEVEMENT_SEEING_RED"),
+        ACHIEVEMENT_RED_LETTER_DAY("ACHIEVEMENT_RED_LETTER_DAY"),
+
         FIRST_DROP("FIRST_DROPS"),
 
         // Custom notification types (created by this app)
@@ -55,6 +79,32 @@ class Notification {
             Type.QUEST_INVITATION.type -> QuestInvitationData::class.java
             Type.FIRST_DROP.type -> FirstDropData::class.java
             Type.ACHIEVEMENT_GENERIC.type -> AchievementData::class.java
+            Type.WON_CHALLENGE.type -> ChallengeWonData::class.java
+
+            Type.ACHIEVEMENT_ALL_YOUR_BASE.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_BACK_TO_BASICS.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_JUST_ADD_WATER.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_LOST_MASTERCLASSER.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_MIND_OVER_MATTER.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_DUST_DEVIL.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_ARID_AUTHORITY.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_MONSTER_MAGUS.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_PEARLY_PRO.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_TICKLED_PINK.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_ROSY_OUTLOOK.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_BUG_BONANZA.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_BARE_NECESSITIES.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_BONE_COLLECTOR.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_SKELETON_CREW.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_SEEING_RED.type -> AchievementData::class.java
+            Type.ACHIEVEMENT_RED_LETTER_DAY.type -> AchievementData::class.java
+            
             else -> null
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java
deleted file mode 100644
index 7b5c1c1a0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-/**
- * Created by keithholliday on 7/5/16.
- */
-public class PushDevice {
-
-    @SerializedName("regId")
-    @Expose
-    private String regId;
-
-    @SerializedName("type")
-    @Expose
-    private String type;
-
-    public String getRegId() {
-        return this.regId;
-    }
-
-    public void setRegId(String regId) {
-        this.regId = regId;
-    }
-
-    public String getType() {
-        return this.type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.kt
new file mode 100644
index 000000000..33a32afe9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.kt
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.models
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class PushDevice {
+    @SerializedName("regId")
+    @Expose
+    var regId: String? = null
+
+    @SerializedName("type")
+    @Expose
+    var type: String? = null
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
index 7601ea69a..845685c7d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
@@ -21,12 +21,11 @@ open class Tag : RealmObject() {
     }
 
 
-    override fun equals(o: Any?): Boolean {
-        if (Tag::class.java.isAssignableFrom(o!!.javaClass)) {
-            val otherTag = o as Tag?
-            return this.id == otherTag!!.id
+    override fun equals(other: Any?): Boolean {
+        if (other is Tag) {
+            return this.id == other.id
         }
-        return super.equals(o)
+        return super.equals(other)
     }
 
     override fun hashCode(): Int {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TeamPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TeamPlan.kt
new file mode 100644
index 000000000..63158fc06
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TeamPlan.kt
@@ -0,0 +1,29 @@
+package com.habitrpg.android.habitica.models
+
+import com.google.gson.annotations.SerializedName
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class TeamPlan : RealmObject() {
+    @PrimaryKey
+    var id: String = ""
+
+    var userID: String? = null
+    var summary: String = ""
+    @SerializedName("leader")
+    var leaderID: String? = null
+    //var managers: RealmList<String> = RealmList()
+    var isActive: Boolean = false
+
+    override fun equals(other: Any?): Boolean {
+        if (other is TeamPlan) {
+            return this.id == other.id
+        }
+        return super.equals(other)
+    }
+
+    override fun hashCode(): Int {
+        return id.hashCode()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
index 5829d6e93..da0fa66e0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
@@ -2,6 +2,5 @@ package com.habitrpg.android.habitica.models
 
 class Transaction {
     var receipt: String? = null
-
     var signature: String? = null
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt
index b797bdca3..aa89325fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt
@@ -1,10 +1,11 @@
 package com.habitrpg.android.habitica.models
 
+import io.realm.RealmModel
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import java.util.*
 
-open class TutorialStep : RealmObject() {
+open class TutorialStep: RealmObject(), BaseObject {
 
     @PrimaryKey
     var key: String? = null
@@ -23,4 +24,11 @@ open class TutorialStep : RealmObject() {
 
     fun shouldDisplay(): Boolean =
             !this.wasCompleted && (this.displayedOn == null || Date().time - (displayedOn?.time ?: 0) > 86400000)
+
+    override val realmClass: Class<out RealmModel>
+        get() = TutorialStep::class.java
+    override val primaryIdentifier: String?
+        get() = key
+    override val primaryIdentifierName: String
+        get() = "key"
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt
index cb99a5444..3cadec4ed 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.models
 
-import com.facebook.internal.Mutable
 import com.habitrpg.android.habitica.models.inventory.QuestProgress
 import com.habitrpg.android.habitica.models.inventory.QuestRageStrike
+import java.util.*
 
 class WorldState {
 
@@ -11,4 +11,8 @@ class WorldState {
     var progress: QuestProgress? = null
     var rageStrikes: MutableList<QuestRageStrike>? = null
 
+    var currentEventKey: String? = null
+    var currentEventPromo: String? = null
+    var currentEventStartDate: Date? = null
+    var currentEventEndDate: Date? = null
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
deleted file mode 100644
index 96c1b7f90..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-public interface Animal {
-
-    String getKey();
-
-    void setKey(String key);
-
-    String getText();
-
-    void setText(String text);
-
-    String getType();
-
-    void setType(String type);
-
-    String getAnimal();
-
-    void setAnimal(String animal);
-
-    String getColor();
-
-    void setColor(String color);
-
-    boolean getPremium();
-
-    void setPremium(boolean premium);
-
-    Integer getNumberOwned();
-
-    void setNumberOwned(Integer numberOwned);
-
-    Integer getTotalNumber();
-
-    void setTotalNumber(Integer totalNumber);
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt
new file mode 100644
index 000000000..47a7e5255
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt
@@ -0,0 +1,12 @@
+package com.habitrpg.android.habitica.models.inventory
+
+interface Animal {
+    var key: String?
+    var text: String?
+    var type: String?
+    var animal: String
+    var color: String
+    var premium: Boolean
+    var numberOwned: Int
+    var totalNumber: Int
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
deleted file mode 100644
index bcb82d9d5..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import java.util.List;
-
-/**
- * Created by viirus on 19/01/16.
- */
-public class CustomizationSet {
-
-    public String text;
-    public String identifier;
-    public Integer price;
-    public boolean hasPurchasable;
-
-    public List<Customization> customizations;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.kt
new file mode 100644
index 000000000..aa4ca8b4a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.kt
@@ -0,0 +1,9 @@
+package com.habitrpg.android.habitica.models.inventory
+
+class CustomizationSet {
+    var text: String? = null
+    var identifier: String? = null
+    var price: Int = 0
+    var hasPurchasable = false
+    var customizations: MutableList<Customization> = mutableListOf()
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
deleted file mode 100644
index 2c41352f2..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Egg extends RealmObject implements Item {
-
-    @PrimaryKey
-    String key;
-    String text, notes;
-    Integer value;
-    String adjective, mountText;
-
-    Integer stableOwned, stableTotal;
-
-    public String getAdjective() {
-        return adjective;
-    }
-
-    public void setAdjective(String adjective) {
-        this.adjective = adjective;
-    }
-
-    public String getMountText() {
-        return mountText;
-    }
-
-    public void setMountText(String mountText) {
-        this.mountText = mountText;
-    }
-
-    public Integer getStableOwned() {
-        if (stableOwned == null) {
-            stableOwned = 0;
-        }
-        return stableOwned;
-    }
-
-    public void setStableOwned(Integer stableOwned) {
-        this.stableOwned = stableOwned;
-    }
-
-    public Integer getStableTotal() {
-        return stableTotal;
-    }
-
-    public void setStableTotal(Integer stableTotal) {
-        this.stableTotal = stableTotal;
-    }
-
-    public String getType() {
-        return "eggs";
-    }
-
-    @Override
-    public String getKey() {
-        return key;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public void setValue(Integer value) {
-        this.value = value;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.kt
new file mode 100644
index 000000000..d237dbc69
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.kt
@@ -0,0 +1,17 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Egg : RealmObject(), Item {
+    @PrimaryKey
+    override var key: String = ""
+    override var text: String = ""
+    var notes: String? = null
+    override var value: Int = 0
+    var adjective: String? = null
+    var mountText: String? = null
+
+    override val type: String
+        get() = "eggs"
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
deleted file mode 100644
index 936adc6b2..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Food extends RealmObject implements Item {
-
-    @PrimaryKey
-    String key;
-    String text, notes;
-    Integer value;
-    String target, article;
-    Boolean canDrop;
-
-    public String getTarget() {
-        return target;
-    }
-
-    public void setTarget(String target) {
-        this.target = target;
-    }
-
-    public String getArticle() {
-        return article;
-    }
-
-    public void setArticle(String article) {
-        this.article = article;
-    }
-
-    public Boolean getCanDrop() {
-        return canDrop;
-    }
-
-    public void setCanDrop(Boolean canDrop) {
-        this.canDrop = canDrop;
-    }
-
-    public String getType() {
-        return "food";
-    }
-
-    @Override
-    public String getKey() {
-        return key;
-    }
-
-    @Override
-    public String getText() {
-        return text;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setValue(Integer value) {
-        this.value = value;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.kt
new file mode 100644
index 000000000..4f5f04cd6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.kt
@@ -0,0 +1,17 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Food : RealmObject(), Item {
+    @PrimaryKey
+    override var key: String = ""
+    override var text: String = ""
+    var notes: String? = null
+    override var value: Int = 0
+    var target: String? = null
+    var article: String? = null
+    var canDrop: Boolean? = null
+    override val type: String
+        get() = "food"
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
deleted file mode 100644
index 4d42ca4cd..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class HatchingPotion extends RealmObject implements Item {
-
-    @PrimaryKey
-    String key;
-    String text, notes;
-    Integer value;
-    Boolean limited, premium;
-
-    public Boolean getLimited() {
-        return limited;
-    }
-
-    public void setLimited(Boolean limited) {
-        this.limited = limited;
-    }
-
-    public Boolean getPremium() {
-        return premium;
-    }
-
-    public void setPremium(Boolean premium) {
-        this.premium = premium;
-    }
-
-    @Override
-    public String getType() {
-        return "hatchingPotions";
-    }
-
-    @Override
-    public String getKey() {
-        return key;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public void setValue(Integer value) {
-        this.value = value;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.kt
new file mode 100644
index 000000000..5257fd502
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.kt
@@ -0,0 +1,16 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class HatchingPotion : RealmObject(), Item {
+    @PrimaryKey
+    override var key: String = ""
+    override var text: String = ""
+    var notes: String? = null
+    override var value: Int = 0
+    var limited: Boolean? = null
+    var premium: Boolean? = null
+    override val type: String
+        get() = "hatchingPotions"
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
deleted file mode 100644
index da0f3e08a..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmModel;
-
-public interface Item extends RealmModel {
-
-    String getType();
-
-    String getKey();
-
-    String getText();
-
-    Integer getValue();
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.kt
new file mode 100644
index 000000000..0e39a4217
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.kt
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmModel
+
+interface Item : RealmModel {
+    val type: String
+    val key: String
+    val text: String
+    val value: Int
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
deleted file mode 100644
index 1fd23de3c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmObject;
-import io.realm.annotations.Ignore;
-import io.realm.annotations.PrimaryKey;
-
-public class Mount extends RealmObject implements Animal {
-
-    @PrimaryKey
-    String key;
-    String animal, color, text, type;
-    boolean premium;
-
-    @Ignore
-    private Integer numberOwned;
-
-    @Ignore
-    private Integer totalNumber;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @Override
-    public String getText() {
-        return text;
-    }
-
-    @Override
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    @Override
-    public String getType() {
-        return type;
-    }
-
-    @Override
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getAnimal() {
-        if (animal == null) {
-            return key.split("-")[0];
-        }
-        return animal;
-    }
-
-    public void setAnimal(String animal) {
-        this.animal = animal;
-    }
-
-    public String getColor() {
-        if (color == null) {
-            return key.split("-")[1];
-        }
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public boolean getPremium() {
-        return premium;
-    }
-
-    public void setPremium(boolean premium) {
-        this.premium = premium;
-    }
-
-    public Integer getNumberOwned() {
-        if (numberOwned == null) {
-            return 0;
-        }
-        return numberOwned;
-    }
-
-    public void setNumberOwned(Integer numberOwned) {
-        this.numberOwned = numberOwned;
-    }
-
-    public Integer getTotalNumber() {
-        if (totalNumber == null) {
-            return 0;
-        }
-        return totalNumber;
-    }
-
-    public void setTotalNumber(Integer totalNumber) {
-        this.totalNumber = totalNumber;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.kt
new file mode 100644
index 000000000..3e4386536
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.kt
@@ -0,0 +1,31 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+
+open class Mount : RealmObject(), Animal {
+    @PrimaryKey
+    override var key: String? = null
+    override var animal: String = ""
+        get() {
+            return if (field.isBlank()) {
+                key?.split("-")?.toTypedArray()?.get(0) ?: ""
+            } else field
+        }
+    override var color: String = ""
+        get() {
+            return if (field.isBlank()) {
+                key?.split("-")?.toTypedArray()?.get(1) ?: ""
+            } else field
+        }
+    override var text: String? = null
+    override var type: String? = null
+    override var premium = false
+
+
+    @Ignore
+    override var numberOwned: Int = 0
+    @Ignore
+    override var totalNumber: Int = 0
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
deleted file mode 100644
index 642c2c1fc..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmObject;
-import io.realm.annotations.Ignore;
-import io.realm.annotations.PrimaryKey;
-
-public class Pet extends RealmObject implements Animal{
-
-    @PrimaryKey
-    String key;
-    String animal, color, text, type;
-    boolean premium;
-
-    @Ignore
-    private Integer numberOwned;
-
-    @Ignore
-    private Integer totalNumber;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @Override
-    public String getText() {
-        return text;
-    }
-
-
-    @Override
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    @Override
-    public String getType() {
-        return type;
-    }
-
-    @Override
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getAnimal() {
-        if (animal == null) {
-            return getKey().split("-")[0];
-        }
-        return animal;
-    }
-
-    public void setAnimal(String animal) {
-        this.animal = animal;
-    }
-
-    public String getColor() {
-        if (color == null) {
-            return getKey().split("-")[1];
-        }
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public boolean getPremium() {
-        return premium;
-    }
-
-    public void setPremium(boolean premium) {
-        this.premium = premium;
-    }
-
-    public Integer getNumberOwned() {
-        if (numberOwned == null) {
-            return 0;
-        }
-        return numberOwned;
-    }
-
-    public void setNumberOwned(Integer numberOwned) {
-        this.numberOwned = numberOwned;
-    }
-
-    public Integer getTotalNumber() {
-        if (totalNumber == null) {
-            return 0;
-        }
-
-        return totalNumber;
-    }
-
-    public void setTotalNumber(Integer totalNumber) {
-        this.totalNumber = totalNumber;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.kt
new file mode 100644
index 000000000..7d2d69566
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.kt
@@ -0,0 +1,30 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+
+open class Pet : RealmObject(), Animal {
+    @PrimaryKey
+    override var key: String? = null
+    override var animal: String = ""
+    get() {
+        return if (field.isBlank()) {
+            key?.split("-")?.toTypedArray()?.get(0) ?: ""
+        } else field
+    }
+    override var color: String = ""
+    get() {
+        return if (field.isBlank()) {
+            key?.split("-")?.toTypedArray()?.get(1) ?: ""
+        } else field
+    }
+    override var text: String? = null
+    override var type: String? = null
+    override var premium = false
+
+    @Ignore
+    override var numberOwned: Int = 0
+    @Ignore
+    override var totalNumber: Int = 0
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt
index ac7a25e30..12394fa6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt
@@ -17,19 +17,19 @@ open class QuestColors : RealmObject() {
     var light: String? = null
     var extralight: String? = null
 
-    var darkColor: Int = 0
+    val darkColor: Int
         get() {
             return Color.parseColor(dark)
         }
-    var mediumColor: Int = 0
+    val mediumColor: Int
         get() {
             return Color.parseColor(medium)
         }
-    var lightColor: Int = 0
+    val lightColor: Int
         get() {
             return Color.parseColor(light)
         }
-    var extraLightColor: Int = 0
+    val extraLightColor: Int
         get() {
             return Color.parseColor(extralight)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
index a5d84d7a6..b2996fe41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
@@ -7,17 +7,17 @@ import io.realm.annotations.PrimaryKey
 open class QuestContent : RealmObject(), Item {
 
     @PrimaryKey
-    internal var key: String = ""
+    override var key: String = ""
     set(value) {
         field = value
         drop?.key = value
         colors?.key = value
         boss?.key = value
     }
-    internal var text: String = ""
+    override var text: String = ""
     var notes: String = ""
     var completion: String = ""
-    internal var value: Int = 0
+    override var value: Int = 0
     var previous: String? = null
     var lvl: Int = 0
     var isCanBuy: Boolean = false
@@ -49,33 +49,8 @@ open class QuestContent : RealmObject(), Item {
     val isBossQuest: Boolean
         get() = this.boss != null
 
-    override fun getType(): String {
-        return "quests"
-    }
-
-    override fun getKey(): String {
-        return key
-    }
-
-    override fun getText(): String {
-        return text
-    }
-
-    override fun getValue(): Int? {
-        return value
-    }
-
-    fun setText(text: String) {
-        this.text = text
-    }
-
-    fun setValue(value: Int) {
-        this.value = value
-    }
-
-    fun setKey(key: String) {
-        this.key = key
-    }
+    override val type: String
+        get() =  "quests"
 
     fun getCollectWithKey(key: String): QuestCollect? {
         for (collect in this.collect ?: emptyList<QuestCollect>()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.java
deleted file mode 100644
index f50a5155f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-/**
- * Created by phillip on 25.07.17.
- */
-
-public class QuestDropItem extends RealmObject {
-
-    @PrimaryKey
-    private String combinedKey;
-    private String questKey;
-    private String key;
-    private String type;
-    private String text;
-    private boolean onlyOwner;
-    private int count;
-
-    public QuestDropItem() {
-        super();
-    }
-
-    public String getCombinedKey() {
-        return combinedKey;
-    }
-
-    public void setCombinedKey(String combinedKey) {
-        this.combinedKey = combinedKey;
-    }
-
-    public String getQuestKey() {
-        return questKey;
-    }
-
-    public void setQuestKey(String questKey) {
-        this.questKey = questKey;
-        combinedKey = questKey+key;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-        combinedKey = questKey+key;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
-
-    public String getImageName() {
-        if ("quests".equals(type)) {
-            return "inventory_quest_scroll_"+key;
-        } else if ("eggs".equals(type)) {
-            return "Pet_Egg_" + getKey();
-        } else
-        if ("food".equals(type)) {
-            return "Pet_Food_" + getKey();
-        } else
-        if ("hatchingPotions".equals(type)) {
-            return "Pet_HatchingPotion_" + getKey();
-        }
-        return "shop_"+key;
-    }
-
-    public boolean isOnlyOwner() {
-        return onlyOwner;
-    }
-
-    public void setOnlyOwner(boolean onlyOwner) {
-        this.onlyOwner = onlyOwner;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.kt
new file mode 100644
index 000000000..0efd92ee9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.kt
@@ -0,0 +1,35 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+/**
+ * Created by phillip on 25.07.17.
+ */
+open class QuestDropItem : RealmObject() {
+    @PrimaryKey
+    var combinedKey: String? = null
+    var questKey: String? = null
+    set(value) {
+        field = value
+        combinedKey = value + key
+    }
+    var key: String = ""
+    set(value) {
+        field = value
+        combinedKey = questKey + value
+    }
+    var type: String? = null
+    var text: String? = null
+    var isOnlyOwner = false
+    var count = 0
+
+    val imageName: String
+        get() = when (type) {
+                "quests" -> "inventory_quest_scroll_$key"
+                "eggs" -> "Pet_Egg_$key"
+                "food" -> "Pet_Food_$key"
+                "hatchingPotions" -> "Pet_HatchingPotion_$key"
+                else -> "shop_$key"
+            }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDrops.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDrops.java
deleted file mode 100644
index f76dc7c18..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDrops.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmList;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-/**
- * Created by phillip on 25.07.17.
- */
-
-public class QuestDrops extends RealmObject {
-
-    @PrimaryKey
-    private String key;
-    public int gp;
-    public int exp;
-    public String unlock;
-    private RealmList<QuestDropItem> items;
-
-    public QuestDrops() {
-        super();
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-
-        if (items != null) {
-            for (QuestDropItem item : items) {
-                item.setQuestKey(key);
-            }
-        }
-    }
-
-
-    public RealmList<QuestDropItem> getItems() {
-        return items;
-    }
-
-    public void setItems(RealmList<QuestDropItem> items) {
-        this.items = items;
-
-        if (items != null) {
-            for (QuestDropItem item : items) {
-                item.setQuestKey(key);
-            }
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDrops.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDrops.kt
new file mode 100644
index 000000000..e4b5ae7ea
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDrops.kt
@@ -0,0 +1,25 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+/**
+ * Created by phillip on 25.07.17.
+ */
+open class QuestDrops : RealmObject() {
+    @PrimaryKey
+    var key: String? = null
+    set(value) {
+        field = value
+        items?.forEach { it.questKey = key }
+    }
+    var gp = 0
+    var exp = 0
+    var unlock: String? = null
+    var items: RealmList<QuestDropItem>? = null
+    set(value) {
+        field = value
+        items?.forEach { it.questKey = key }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt
index eed63d322..8ab4e1d8e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt
@@ -11,6 +11,7 @@ open class QuestProgress : RealmObject() {
     var key: String? = null
     var hp: Double = 0.0
     var rage: Double = 0.0
+    var collectedItems: Int = 0
     var collect: RealmList<QuestProgressCollect>? = null
     var down: Float = 0.0f
     var up: Float = 0.0f
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.kt
index dcee52123..bcaf614a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.kt
@@ -7,30 +7,16 @@ import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
 open class SpecialItem : RealmObject(), Item {
+    override val type: String
+        get() = "special"
 
     @PrimaryKey
-    internal var key: String = ""
-    internal var text: String = ""
+    override var key: String = ""
+    override var text: String = ""
     internal var notes: String = ""
-    internal var value: Int? = null
+    override var value: Int = 0
     var isMysteryItem: Boolean = false
 
-    override fun getType(): String {
-        return "special"
-    }
-
-    override fun getKey(): String {
-        return key
-    }
-
-    override fun getText(): String {
-        return text
-    }
-
-    override fun getValue(): Int? {
-        return value
-    }
-
     companion object {
 
         fun makeMysteryItem(context: Context): SpecialItem {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
index 4a80be93c..f59028103 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
@@ -10,7 +10,6 @@ import io.realm.annotations.PrimaryKey
 
 open class Member : RealmObject(), Avatar {
 
-
     @PrimaryKey
     @SerializedName("_id")
     var id: String? = null
@@ -27,7 +26,7 @@ open class Member : RealmObject(), Avatar {
                 this.inbox?.userId = subID
             }
             if (preferences != null && preferences?.isManaged != true) {
-                preferences?.setUserId(subID)
+                preferences?.userId = subID
             }
             if (this.profile != null && this.profile?.isManaged != true) {
                 this.profile?.userId = subID
@@ -45,7 +44,13 @@ open class Member : RealmObject(), Avatar {
                 this.authentication?.userId = subID
             }
         }
-    private var stats: Stats? = null
+    override var stats: Stats? = null
+        set(value) {
+            field = value
+            if (value != null && this.id != null && !value.isManaged) {
+                field?.userId = this.id
+            }
+        }
     var inbox: Inbox? = null
         set(inbox) {
             field = inbox
@@ -53,7 +58,17 @@ open class Member : RealmObject(), Avatar {
                 inbox.userId = this.id
             }
         }
-    private var preferences: MemberPreferences? = null
+    override var preferences: MemberPreferences? = null
+        set(value) {
+            field = value
+            if (value != null && this.id != null && !value.isManaged) {
+                field?.userId = this.id
+            }
+        }
+    override val gemCount: Int
+        get() = 0
+    override val hourglassCount: Int
+        get() = 0
     var profile: Profile? = null
         set(profile) {
             field = profile
@@ -96,11 +111,23 @@ open class Member : RealmObject(), Avatar {
                 items.userId = this.id
             }
         }
-    private var costume: Outfit? = null
-    private var equipped: Outfit? = null
+    override var costume: Outfit? = null
+    set(value) {
+        field = value
+        if (value != null && this.id != null) {
+            field?.userId = this.id + "costume"
+        }
+    }
+    override var equipped: Outfit? = null
+    set(value) {
+        field = value
+        if (value != null && this.id != null) {
+            field?.userId = this.id + "equipped"
+        }
+    }
 
-    private var currentMount: String? = null
-    private var currentPet: String? = null
+    override var currentMount: String? = null
+    override var currentPet: String? = null
 
     var participatesInQuest: Boolean? = null
     var loginIncentives: Int = 0
@@ -120,79 +147,10 @@ open class Member : RealmObject(), Avatar {
     val formattedUsername: String?
         get() = if (username != null) "@$username" else null
 
-    override fun getPreferences(): MemberPreferences? {
-        return preferences
-    }
-
-    fun setPreferences(preferences: MemberPreferences?) {
-        this.preferences = preferences
-        if (preferences != null && this.id != null && !preferences.isManaged) {
-            preferences.setUserId(this.id ?: "")
-        }
-    }
-
-    override fun getStats(): Stats? {
-        return stats
-    }
-
-    fun setStats(stats: Stats?) {
-        this.stats = stats
-        if (stats != null && this.id != null && !stats.isManaged) {
-            stats.userId = this.id
-        }
-    }
-
-    override fun getGemCount(): Int? {
-        return 0
-    }
-
-    override fun getHourglassCount(): Int? {
-        return 0
-    }
-
-    override fun getCostume(): Outfit? {
-        return costume
-    }
-
-    fun setCostume(costume: Outfit?) {
-        this.costume = costume
-        if (costume != null && this.id != null) {
-            costume.userId = this.id + "costume"
-        }
-    }
-
-    override fun getEquipped(): Outfit? {
-        return equipped
-    }
-
     override fun hasClass(): Boolean {
         return preferences?.disableClasses == false && stats?.habitClass?.isNotEmpty() == true
     }
 
-    fun setEquipped(equipped: Outfit?) {
-        this.equipped = equipped
-        if (equipped != null && this.id != null) {
-            equipped.userId = this.id + "equipped"
-        }
-    }
-
-    override fun getCurrentMount(): String? {
-        return currentMount
-    }
-
-    fun setCurrentMount(currentMount: String) {
-        this.currentMount = currentMount
-    }
-
-    override fun getCurrentPet(): String? {
-        return currentPet
-    }
-
-    fun setCurrentPet(currentPet: String) {
-        this.currentPet = currentPet
-    }
-
-    override fun getSleep(): Boolean {
-        return getPreferences()?.sleep ?: false
-    }
+    override val sleep: Boolean
+        get() = preferences?.sleep ?: false
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
index 011d2a9c8..d764ba74e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
@@ -10,104 +10,31 @@ import io.realm.annotations.PrimaryKey
 open class MemberPreferences : RealmObject(), AvatarPreferences {
 
     @PrimaryKey
-    private var userId: String? = null
-
-    private var hair: Hair? = null
-    private var costume: Boolean = false
-    private var disableClasses: Boolean = false
-    private var sleep: Boolean = false
-    private var shirt: String? = null
-    private var skin: String? = null
-    private var size: String? = null
-    private var background: String? = null
-    private var chair: String? = null
-
-    fun setUserId(userId: String) {
-        this.userId = userId
-        if (hair != null && !hair!!.isManaged) {
-            hair!!.userId = userId
+    override var userId: String? = null
+    set(value) {
+        field = value
+        if (hair?.isManaged != true) {
+            hair?.userId = userId
         }
     }
 
-    override fun getUserId(): String? {
-        return userId
-    }
-
-    override fun getHair(): Hair? {
-        return hair
-    }
-
-    fun setHair(hair: Hair) {
-        this.hair = hair
-    }
-
-    override fun getCostume(): Boolean {
-        return costume
-    }
-
-    fun setCostume(costume: Boolean) {
-        this.costume = costume
-    }
-
-    override fun getDisableClasses(): Boolean {
-        return disableClasses
-    }
-
-    fun setDisableClasses(disableClasses: Boolean) {
-        this.disableClasses = disableClasses
-    }
-
-    override fun getSleep(): Boolean {
-        return sleep
-    }
-
-    fun setSleep(sleep: Boolean) {
-        this.sleep = sleep
-    }
-
-    override fun getShirt(): String? {
-        return shirt
-    }
-
-    fun setShirt(shirt: String) {
-        this.shirt = shirt
-    }
-
-    override fun getSkin(): String? {
-        return skin
-    }
-
-    fun setSkin(skin: String) {
-        this.skin = skin
-    }
-
-    override fun getSize(): String? {
-        return size
-    }
-
-    fun setSize(size: String) {
-        this.size = size
-    }
-
-    override fun getBackground(): String? {
-        return background
-    }
-
-    fun setBackground(background: String) {
-        this.background = background
-    }
-
-    override fun getChair(): String? {
-        return if (chair != null && chair != "none") {
-            if (chair!!.length > 5 && chair!!.substring(0, 6) != "chair_") {
-                chair
+    override var hair: Hair? = null
+    override var costume: Boolean = false
+    override var disableClasses: Boolean = false
+    override var sleep: Boolean = false
+    override var shirt: String? = null
+    override var skin: String? = null
+    override var size: String? = null
+    override var background: String? = null
+    override var chair: String? = null
+    get() {
+        return if (field != null && field != "none") {
+            if (field!!.length > 5 && field?.substring(0, 6) != "chair_") {
+                field
             } else {
-                "chair_" + chair!!
+                "chair_$field"
             }
         } else null
     }
 
-    fun setChair(chair: String) {
-        this.chair = chair
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/AchievementData.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/AchievementData.kt
index 17f66cceb..3fe34cd06 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/AchievementData.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/AchievementData.kt
@@ -3,5 +3,6 @@ package com.habitrpg.android.habitica.models.notifications
 open class AchievementData : NotificationData {
 
     var achievement: String? = null
-
+    var message: String? = null
+    var modalText: String? = null
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/ChallengeWonData.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/ChallengeWonData.kt
new file mode 100644
index 000000000..c4af06165
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/ChallengeWonData.kt
@@ -0,0 +1,6 @@
+package com.habitrpg.android.habitica.models.notifications
+
+open class ChallengeWonData : NotificationData {
+    var name: String? = null
+    var prize: Int? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java
deleted file mode 100644
index e44e08293..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.habitrpg.android.habitica.models.notifications;
-
-/**
- * Created by krh12 on 12/1/2016.
- */
-
-public class Reward {
-    public String key;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.kt
new file mode 100644
index 000000000..165d46669
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.kt
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica.models.notifications
+
+class Reward {
+    var key: String? = null
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
index 59987f68f..72eac86e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
@@ -9,6 +9,7 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
 import com.habitrpg.android.habitica.extensions.DateUtils
 import com.habitrpg.android.habitica.helpers.MainNavigationController
@@ -18,15 +19,13 @@ import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
 import java.text.SimpleDateFormat
 import java.util.*
 
-class FallExtraGemsHabiticaPromotion: HabiticaPromotion() {
+class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : HabiticaPromotion() {
     override val identifier: String
         get() = "fall_extra_gems"
     override val promoType: PromoType
         get() = PromoType.GEMS_AMOUNT
-    override val startDate: Date
-        get() = DateUtils.createDate(2020, 9, 22)
-    override val endDate: Date
-        get() = DateUtils.createDate(2020, 9, 30)
+    override val startDate: Date = startDate ?: DateUtils.createDate(2020, 8, 22)
+    override val endDate: Date = endDate ?: DateUtils.createDate(2020, 8, 30)
 
     override fun pillBackgroundDrawable(context: Context): Drawable {
         return ContextCompat.getDrawable(context, R.drawable.fall_promo_pill_bg) ?: ShapeDrawable()
@@ -59,7 +58,7 @@ class FallExtraGemsHabiticaPromotion: HabiticaPromotion() {
                 ContextCompat.getDrawable(context, R.drawable.fall_promo_menu_right)
         )
 
-        view.binding.button.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_1)
+        view.binding.button.backgroundTintList = ContextCompat.getColorStateList(context, R.color.gray_1)
         view.binding.button.setText(R.string.learn_more)
         view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.white))
         view.binding.button.setOnClickListener {
@@ -85,6 +84,9 @@ class FallExtraGemsHabiticaPromotion: HabiticaPromotion() {
         binding.promoBannerDurationView.setTextColor(Color.parseColor("#FEE2B6"))
     }
 
+    override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
+    }
+
     override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
@@ -95,13 +97,15 @@ class FallExtraGemsHabiticaPromotion: HabiticaPromotion() {
                 ContextCompat.getColor(context, R.color.green_50),
                 ContextCompat.getColor(context, R.color.brand_300)
         ).shuffled()
-        binding.amountBackground.background = BitmapDrawable(context.resources,
+        val drawable = BitmapDrawable(context.resources,
                 HabiticaIconsHelper.imageOfFallGemPromoBG(
                         colors[0],
                         colors[1],
                         colors[2],
                         colors[3]
                 ))
+        binding.amountBackgroundLeft.background = drawable
+        binding.amountBackgroundRight.background = drawable
         binding.gemAmount.setTextColor(Color.parseColor("#FEE2B6"))
         binding.gemsTextView.setTextColor(Color.parseColor("#FEE2B6"))
         binding.footerTextView.visibility = View.VISIBLE
@@ -117,25 +121,26 @@ class FallExtraGemsHabiticaPromotion: HabiticaPromotion() {
 
     override fun configureInfoFragment(fragment: PromoInfoFragment) {
         val context = fragment.context ?: return
-        fragment.binding.promoBanner.background = promoBackgroundDrawable(context)
-        fragment.binding.promoBannerLeftImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.fall_promo_info_left))
-        fragment.binding.promoBannerRightImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.fall_promo_info_right))
-        fragment.binding.promoBannerTitleImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.fall_promo_title))
-        fragment.binding.promoBannerSubtitleView.setText(R.string.limited_event)
-        fragment.binding.promoBannerDurationView.setTextColor(Color.parseColor("#FEE2B6"))
+        fragment.binding?.promoBanner?.background = promoBackgroundDrawable(context)
+        fragment.binding?.promoBannerLeftImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.fall_promo_info_left))
+        fragment.binding?.promoBannerRightImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.fall_promo_info_right))
+        fragment.binding?.promoBannerTitleImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.fall_promo_title))
+        fragment.binding?.promoBannerSubtitleView?.setText(R.string.limited_event)
+        fragment.binding?.promoBannerDurationView?.setTextColor(Color.parseColor("#FEE2B6"))
         val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
-        fragment.binding.promoBannerDurationView.text = context.getString(R.string.x_to_y,
+        fragment.binding?.promoBannerDurationView?.text = context.getString(R.string.x_to_y,
                 formatter.format(startDate),
                 formatter.format(endDate))
-        fragment.binding.promoBannerDurationView.setTextColor(ContextCompat.getColor(context, R.color.white))
-        fragment.binding.promptText.setText(R.string.fall_promo_info_prompt)
-        fragment.binding.promptText.setTextColor(Color.parseColor("#F78E2F"))
-        fragment.binding.promptButton.background = buttonDrawable(context)
-        fragment.binding.promptButton.setText(R.string.view_gem_bundles)
-        fragment.binding.promptButton.setTextColor(ContextCompat.getColor(context, R.color.white))
-        fragment.binding.promptButton.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
+        fragment.binding?.promoBannerDurationView?.setTextColor(ContextCompat.getColor(context, R.color.white))
+        fragment.binding?.promptText?.setText(R.string.fall_promo_info_prompt)
+        fragment.binding?.promptText?.setTextColor(Color.parseColor("#F78E2F"))
+        fragment.binding?.promptButton?.background = buttonDrawable(context)
+        fragment.binding?.promptButton?.setText(R.string.view_gem_bundles)
+        fragment.binding?.promptButton?.setTextColor(ContextCompat.getColor(context, R.color.white))
+        fragment.binding?.promptButton?.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
 
-        fragment.binding.instructionDescriptionView.setText(R.string.fall_promo_info_instructions)
-        fragment.binding.limitationsDescriptionView.setText(R.string.fall_promo_info_limitations)
+        fragment.binding?.instructionDescriptionView?.text = context.getString(R.string.fall_promo_info_instructions, formatter.format(startDate), formatter.format(endDate))
+        val limitationsFormatter = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG)
+        fragment.binding?.limitationsDescriptionView?.text = context.getString(R.string.gems_promo_info_limitations, limitationsFormatter.format(startDate), limitationsFormatter.format(endDate))
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt
new file mode 100644
index 000000000..997ce0335
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt
@@ -0,0 +1,133 @@
+package com.habitrpg.android.habitica.models.promotions
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.ShapeDrawable
+import android.view.View
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
+import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
+import com.habitrpg.android.habitica.extensions.DateUtils
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
+import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
+import java.text.SimpleDateFormat
+import java.util.*
+
+class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : HabiticaPromotion() {
+    override val identifier: String
+        get() = "g1g1"
+    override val promoType: PromoType
+        get() = PromoType.SUBSCRIPTION
+    override val startDate: Date = startDate ?: DateUtils.createDate(2020, 11, 17)
+    override val endDate: Date = endDate ?: DateUtils.createDate(2021, 0, 7)
+
+    override fun pillBackgroundDrawable(context: Context): Drawable {
+        return ContextCompat.getDrawable(context, R.drawable.g1g1_promo_pill_bg) ?: ShapeDrawable()
+    }
+
+    override fun backgroundColor(context: Context): Int {
+        return ContextCompat.getColor(context, R.color.gray_10)
+    }
+
+    override fun promoBackgroundDrawable(context: Context): Drawable {
+        return ContextCompat.getDrawable(context, R.drawable.g1g1_promo_background)
+                ?: ShapeDrawable()
+    }
+
+    override fun buttonDrawable(context: Context): Drawable {
+        return ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
+                ?: ShapeDrawable()
+    }
+
+    override fun configurePromoMenuView(view: PromoMenuView) {
+        val context = view.context
+        view.background = ContextCompat.getDrawable(context, R.drawable.g1g1_menu_background)
+        view.setTitleText(context.getString(R.string.promo_g1g1_prompt))
+        view.setSubtitleText(context.getString(R.string.promo_g1g1_description))
+
+        view.setDecoration(
+                ContextCompat.getDrawable(context, R.drawable.g1g1_promo_menu_left),
+                ContextCompat.getDrawable(context, R.drawable.g1g1_promo_menu_right)
+        )
+
+        view.binding.button.backgroundTintList = ContextCompat.getColorStateList(context, R.color.content_background)
+        view.binding.button.setText(R.string.learn_more)
+        if (context.isUsingNightModeResources()) {
+            view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.teal_100))
+        } else {
+            view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.teal_10))
+        }
+        view.binding.button.setOnClickListener {
+            menuOnNavigation(context)
+        }
+    }
+
+    override fun menuOnNavigation(context: Context) {
+        MainNavigationController.navigate(R.id.promoInfoFragment)
+    }
+
+    override fun configurePurchaseBanner(binding: FragmentGemPurchaseBinding) {
+        val context = binding.root.context
+        binding.promoBanner.visibility = View.VISIBLE
+        binding.promoBanner.background = promoBackgroundDrawable(context)
+        binding.promoBannerLeftImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_left_small))
+        binding.promoBannerRightImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_right_small))
+        binding.promoBannerTitleImage.visibility = View.GONE
+        binding.promoBannerDurationView.visibility = View.GONE
+        binding.promoBannerTitleText.visibility = View.VISIBLE
+        val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
+        binding.promoBannerTitleText.text = context.getString(R.string.gift_one_get_one_purchase_banner, formatter.format(endDate))
+    }
+
+    override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
+        val context = binding.root.context
+        binding.promoBanner.visibility = View.VISIBLE
+        binding.promoBanner.background = promoBackgroundDrawable(context)
+        binding.promoBannerLeftImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_left_small))
+        binding.promoBannerRightImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_right_small))
+        binding.promoBannerTitleImage.visibility = View.GONE
+        binding.promoBannerDurationView.visibility = View.GONE
+        binding.promoBannerTitleText.visibility = View.VISIBLE
+        val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
+        binding.promoBannerTitleText.text = context.getString(R.string.gift_one_get_one_purchase_banner, formatter.format(endDate))
+    }
+
+    override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
+    }
+
+    override fun configureInfoFragment(fragment: PromoInfoFragment) {
+        val context = fragment.context ?: return
+        fragment.binding?.promoBanner?.background = promoBackgroundDrawable(context)
+        fragment.binding?.promoBannerLeftImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_left))
+        fragment.binding?.promoBannerRightImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_right))
+        fragment.binding?.promoBannerTitleImage?.visibility = View.GONE
+        fragment.binding?.promoBannerTitleText?.visibility = View.VISIBLE
+        fragment.binding?.promoBannerTitleText?.text = context.getString(R.string.gift_one_get_one)
+        fragment.binding?.promoBannerSubtitleView?.setText(R.string.limited_event)
+        val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
+        fragment.binding?.promoBannerDurationView?.text = context.getString(R.string.x_to_y,
+                formatter.format(startDate),
+                formatter.format(endDate))
+        fragment.binding?.promoBannerDurationView?.setTextColor(ContextCompat.getColor(context, R.color.white))
+        fragment.binding?.promptText?.setText(R.string.g1g1_promo_info_prompt)
+        fragment.binding?.promptText?.setTextColor(ContextCompat.getColor(context, R.color.text_teal))
+        fragment.binding?.promptButton?.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_400)
+        fragment.binding?.promptButton?.setText(R.string.gift_a_subscription)
+        fragment.binding?.promptButton?.setTextColor(ContextCompat.getColor(context, R.color.white))
+        fragment.binding?.promptButton?.setOnClickListener {
+            fragment.context?.let { context -> SubscriptionFragment.showGiftSubscriptionDialog(context, true) }
+        }
+
+        fragment.binding?.instructionDescriptionView?.text = context.getString(R.string.g1g1_promo_info_instructions)
+        val limitationsFormatter = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG)
+        fragment.binding?.limitationsDescriptionView?.text = context.getString(R.string.g1g1_promo_info_limitations, limitationsFormatter.format(startDate), limitationsFormatter.format(endDate))
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
index 79d60e96e..6361537b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.models.promotions
 import android.content.Context
 import android.graphics.drawable.Drawable
 import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
 import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
@@ -31,15 +32,17 @@ abstract class HabiticaPromotion {
     abstract fun menuOnNavigation(context: Context)
 
     abstract fun configurePurchaseBanner(binding: FragmentGemPurchaseBinding)
+    abstract fun configurePurchaseBanner(binding: FragmentSubscriptionBinding)
 
     abstract fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int)
     abstract fun configureInfoFragment(fragment: PromoInfoFragment)
 }
 
-fun getHabiticaPromotionFromKey(key: String): HabiticaPromotion? {
+fun getHabiticaPromotionFromKey(key: String, startDate: Date?, endDate: Date?): HabiticaPromotion? {
     return when (key) {
-        "fall_extra_gems" -> FallExtraGemsHabiticaPromotion()
-        "spooky_extra_gems" -> SpookyExtraGemsHabiticaPromotion()
+        "fall_extra_gems", "fall2020", "testFall2020" -> FallExtraGemsHabiticaPromotion(startDate, endDate)
+        "spooky_extra_gems", "fall2020SecondPromo", "spooky2020" -> SpookyExtraGemsHabiticaPromotion(startDate, endDate)
+        "g1g1" -> GiftOneGetOneHabiticaPromotion(startDate, endDate)
         else -> null
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
similarity index 63%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
index b5b514d83..c37289e1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
@@ -9,6 +9,7 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
 import com.habitrpg.android.habitica.extensions.DateUtils
 import com.habitrpg.android.habitica.helpers.MainNavigationController
@@ -18,26 +19,24 @@ import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
 import java.text.SimpleDateFormat
 import java.util.*
 
-class SpookyExtraGemsHabiticaPromotion: HabiticaPromotion() {
+class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : HabiticaPromotion() {
     override val identifier: String
         get() = "spooky_extra_gems"
     override val promoType: PromoType
         get() = PromoType.GEMS_AMOUNT
-    override val startDate: Date
-        get() = DateUtils.createDate(2020, 10, 29)
-    override val endDate: Date
-        get() = DateUtils.createDate(2020, 11, 2)
+    override val startDate: Date = startDate ?: DateUtils.createDate(2020, 9, 29)
+    override val endDate: Date = endDate ?: DateUtils.createDate(2020, 10, 2)
 
     override fun pillBackgroundDrawable(context: Context): Drawable {
         return ContextCompat.getDrawable(context, R.drawable.spooky_promo_pill_bg) ?: ShapeDrawable()
     }
 
     override fun backgroundColor(context: Context): Int {
-        return ContextCompat.getColor(context, R.color.gray_1)
+        return ContextCompat.getColor(context, R.color.gray_10)
     }
 
     override fun promoBackgroundDrawable(context: Context): Drawable {
-        return ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_1)
+        return ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_10)
                 ?: ShapeDrawable()
     }
 
@@ -59,7 +58,7 @@ class SpookyExtraGemsHabiticaPromotion: HabiticaPromotion() {
                 ContextCompat.getDrawable(context, R.drawable.spooky_promo_menu_right)
         )
 
-        view.binding.button.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_10)
+        view.binding.button.backgroundTintList = ContextCompat.getColorStateList(context, R.color.gray_1)
         view.binding.button.setText(R.string.learn_more)
         view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.white))
         view.binding.button.setOnClickListener {
@@ -85,12 +84,17 @@ class SpookyExtraGemsHabiticaPromotion: HabiticaPromotion() {
         binding.promoBannerDurationView.setTextColor(ContextCompat.getColor(context, R.color.white))
     }
 
+    override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
+    }
+
     override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
-        binding.amountBackground.background = BitmapDrawable(context.resources,
+        val drawable = BitmapDrawable(context.resources,
                 HabiticaIconsHelper.imageOfSpookyGemPromoBG())
+        binding.amountBackgroundLeft.background = drawable
+        binding.amountBackgroundRight.background = drawable
         binding.gemAmount.setTextColor(Color.parseColor("#FEE2B6"))
         binding.gemsTextView.setTextColor(Color.parseColor("#FEE2B6"))
         binding.footerTextView.visibility = View.VISIBLE
@@ -106,25 +110,25 @@ class SpookyExtraGemsHabiticaPromotion: HabiticaPromotion() {
 
     override fun configureInfoFragment(fragment: PromoInfoFragment) {
         val context = fragment.context ?: return
-        fragment.binding.promoBanner.background = promoBackgroundDrawable(context)
-        fragment.binding.promoBannerLeftImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_info_left))
-        fragment.binding.promoBannerRightImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_info_right))
-        fragment.binding.promoBannerTitleImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_title))
-        fragment.binding.promoBannerSubtitleView.setText(R.string.limited_event)
-        fragment.binding.promoBannerDurationView.setTextColor(ContextCompat.getColor(context, R.color.white))
+        fragment.binding?.promoBanner?.background = promoBackgroundDrawable(context)
+        fragment.binding?.promoBannerLeftImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_info_left))
+        fragment.binding?.promoBannerRightImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_info_right))
+        fragment.binding?.promoBannerTitleImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_title))
+        fragment.binding?.promoBannerSubtitleView?.setText(R.string.limited_event)
+        fragment.binding?.promoBannerDurationView?.setTextColor(ContextCompat.getColor(context, R.color.white))
         val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
-        fragment.binding.promoBannerDurationView.text = context.getString(R.string.x_to_y,
+        fragment.binding?.promoBannerDurationView?.text = context.getString(R.string.x_to_y,
                 formatter.format(startDate),
                 formatter.format(endDate))
-        fragment.binding.promoBannerDurationView.setTextColor(ContextCompat.getColor(context, R.color.white))
-        fragment.binding.promptText.setText(R.string.spooky_promo_info_prompt)
-        fragment.binding.promptText.setTextColor(ContextCompat.getColor(context, R.color.orange_50))
-        fragment.binding.promptButton.background = buttonDrawable(context)
-        fragment.binding.promptButton.setText(R.string.view_gem_bundles)
-        fragment.binding.promptButton.setTextColor(ContextCompat.getColor(context, R.color.white))
-        fragment.binding.promptButton.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
+        fragment.binding?.promoBannerDurationView?.setTextColor(ContextCompat.getColor(context, R.color.white))
+        fragment.binding?.promptText?.setText(R.string.spooky_promo_info_prompt)
+        fragment.binding?.promptText?.setTextColor(ContextCompat.getColor(context, R.color.orange_50))
+        fragment.binding?.promptButton?.background = buttonDrawable(context)
+        fragment.binding?.promptButton?.setText(R.string.view_gem_bundles)
+        fragment.binding?.promptButton?.setTextColor(ContextCompat.getColor(context, R.color.white))
+        fragment.binding?.promptButton?.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
 
-        fragment.binding.instructionDescriptionView.setText(R.string.spooky_promo_info_instructions)
-        fragment.binding.limitationsDescriptionView.setText(R.string.spooky_promo_info_limitations)
-    }
+        fragment.binding?.instructionDescriptionView?.text = context.getString(R.string.spooky_promo_info_instructions, formatter.format(startDate), formatter.format(endDate))
+        val limitationsFormatter = SimpleDateFormat.getDateTimeInstance()
+        fragment.binding?.limitationsDescriptionView?.text = context.getString(R.string.gems_promo_info_limitations, limitationsFormatter.format(startDate), limitationsFormatter.format(endDate))    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BulkTaskScoringData.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BulkTaskScoringData.kt
new file mode 100644
index 000000000..425b8dfcc
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BulkTaskScoringData.kt
@@ -0,0 +1,28 @@
+package com.habitrpg.android.habitica.models.responses
+
+import com.google.gson.annotations.SerializedName
+import com.habitrpg.android.habitica.models.user.Buffs
+import com.habitrpg.android.habitica.models.user.Training
+
+class BulkTaskScoringData {
+    @SerializedName("con")
+    var constitution: Int? = null
+    @SerializedName("str")
+    var strength: Int? = null
+    @SerializedName("per")
+    var per: Int? = null
+    @SerializedName("int")
+    var intelligence: Int? = null
+    var training: Training? = null
+    var buffs: Buffs? = null
+    var points: Int? = null
+    var lvl: Int? = null
+    @SerializedName("class")
+    var habitClass: String? = null
+    var gp: Double? = null
+    var exp: Double? = null
+    var mp: Double? = null
+    var hp: Double? = null
+
+    var tasks: List<TaskDirectionData> = listOf()
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.kt
index 42f4e3e7c..3d31263ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.kt
@@ -9,6 +9,7 @@ class TaskDirectionDataTemp {
 
 class TaskDirectionDataQuest {
     var progressDelta: Double = 0.0
+    var collection: Int = 0
 }
 
 class TaskDirectionDataDrop {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.kt
index bd20eb9b1..5aee0d490 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.kt
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.models.responses
 
-class TaskScoringResult {
+class TaskScoringResult() {
 
     var drop: TaskDirectionDataDrop? = null
     var experienceDelta: Double? = null
@@ -8,5 +8,7 @@ class TaskScoringResult {
     var goldDelta: Double? = null
     var manaDelta: Double? = null
     var hasLeveledUp: Boolean = false
+    var level: Long? = null
     var questDamage: Double? = null
+    var questItemsFound: Int? = null
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index 5e7fa29f4..afc20a4dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -57,7 +57,7 @@ open class ShopItem : RealmObject() {
     var level: Int? = null
 
     val isTypeItem: Boolean
-        get() = "eggs" == purchaseType || "hatchingPotions" == purchaseType || "food" == purchaseType || "armoire" == purchaseType || "potion" == purchaseType || "debuffPotion" == purchaseType
+        get() = "eggs" == purchaseType || "hatchingPotions" == purchaseType || "food" == purchaseType || "armoire" == purchaseType || "potion" == purchaseType || "debuffPotion" == purchaseType || "fortify" == purchaseType
 
     val isTypeQuest: Boolean
         get() = "quests" == purchaseType
@@ -69,13 +69,11 @@ open class ShopItem : RealmObject() {
         get() = "pets" == purchaseType || "mounts" == purchaseType
 
     val canPurchaseBulk: Boolean
-        get() = "eggs" == purchaseType || "hatchingPotions" == purchaseType || "food" == purchaseType
+        get() = "eggs" == purchaseType || "hatchingPotions" == purchaseType || "food" == purchaseType || "gems" == purchaseType
 
     fun canAfford(user: User?, quantity: Int): Boolean = when(currency) {
-        "gold" -> (value * quantity) <= user?.stats?.gp ?: 0.0
-        "gems" -> (value * quantity) <= user?.gemCount?.toDouble() ?: 0.0
-        "hourglasses" -> (value * quantity) <= user?.hourglassCount?.toDouble() ?: 0.0
-        else -> false
+        "gold" -> (value * quantity) <= (user?.stats?.gp ?: 0.0)
+        else -> true
     }
 
     override fun equals(other: Any?): Boolean {
@@ -145,5 +143,19 @@ open class ShopItem : RealmObject() {
             item.purchaseType = "gems"
             return item
         }
+
+        fun makeFortifyItem(res: Resources?): ShopItem {
+            val item = ShopItem()
+            item.key = "fortify"
+            item.text = res?.getString(R.string.fortify_shop) ?: ""
+            item.notes = res?.getString(R.string.fortify_shop_description) ?: ""
+            item.imageName = "inventory_special_fortify"
+            item.value = 4
+            item.currency = "gems"
+            item.pinType = "fortify"
+            item.path = "special.fortify"
+            item.purchaseType = "fortify"
+            return item
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
index d78a224a3..fa2108aec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
@@ -1,13 +1,23 @@
 package com.habitrpg.android.habitica.models.social
 
+import android.renderscript.BaseObj
+import com.habitrpg.android.habitica.models.BaseObject
 import com.habitrpg.android.habitica.models.user.Backer
 import com.habitrpg.android.habitica.models.user.ContributorInfo
+import com.habitrpg.android.habitica.models.user.User
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 
-open class ChatMessage : RealmObject() {
+open class ChatMessage : RealmObject(), BaseObject {
+
+    override val realmClass: Class<ChatMessage>
+        get() = ChatMessage::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
 
     @PrimaryKey
     var id: String = ""
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt
index 89c187510..fe6387683 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt
@@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.models.user.Authentication
 import com.habitrpg.android.habitica.models.user.ContributorInfo
 import com.habitrpg.android.habitica.models.user.Profile
-import io.realm.annotations.PrimaryKey
 
 class FindUsernameResult {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
index a885d956f..eb2785d9e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
@@ -1,14 +1,25 @@
 package com.habitrpg.android.habitica.models.social
 
 import com.google.gson.annotations.SerializedName
+import com.habitrpg.android.habitica.models.BaseObject
 import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import com.habitrpg.android.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.User
 
 import io.realm.RealmList
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 
-open class Group : RealmObject() {
+open class Group : RealmObject(), BaseObject {
+
+    override val realmClass: Class<Group>
+        get() = Group::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
 
     @SerializedName("_id")
     @PrimaryKey
@@ -30,6 +41,12 @@ open class Group : RealmObject() {
     var leaderOnlyChallenges: Boolean = false
     var leaderOnlyGetGems: Boolean = false
 
+
+    @Ignore
+    var tasksOrder: TasksOrder? = null
+    @Ignore
+    var tasks: TaskList? = null
+
     override fun equals(other: Any?): Boolean {
         if (this === other) {
             return true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
index cd6b32c81..a6e246422 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.models.social
 
 import com.habitrpg.android.habitica.models.Avatar
-import com.habitrpg.android.habitica.models.AvatarPreferences
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Outfit
 import com.habitrpg.android.habitica.models.user.Preferences
@@ -18,47 +17,32 @@ open class UserStyles : RealmObject(), Avatar {
             preferences?.userId = id
             items?.userId = id
         }
-    override fun getCurrentMount(): String? {
-        return items?.currentMount
-    }
 
-    override fun getCurrentPet(): String? {
-        return items?.currentPet
-    }
+    override val currentMount: String?
+        get() = items?.currentMount
 
-    override fun getSleep(): Boolean {
-        return false
-    }
+    override val currentPet: String?
+        get() = items?.currentPet
 
-    override fun getStats(): Stats? {
-        return stats
-    }
+    override val sleep: Boolean
+        get() = false
 
-    override fun getPreferences(): AvatarPreferences? {
-        return preferences
-    }
+    override val gemCount: Int
+        get() = 0
+    override val hourglassCount: Int
+        get() = 0
 
-    override fun getGemCount(): Int {
-        return 0
-    }
+    override val costume: Outfit?
+        get() = items?.gear?.costume
 
-    override fun getHourglassCount(): Int {
-        return 0
-    }
-
-    override fun getCostume(): Outfit? {
-        return items?.gear?.costume
-    }
-
-    override fun getEquipped(): Outfit? {
-        return items?.gear?.equipped
-    }
+    override val equipped: Outfit?
+        get() = items?.gear?.equipped
 
     override fun hasClass(): Boolean {
         return false
     }
 
-    private var stats: Stats? = null
-    private var preferences: Preferences? = null
+    override var stats: Stats? = null
+    override var preferences: Preferences? = null
     private var items: Items? = null
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
index eda5f8208..75f32adca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
@@ -2,16 +2,20 @@ package com.habitrpg.android.habitica.models.tasks
 
 import android.os.Parcel
 import android.os.Parcelable
-
-import java.util.UUID
-
+import com.habitrpg.android.habitica.models.BaseObject
+import io.realm.RealmModel
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
+import java.util.*
 
-/**
- * Created by viirus on 06/07/15.
- */
-open class ChecklistItem : RealmObject, Parcelable {
+open class ChecklistItem : RealmObject, BaseObject, Parcelable {
+
+    override val realmClass: Class<ChecklistItem>
+        get() = ChecklistItem::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
 
     @PrimaryKey
     var id: String? = null
@@ -56,7 +60,7 @@ open class ChecklistItem : RealmObject, Parcelable {
         dest.writeInt(position)
     }
 
-    companion object CREATOR : Parcelable.Creator<ChecklistItem> {
+    companion object CREATOR : Parcelable.Creator<ChecklistItem>, RealmModel {
         override fun createFromParcel(source: Parcel): ChecklistItem = ChecklistItem(source)
 
         override fun newArray(size: Int): Array<ChecklistItem?> = arrayOfNulls(size)
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..7cdfde211 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
@@ -6,10 +6,10 @@ import android.text.Spanned
 import androidx.annotation.StringDef
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.BaseObject
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import io.reactivex.functions.Consumer
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.Ignore
@@ -18,7 +18,15 @@ import org.json.JSONArray
 import org.json.JSONException
 import java.util.*
 
-open class Task : RealmObject, Parcelable {
+open class Task : RealmObject, BaseObject, Parcelable {
+
+    override val realmClass: Class<Task>
+        get() = Task::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
+
     @PrimaryKey
     @SerializedName("_id")
     var id: String? = null
@@ -143,14 +151,27 @@ open class Task : RealmObject, Parcelable {
             }
         }
 
+    val darkestTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_5
+                this.value < -10 -> return R.color.red_5
+                this.value < -1 -> return R.color.orange_5
+                this.value < 1 -> return R.color.yellow_5
+                this.value < 5 -> return R.color.green_5
+                this.value < 10 -> return R.color.teal_5
+                else -> R.color.blue_5
+            }
+        }
+
     val isDisplayedActive: Boolean
-        get() = isDue == true && !completed
+        get() = ((isDue == true && type == Task.TYPE_DAILY) || type == TYPE_TODO) && !completed
 
     val isChecklistDisplayActive: Boolean
-        get() = this.isDisplayedActive && this.checklist?.size != this.completedChecklistCount
+        get() = this.checklist?.size != this.completedChecklistCount
 
     val isGroupTask: Boolean
-        get() = group?.approvalApproved == true
+        get() = group?.groupID?.isNotBlank() == true
 
     val isPendingApproval: Boolean
         get() = (group?.approvalRequired == true && group?.approvalRequested == true && group?.approvalApproved == false)
@@ -199,10 +220,10 @@ open class Task : RealmObject, Parcelable {
             return this.parsedText ?: ""
         }
 
-        MarkdownParser.parseMarkdownAsync(this.text, Consumer { parsedText ->
+        MarkdownParser.parseMarkdownAsync(this.text) { parsedText ->
             this.parsedText = parsedText
             callback(parsedText)
-        })
+        }
 
         return this.text
     }
@@ -213,10 +234,10 @@ open class Task : RealmObject, Parcelable {
         }
 
         if (notes?.isNotEmpty() == true) {
-            MarkdownParser.parseMarkdownAsync(notes, Consumer { parsedText ->
+            MarkdownParser.parseMarkdownAsync(notes) { parsedText ->
                 parsedNotes = parsedText
                 callback(parsedText)
-            })
+            }
         }
         return notes
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
index cf4623a8d..db59ecaf2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
@@ -1,14 +1,25 @@
 package com.habitrpg.android.habitica.models.tasks
 
 
+import com.google.gson.annotations.SerializedName
+import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
+import java.util.*
 
 open class TaskGroupPlan : RealmObject() {
 
     @PrimaryKey
     internal var taskID: String? = null
 
+    @SerializedName("id")
+    var groupID: String? = null
+    var managerNotes: String? = null
+    var sharedCompletion: String? = null
+    var assignedDate: Date? = null
+    var assigningUsername: String? = null
+    var assignedUsers: RealmList<String> = RealmList()
+
     var approvalRequested: Boolean = false
     var approvalApproved: Boolean = false
     var approvalRequired: Boolean = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java
deleted file mode 100644
index 9cb9c6ffa..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import java.util.Map;
-
-public class TaskList {
-
-    public Map<String, Task> tasks;
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.kt
new file mode 100644
index 000000000..2b754b324
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.kt
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica.models.tasks
+
+class TaskList {
+    var tasks: MutableMap<String, Task> = mutableMapOf()
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
deleted file mode 100644
index 979cda714..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-
-import com.habitrpg.android.habitica.models.Tag;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-/**
- * Created by viirus on 08/08/15.
- */
-
-public class TaskTag extends RealmObject {
-
-    public Tag tag;
-    public Task task;
-    @PrimaryKey
-    String id;
-    private String tagId = "";
-    private String taskId = "";
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Tag getTag() {
-        return tag;
-    }
-
-    public void setTag(Tag tag) {
-        this.tag = tag;
-        tagId = tag.getId();
-        updatePrimaryKey();
-    }
-
-    public Task getTask() {
-        return task;
-    }
-
-    public void setTask(Task task) {
-        this.task = task;
-
-        taskId = task.getId();
-        updatePrimaryKey();
-    }
-
-    private void updatePrimaryKey() {
-        this.id = taskId + "_" + tagId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.kt
new file mode 100644
index 000000000..cc8e02636
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.kt
@@ -0,0 +1,29 @@
+package com.habitrpg.android.habitica.models.tasks
+
+import com.habitrpg.android.habitica.models.Tag
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class TaskTag : RealmObject() {
+    var tag: Tag? = null
+    set(value) {
+        field = value
+        tagId = tag?.id ?: ""
+        updatePrimaryKey()
+    }
+    var task: Task? = null
+    set(value) {
+        field = value
+        taskId = task?.id ?: ""
+        updatePrimaryKey()
+    }
+
+    @PrimaryKey
+    var id: String? = null
+    private var tagId = ""
+    private var taskId: String? = ""
+
+    private fun updatePrimaryKey() {
+        id = taskId + "_" + tagId
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java
deleted file mode 100644
index 227566ab8..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import java.util.List;
-
-public class TasksOrder {
-
-    List<String> habits;
-    List<String> dailys;
-    List<String> todos;
-    List<String> rewards;
-
-    public List<String> getHabits() {
-        return habits;
-    }
-
-    public void setHabits(List<String> habits) {
-        this.habits = habits;
-    }
-
-    public List<String> getDailys() {
-        return dailys;
-    }
-
-    public void setDailys(List<String> dailys) {
-        this.dailys = dailys;
-    }
-
-    public List<String> getTodos() {
-        return todos;
-    }
-
-    public void setTodos(List<String> todos) {
-        this.todos = todos;
-    }
-
-    public List<String> getRewards() {
-        return rewards;
-    }
-
-    public void setRewards(List<String> rewards) {
-        this.rewards = rewards;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.kt
new file mode 100644
index 000000000..e345c1ccc
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.kt
@@ -0,0 +1,8 @@
+package com.habitrpg.android.habitica.models.tasks
+
+class TasksOrder {
+    var habits: List<String> = listOf()
+    var dailys: List<String> = listOf()
+    var todos: List<String> = listOf()
+    var rewards: List<String> = listOf()
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
deleted file mode 100644
index 21898ac0b..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.SerializedName;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Buffs extends RealmObject {
-
-    @PrimaryKey
-    private String userId;
-
-    public Float con, str, per;
-    @SerializedName("int")
-    public Float _int;    private Boolean snowball;
-    private Boolean streaks;
-    private Boolean seafoam;
-    private Boolean spookySparkles;
-    private Boolean shinySeed;
-
-    public Buffs() {
-        this(false, false);
-    }
-
-    public Buffs(Boolean snowball, Boolean streaks) {
-        this.snowball = snowball;
-        this.streaks = streaks;
-    }
-
-    public Boolean getSnowball() {
-        return snowball != null ? snowball : Boolean.FALSE;
-    }
-
-    public void setSnowball(Boolean snowball) {
-        this.snowball = snowball;
-    }
-
-    public Boolean getSeafoam() {
-        return seafoam != null ? seafoam : Boolean.FALSE;
-    }
-
-    public void setSeafoam(Boolean seafoam) {
-        this.seafoam = seafoam;
-    }
-
-    public Boolean getSpookySparkles() {
-        return spookySparkles != null ? spookySparkles : Boolean.FALSE;
-    }
-
-    public void setSpookySparkles(Boolean spookySparkles) {
-        this.spookySparkles = spookySparkles;
-    }
-
-    public Boolean getShinySeed() {
-        return shinySeed != null ? shinySeed : Boolean.FALSE;
-    }
-
-    public void setShinySeed(Boolean shinySeed) {
-        this.shinySeed = shinySeed;
-    }
-
-    public Boolean getStreaks() {
-        return streaks != null ? streaks : Boolean.FALSE;
-    }
-
-    public void setStreaks(Boolean streaks) {
-        this.streaks = streaks;
-    }
-
-    public void merge(Buffs stats) {
-        if (stats == null) {
-            return;
-        }
-        this.con = stats.con != null ? stats.con : this.con;
-        this.str = stats.str != null ? stats.str : this.str;
-        this.per = stats.per != null ? stats.per : this.per;
-        this._int = stats._int != null ? stats._int : this._int;
-        this.snowball = stats.snowball != null ? stats.snowball : this.snowball;
-        this.streaks = stats.streaks != null ? stats.streaks : this.streaks;
-        this.seafoam = stats.seafoam != null ? stats.seafoam : this.seafoam;
-        this.shinySeed = stats.shinySeed != null ? stats.shinySeed : this.shinySeed;
-        this.spookySparkles = stats.spookySparkles != null ? stats.spookySparkles : this.spookySparkles;
-    }
-
-    public Float getStr() {
-        return str;
-    }
-
-    public Float get_int() {
-        return _int;
-    }
-
-    public Float getCon() {
-        return con;
-    }
-
-    public Float getPer() {
-        return per;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt
new file mode 100644
index 000000000..d366f518c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt
@@ -0,0 +1,42 @@
+package com.habitrpg.android.habitica.models.user
+
+import com.google.gson.annotations.SerializedName
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Buffs : RealmObject() {
+    @PrimaryKey
+    var userId: String? = null
+    var con: Float? = null
+    var str: Float? = null
+    var per: Float? = null
+
+    @SerializedName("int")
+    var _int: Float? = null
+    var seafoam: Boolean? = null
+        get() { return field ?: false }
+    var spookySparkles: Boolean? = null
+        get() { return field ?: false }
+    var shinySeed: Boolean? = null
+        get() { return field ?: false }
+    var snowball: Boolean? = null
+        get() { return field ?: false }
+    var streaks: Boolean? = null
+        get() { return field ?: false }
+
+
+    fun merge(stats: Buffs?) {
+        if (stats == null) {
+            return
+        }
+        con = if (stats.con != null) stats.con else con
+        str = if (stats.str != null) stats.str else str
+        per = if (stats.per != null) stats.per else per
+        _int = if (stats._int != null) stats._int else _int
+        snowball = if (stats.snowball != null) stats.snowball else snowball
+        streaks = if (stats.streaks != null) stats.streaks else streaks
+        seafoam = if (stats.seafoam != null) stats.seafoam else seafoam
+        shinySeed = if (stats.shinySeed != null) stats.shinySeed else shinySeed
+        spookySparkles = if (stats.spookySparkles != null) stats.spookySparkles else spookySparkles
+    }
+}
\ No newline at end of file
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
deleted file mode 100644
index 1eb1589a5..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import android.util.SparseArray;
-import android.util.SparseIntArray;
-
-import com.habitrpg.android.habitica.R;
-
-import java.util.HashMap;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class ContributorInfo extends RealmObject {
-
-    public static final SparseIntArray CONTRIBUTOR_COLOR_DICT;
-
-    static {
-        CONTRIBUTOR_COLOR_DICT = new SparseIntArray();
-        CONTRIBUTOR_COLOR_DICT.put(0, R.color.contributor_0);
-        CONTRIBUTOR_COLOR_DICT.put(1, R.color.contributor_1);
-        CONTRIBUTOR_COLOR_DICT.put(2, R.color.contributor_2);
-        CONTRIBUTOR_COLOR_DICT.put(3, R.color.contributor_3);
-        CONTRIBUTOR_COLOR_DICT.put(4, R.color.contributor_4);
-        CONTRIBUTOR_COLOR_DICT.put(5, R.color.contributor_5);
-        CONTRIBUTOR_COLOR_DICT.put(6, R.color.contributor_6);
-        CONTRIBUTOR_COLOR_DICT.put(7, R.color.contributor_7);
-        CONTRIBUTOR_COLOR_DICT.put(8, R.color.contributor_mod);
-        CONTRIBUTOR_COLOR_DICT.put(9, R.color.contributor_staff);
-    }
-
-    @PrimaryKey
-    private String userId;
-
-    public User user;
-    private boolean admin;
-    private String contributions;
-    private int level;
-    private String text;
-
-    public Boolean getAdmin() {
-        return this.admin;
-    }
-
-    public void setAdmin(Boolean admin) {
-        this.admin = admin;
-    }
-
-    public String getContributions() {
-        return this.contributions;
-    }
-
-    public void setContributions(String contributions) {
-        this.contributions = contributions;
-    }
-
-    public int getLevel() {
-        return this.level;
-    }
-
-    public void setLevel(int level) {
-        this.level = level;
-    }
-
-    public String getText() {
-        return this.text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public int getContributorColor() {
-        int rColor = android.R.color.black;
-
-
-        if (CONTRIBUTOR_COLOR_DICT.get(this.level, -1) > 0) {
-            rColor = CONTRIBUTOR_COLOR_DICT.get(this.level);
-        }
-
-        return rColor;
-    }
-
-    public int getContributorForegroundColor() {
-        return android.R.color.white;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.kt
new file mode 100644
index 000000000..a3aa155b7
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.kt
@@ -0,0 +1,42 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmObject
+import android.util.SparseIntArray
+import com.habitrpg.android.habitica.models.user.ContributorInfo
+import com.habitrpg.android.habitica.R
+import io.realm.annotations.PrimaryKey
+
+open class ContributorInfo : RealmObject() {
+    companion object {
+        val CONTRIBUTOR_COLOR_DICT: SparseIntArray = SparseIntArray()
+
+        init {
+            CONTRIBUTOR_COLOR_DICT.put(0, R.color.contributor_0)
+            CONTRIBUTOR_COLOR_DICT.put(1, R.color.contributor_1)
+            CONTRIBUTOR_COLOR_DICT.put(2, R.color.contributor_2)
+            CONTRIBUTOR_COLOR_DICT.put(3, R.color.contributor_3)
+            CONTRIBUTOR_COLOR_DICT.put(4, R.color.contributor_4)
+            CONTRIBUTOR_COLOR_DICT.put(5, R.color.contributor_5)
+            CONTRIBUTOR_COLOR_DICT.put(6, R.color.contributor_6)
+            CONTRIBUTOR_COLOR_DICT.put(7, R.color.contributor_7)
+            CONTRIBUTOR_COLOR_DICT.put(8, R.color.contributor_mod)
+            CONTRIBUTOR_COLOR_DICT.put(9, R.color.contributor_staff)
+        }
+    }
+
+    @PrimaryKey
+    var userId: String? = null
+    var user: User? = null
+    var admin = false
+    var contributions: String? = null
+    var level = 0
+    var text: String? = null
+    val contributorColor: Int
+        get() {
+            var rColor = R.color.text_primary
+            if (CONTRIBUTOR_COLOR_DICT[level, -1] > 0) {
+                rColor = CONTRIBUTOR_COLOR_DICT[level]
+            }
+            return rColor
+        }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
deleted file mode 100644
index 402f66d67..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.models.TutorialStep;
-
-import java.util.List;
-
-import io.realm.RealmList;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Flags extends RealmObject {
-
-    @PrimaryKey
-    private String userId;
-
-    RealmList<TutorialStep> tutorial;
-    private boolean showTour;
-    private boolean dropsEnabled;
-    private boolean itemsEnabled;
-    private boolean newStuff;
-    private boolean classSelected;
-    private boolean rebirthEnabled;
-    private boolean welcomed;
-    private boolean armoireEnabled;
-    private boolean armoireOpened;
-    private boolean armoireEmpty;
-    private boolean communityGuidelinesAccepted;
-    private boolean verifiedUsername;
-    private boolean warnedLowHealth;
-
-    public List<TutorialStep> getTutorial() {
-        return tutorial;
-    }
-
-    public void setTutorial(RealmList<TutorialStep> tutorial) {
-        this.tutorial = tutorial;
-    }
-
-    public boolean getShowTour() {
-        return showTour;
-    }
-
-    public void setShowTour(boolean showTour) {
-        this.showTour = showTour;
-    }
-
-    public boolean getDropsEnabled() {
-        return dropsEnabled;
-    }
-
-    public void setDropsEnabled(boolean dropsEnabled) {
-        this.dropsEnabled = dropsEnabled;
-    }
-
-    public boolean getItemsEnabled() {
-        return itemsEnabled;
-    }
-
-    public void setItemsEnabled(boolean itemsEnabled) {
-        this.itemsEnabled = itemsEnabled;
-    }
-
-    public boolean getNewStuff() {
-        return newStuff;
-    }
-
-    public void setNewStuff(boolean newStuff) {
-        this.newStuff = newStuff;
-    }
-
-    public boolean getClassSelected() {
-        return classSelected;
-    }
-
-    public void setClassSelected(boolean classSelected) {
-        this.classSelected = classSelected;
-    }
-
-    public boolean getRebirthEnabled() {
-        return rebirthEnabled;
-    }
-
-    public void setRebirthEnabled(boolean rebirthEnabled) {
-        this.rebirthEnabled = rebirthEnabled;
-    }
-
-    public boolean getWelcomed() {
-        return welcomed;
-    }
-
-    public void setWelcomed(boolean welcomed) {
-        this.welcomed = welcomed;
-    }
-
-    public boolean getArmoireEnabled() {
-        return armoireEnabled;
-    }
-
-    public void setArmoireEnabled(boolean armoireEnabled) {
-        this.armoireEnabled = armoireEnabled;
-    }
-
-    public boolean getArmoireOpened() {
-        return armoireOpened;
-    }
-
-    public void setArmoireOpened(boolean armoireOpened) {
-        this.armoireOpened = armoireOpened;
-    }
-
-    public boolean getArmoireEmpty() {
-        return armoireEmpty;
-    }
-
-    public void setArmoireEmpty(boolean armoireEmpty) {
-        this.armoireEmpty = armoireEmpty;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public boolean isCommunityGuidelinesAccepted() {
-        return communityGuidelinesAccepted;
-    }
-
-    public void setCommunityGuidelinesAccepted(boolean communityGuidelinesAccepted) {
-        this.communityGuidelinesAccepted = communityGuidelinesAccepted;
-    }
-
-    public boolean isVerifiedUsername() {
-        return verifiedUsername;
-    }
-
-    public void setVerifiedUsername(boolean verifiedUsername) {
-        this.verifiedUsername = verifiedUsername;
-    }
-
-    public boolean isWarnedLowHealth() {
-        return warnedLowHealth;
-    }
-
-    public void setWarnedLowHealth(boolean warnedLowHealth) {
-        this.warnedLowHealth = warnedLowHealth;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
new file mode 100644
index 000000000..735569bda
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
@@ -0,0 +1,25 @@
+package com.habitrpg.android.habitica.models.user
+
+import com.habitrpg.android.habitica.models.TutorialStep
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Flags : RealmObject() {
+    @PrimaryKey
+    var userId: String? = null
+    var tutorial: RealmList<TutorialStep>? = null
+    var showTour = false
+    var dropsEnabled = false
+    var itemsEnabled = false
+    var newStuff = false
+    var classSelected = false
+    var rebirthEnabled = false
+    var welcomed = false
+    var armoireEnabled = false
+    var armoireOpened = false
+    var armoireEmpty = false
+    var communityGuidelinesAccepted = false
+    var verifiedUsername = false
+    var isWarnedLowHealth = false
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt
index f56e6524a..d07a896e1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt
@@ -2,9 +2,7 @@ package com.habitrpg.android.habitica.models.user
 
 import io.realm.RealmList
 import io.realm.RealmObject
-import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
-import java.util.*
 
 open class Inbox : RealmObject() {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt
index 5f68d688d..83df6378c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt
@@ -1,9 +1,17 @@
 package com.habitrpg.android.habitica.models.user
 
+import com.habitrpg.android.habitica.models.BaseObject
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
-open class OwnedItem : RealmObject(), OwnedObject {
+open class OwnedItem : RealmObject(), BaseObject, OwnedObject {
+
+    override val realmClass: Class<OwnedItem>
+        get() = OwnedItem::class.java
+    override val primaryIdentifier: String?
+        get() = combinedKey
+    override val primaryIdentifierName: String
+        get() = "combinedKey"
 
     @PrimaryKey
     override var combinedKey: String? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index 8d450cfc4..caf02668f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -11,23 +11,41 @@ import java.util.*
 open class Preferences : RealmObject(), AvatarPreferences {
 
     @PrimaryKey
-    private var userId: String? = null
+    override var userId: String? = null
+    set(value) {
+        field = value
+        if (hair?.isManaged == false) {
+            hair?.userId = value
+        }
+        if (suppressModals?.isManaged == false) {
+            suppressModals?.userId = value
+        }
+    }
 
-    private var hair: Hair? = null
+    override var hair: Hair? = null
     var suppressModals: SuppressedModals? = null
-    private var costume: Boolean = false
+    override var costume: Boolean = false
     @SerializedName("disableClasses")
-    var isDisableClasses: Boolean = false
+    override var disableClasses: Boolean = false
     @SerializedName("sleep")
-    var isSleep: Boolean = false
+    override var sleep: Boolean = false
     var dailyDueDefaultView: Boolean = false
     var automaticAllocation: Boolean = false
     var allocationMode: String? = null
-    private var shirt: String? = null
-    private var skin: String? = null
-    private var size: String? = null
-    private var background: String? = null
-    private var chair: String? = null
+    override var shirt: String? = null
+    override var skin: String? = null
+    override var size: String? = null
+    override var background: String? = null
+    override var chair: String? = null
+    get() {
+        return if (field != null && field != "none") {
+            if (field?.contains("chair_") == true) {
+                field
+            } else {
+                "chair_" + field!!
+            }
+        } else null
+    }
     var language: String? = null
     var sound: String? = null
     var dayStart: Int = 0
@@ -37,90 +55,6 @@ open class Preferences : RealmObject(), AvatarPreferences {
     var emailNotifications: EmailNotificationsPreference? = null
     var autoEquip: Boolean = true
 
-    override fun getBackground(): String? {
-        return background
-    }
-
-    fun setBackground(background: String) {
-        this.background = background
-    }
-
-    override fun getCostume(): Boolean {
-        return costume
-    }
-
-    fun setCostume(costume: Boolean) {
-        this.costume = costume
-    }
-
-    override fun getDisableClasses(): Boolean {
-        return isDisableClasses
-    }
-
-    override fun getSleep(): Boolean {
-        return isSleep
-    }
-
-    override fun getShirt(): String? {
-        return shirt
-    }
-
-    fun setShirt(shirt: String) {
-        this.shirt = shirt
-    }
-
-    override fun getSkin(): String? {
-        return skin
-    }
-
-    fun setSkin(skin: String) {
-        this.skin = skin
-    }
-
-    override fun getSize(): String? {
-        return size
-    }
-
-    fun setSize(size: String) {
-        this.size = size
-    }
-
-    override fun getHair(): Hair? {
-        return hair
-    }
-
-    fun setHair(hair: Hair) {
-        this.hair = hair
-    }
-
-    override fun getChair(): String? {
-        return if (chair != null && chair != "none") {
-            if (chair?.contains("chair_") == true) {
-                chair
-            } else {
-                "chair_" + chair!!
-            }
-        } else null
-    }
-
-    fun setChair(chair: String) {
-        this.chair = chair
-    }
-
-    override fun getUserId(): String? {
-        return userId
-    }
-
-    fun setUserId(userId: String?) {
-        this.userId = userId
-        if (hair?.isManaged == false) {
-            hair?.userId = userId
-        }
-        if (suppressModals?.isManaged == false) {
-            suppressModals?.userId = userId
-        }
-    }
-
     fun hasTaskBasedAllocation(): Boolean {
         return allocationMode?.toLowerCase(Locale.ROOT) == "taskbased" && automaticAllocation
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
deleted file mode 100644
index 89f35152e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import java.util.List;
-
-import io.realm.RealmList;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Purchases extends RealmObject {
-
-    @PrimaryKey
-    private String userId;
-
-    public RealmList<OwnedCustomization> customizations;
-    User user;
-    private SubscriptionPlan plan;
-
-    public List<OwnedCustomization> getCustomizations() {
-        return customizations;
-    }
-
-    public void setCustomizations(RealmList<OwnedCustomization> customizations) {
-        this.customizations = customizations;
-    }
-
-    public SubscriptionPlan getPlan() {
-        return plan;
-    }
-
-    public void setPlan(SubscriptionPlan plan) {
-        this.plan = plan;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.kt
new file mode 100644
index 000000000..37f8f0f3c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.kt
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Purchases : RealmObject() {
+    @PrimaryKey
+    var userId: String? = null
+    @JvmField
+    var customizations: RealmList<OwnedCustomization>? = null
+    var user: User? = null
+    var plan: SubscriptionPlan? = null
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
index 1b413f3a7..b04867e22 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.models.user
 import android.content.Context
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.models.HabitRpgClass
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
@@ -102,10 +101,6 @@ open class Stats : RealmObject() {
         this.maxMP = if (stats.maxMP != null) stats.maxMP else this.maxMP
     }
 
-    fun setHabitClass(habitRpgClass: HabitRpgClass) {
-        habitClass = habitRpgClass.toString()
-    }
-
     companion object {
         const val STRENGTH = "str"
         const val INTELLIGENCE = "int"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
deleted file mode 100644
index 2bade8afe..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class SubscriptionPlanConsecutive extends RealmObject {
-
-    @PrimaryKey
-    private String customerId;
-
-    SubscriptionPlan subscriptionPlan;
-    private int trinkets;
-    private int gemCapExtra;
-    private int offset;
-    private int count;
-
-    public int getTrinkets() {
-        return trinkets;
-    }
-
-    public void setTrinkets(int trinkets) {
-        this.trinkets = trinkets;
-    }
-
-    public int getGemCapExtra() {
-        return gemCapExtra;
-    }
-
-    public void setGemCapExtra(int gemCapExtra) {
-        this.gemCapExtra = gemCapExtra;
-    }
-
-    public int getOffset() {
-        return offset;
-    }
-
-    public void setOffset(int offset) {
-        this.offset = offset;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.kt
new file mode 100644
index 000000000..05541cd6d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.kt
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class SubscriptionPlanConsecutive : RealmObject() {
+    @PrimaryKey
+    var customerId: String? = null
+    var subscriptionPlan: SubscriptionPlan? = null
+    var trinkets = 0
+    var gemCapExtra = 0
+    var offset = 0
+    var count = 0
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
deleted file mode 100644
index 77b40827b..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class SuppressedModals extends RealmObject {
-
-    @PrimaryKey
-    private String userId;
-
-    Preferences preferences;
-    private Boolean streak, raisePet, hatchPet, levelUp;
-
-    public Boolean getStreak() {
-        return streak;
-    }
-
-    public void setStreak(Boolean streak) {
-        this.streak = streak;
-    }
-
-    public Boolean getRaisePet() {
-        return raisePet;
-    }
-
-    public void setRaisePet(Boolean raisePet) {
-        this.raisePet = raisePet;
-    }
-
-    public Boolean getHatchPet() {
-        return hatchPet;
-    }
-
-    public void setHatchPet(Boolean hatchPet) {
-        this.hatchPet = hatchPet;
-    }
-
-    public Boolean getLevelUp() {
-        return levelUp;
-    }
-
-    public void setLevelUp(Boolean levelUp) {
-        this.levelUp = levelUp;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.kt
new file mode 100644
index 000000000..ed69c1996
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.kt
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class SuppressedModals : RealmObject() {
+    @PrimaryKey
+    var userId: String? = null
+    var preferences: Preferences? = null
+    var streak: Boolean? = null
+    var raisePet: Boolean? = null
+    var hatchPet: Boolean? = null
+    var levelUp: Boolean? = null
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java
deleted file mode 100644
index 1e7154f48..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.SerializedName;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Training extends RealmObject {
-
-    @PrimaryKey
-    private String userId;
-
-    Stats stats;
-    public Float con, str, per;
-    @SerializedName("int")
-    public Float _int;
-
-    public Float getCon() {
-        return con != null ? con : Float.valueOf(0);
-    }
-
-    public void setCon(Float con) {
-        this.con = con;
-    }
-
-    public Float getStr() {
-        return str != null ? str : Float.valueOf(0);
-    }
-
-    public void setStr(Float str) {
-        this.str = str;
-    }
-
-    public Float getPer() {
-        return per != null ? per : Float.valueOf(0);
-    }
-
-    public void setPer(Float per) {
-        this.per = per;
-    }
-
-    public Float get_int() {
-        return _int != null ? _int : Float.valueOf(0);
-    }
-
-    public void set_int(Float _int) {
-        this._int = _int;
-    }
-
-    public void merge(Training stats) {
-        if (stats == null) {
-            return;
-        }
-        this.con = stats.con != null ? stats.con : this.con;
-        this.str = stats.str != null ? stats.str : this.str;
-        this.per = stats.per != null ? stats.per : this.per;
-        this._int = stats._int != null ? stats._int : this._int;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
-
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt
new file mode 100644
index 000000000..94819837d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt
@@ -0,0 +1,27 @@
+package com.habitrpg.android.habitica.models.user
+
+import com.google.gson.annotations.SerializedName
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Training : RealmObject() {
+    @PrimaryKey
+    var userId: String? = null
+    var stats: Stats? = null
+    var con: Float = 0f
+    var str: Float = 0f
+    var per: Float = 0f
+
+    @SerializedName("int")
+    var _int: Float = 0f
+
+    fun merge(stats: Training?) {
+        if (stats == null) {
+            return
+        }
+        con = stats.con
+        str = stats.str
+        per = stats.per
+        _int = stats._int
+    }
+}
\ No newline at end of file
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..7790b3360 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
@@ -13,8 +14,15 @@ import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import java.util.*
 
-open class User : RealmObject(), Avatar, VersionedObject {
+open class User : RealmObject(), BaseObject, Avatar, VersionedObject {
 
+    override val realmClass: Class<User>
+        get() = User::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
+    
     @Ignore
     var tasks: TaskList? = null
 
@@ -53,7 +61,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
             }
         }
@@ -62,7 +70,13 @@ open class User : RealmObject(), Avatar, VersionedObject {
     override var versionNumber: Int = 0
 
     var balance: Double = 0.toDouble()
-    private var stats: Stats? = null
+    override var stats: Stats? = null
+        set(value) {
+            field = value
+            if (value != null && this.id != null && !value.isManaged) {
+                field?.userId = this.id
+            }
+        }
     var inbox: Inbox? = null
         set(inbox) {
             field = inbox
@@ -70,7 +84,13 @@ open class User : RealmObject(), Avatar, VersionedObject {
                 inbox.userId = this.id
             }
         }
-    private var preferences: Preferences? = null
+    override var preferences: Preferences? = null
+    set(value) {
+        field = value
+        if (value != null && this.id != null && !value.isManaged) {
+            field?.userId = this.id
+        }
+    }
     var profile: Profile? = null
         set(profile) {
             field = profile
@@ -136,6 +156,7 @@ open class User : RealmObject(), Avatar, VersionedObject {
             field = value
             field.forEach { it.userID = id }
         }
+    var challengeAchievements = RealmList<String>()
 
     @Ignore
     var pushDevices: List<PushDevice>? = null
@@ -167,65 +188,35 @@ 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?
         get() = if (username != null) "@$username" else null
 
-    override fun getPreferences(): Preferences? {
-        return preferences
-    }
+    override val gemCount: Int
+        get() = (this.balance * 4).toInt()
 
-    fun setPreferences(preferences: Preferences?) {
-        this.preferences = preferences
-        if (preferences != null && this.id != null && !preferences.isManaged) {
-            preferences.userId = this.id
-        }
-    }
+    override val hourglassCount: Int
+        get() = purchased?.plan?.consecutive?.trinkets ?: 0
 
-    override fun getStats(): Stats? {
-        return stats
-    }
+    override val costume: Outfit?
+        get() = items?.gear?.costume
 
-    fun setStats(stats: Stats?) {
-        this.stats = stats
-        if (stats != null && this.id != null && !stats.isManaged) {
-            stats.userId = this.id
-        }
-    }
-
-    override fun getGemCount(): Int {
-        return (this.balance * 4).toInt()
-    }
-
-    override fun getHourglassCount(): Int {
-        return purchased?.plan?.consecutive?.trinkets ?: 0
-    }
-
-    override fun getCostume(): Outfit? {
-        return items?.gear?.costume
-    }
-
-    override fun getEquipped(): Outfit? {
-        return items?.gear?.equipped
-    }
+    override val equipped: Outfit?
+        get() = items?.gear?.equipped
 
     override fun hasClass(): Boolean {
         return preferences?.disableClasses != true && flags?.classSelected == true && stats?.habitClass?.isNotEmpty() == true
     }
 
-    override fun getCurrentMount(): String? {
-        return items?.currentMount ?: ""
-    }
+    override val currentMount: String?
+        get() = items?.currentMount ?: ""
+    override val currentPet: String?
+        get() = items?.currentPet ?: ""
 
-    override fun getCurrentPet(): String? {
-        return items?.currentPet ?: ""
-    }
-
-    override fun getSleep(): Boolean {
-        return preferences?.sleep ?: false
-    }
+    override val sleep: Boolean
+        get() = preferences?.sleep ?: false
 
     fun hasParty(): Boolean {
         return this.party?.id?.length ?: 0 > 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
index dd27d3921..4ee1129eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
@@ -17,7 +17,7 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 @Module
@@ -50,7 +50,7 @@ public class ApiModule {
     public MaintenanceApiService providesMaintenanceApiService(GsonConverterFactory gsonConverter, HostConfig hostConfig) {
         Retrofit adapter = new Retrofit.Builder()
                 .baseUrl("https://habitica-assets.s3.amazonaws.com/mobileApp/endpoint/")
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .addConverterFactory(gsonConverter)
                 .build();
         return adapter.create(MaintenanceApiService.class);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.java
index cb43e1e52..6f03d6ccd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.java
@@ -112,7 +112,7 @@ public class UserRepositoryModule {
 
     @Provides
     InventoryLocalRepository providesInventoryLocalRepository(Realm realm, Context context) {
-        return new RealmInventoryLocalRepository(realm, context);
+        return new RealmInventoryLocalRepository(realm);
     }
 
     @Provides
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt
index 5e3b24443..468729888 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt
@@ -1,8 +1,6 @@
 package com.habitrpg.android.habitica.proxy.implementation
 
 
-import android.content.Context
-
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 
 class EmptyCrashlyticsProxy : CrashlyticsProxy {
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..49941a2ce 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
@@ -14,7 +14,6 @@ import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 class LocalNotificationActionReceiver : BroadcastReceiver() {
@@ -48,34 +47,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 +83,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())
+                    taskRepository.taskChecked(null, it, up = true, force = false) {
+                    }.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..ba2676439 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
@@ -21,8 +21,7 @@ import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.BiFunction
 import io.realm.RealmResults
 import java.util.*
 import javax.inject.Inject
@@ -65,7 +64,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) {
@@ -130,9 +129,7 @@ class NotificationPublisher : BroadcastReceiver() {
                 notificationIntent, 0)
         builder.setContentIntent(intent)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            builder.color = ContextCompat.getColor(thisContext, R.color.brand_300)
-        }
+        builder.color = ContextCompat.getColor(thisContext, R.color.brand_300)
 
         notification = builder.build()
         notification.defaults = notification.defaults or Notification.DEFAULT_LIGHTS
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
index d0ed936d1..af825dc1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import javax.inject.Inject
 
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..211053f05 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,11 +15,12 @@ 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
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -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
             }
@@ -201,7 +202,7 @@ class AvatarView : View {
     private fun getAvatarLayerMap(avatar: Avatar, substitutions: Map<String, Map<String, String>>): EnumMap<LayerType, String> {
         val layerMap = EnumMap<LayerType, String>(LayerType::class.java)
 
-        if (!avatar.isValid) {
+        if (!avatar.isValid()) {
             return layerMap
         }
 
@@ -216,11 +217,7 @@ class AvatarView : View {
 
         avatar.stats?.buffs?.let { buffs ->
             if (buffs.snowball == true) {
-                if (Calendar.getInstance().get(Calendar.YEAR) > 2019) {
-                    layerMap[LayerType.VISUAL_BUFF] = "avatar_snowball_" + avatar.stats?.habitClass
-                } else {
-                    layerMap[LayerType.VISUAL_BUFF] = "snowman"
-                }
+                layerMap[LayerType.VISUAL_BUFF] = "avatar_snowball_" + avatar.stats?.habitClass
                 hasVisualBuffs = true
             }
 
@@ -367,7 +364,9 @@ class AvatarView : View {
         if (offset != null) {
             when (layerName) {
                 "head_special_0" -> offset = PointF(offset.x-3, offset.y-18)
-                "weapon_special_0" -> offset = PointF(offset.x-3, offset.y-18)
+                "weapon_special_0" -> offset = PointF(offset.x-12, offset.y+4)
+                "weapon_special_1" -> offset = PointF(offset.x-12, offset.y+4)
+                "weapon_special_critical" -> offset = PointF(offset.x-12, offset.y+4)
                 "head_special_1" -> offset = PointF(offset.x, offset.y+3)
             }
 
@@ -448,7 +447,7 @@ class AvatarView : View {
         initAvatarRectMatrix()
 
         // draw only when user is set
-        if (avatar?.isValid != true) return
+        if (avatar?.isValid() != true) return
 
         // request image layers if not yet processed
         if (multiDraweeHolder.size() == 0) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
index 8186be945..8f4fb5b2c 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,8 +18,7 @@ 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 io.reactivex.rxjava3.disposables.Disposable
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
 import kotlin.math.floor
@@ -66,7 +65,7 @@ class AvatarWithBarsViewModel(private val context: Context, private val binding:
         if (!user.hasClass()) {
             setUserLevel(context, binding.lvlTv, stats.lvl)
         } else {
-            setUserLevelWithClass(context, binding.lvlTv, stats.lvl, capitalize(userClass), stats.habitClass)
+            setUserLevelWithClass(context, binding.lvlTv, stats.lvl, userClass.capitalize(Locale.getDefault()), stats.habitClass)
         }
 
         setHpBarData(stats.hp?.toFloat() ?: 0.toFloat(), stats.maxHealth ?: 0)
@@ -119,23 +118,7 @@ class AvatarWithBarsViewModel(private val context: Context, private val binding:
         binding.currencyView.gems = gems.toDouble()
     }
 
-    fun valueBarLabelsToBlack() {
-        binding.hpBar.setLightBackground(true)
-        binding.xpBar.setLightBackground(true)
-        binding.mpBar.setLightBackground(true)
-    }
-
     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)
@@ -155,8 +138,5 @@ class AvatarWithBarsViewModel(private val context: Context, private val binding:
             drawable?.setBounds(0, 0, drawable.minimumWidth, drawable.minimumHeight)
             textView.setCompoundDrawables(drawable, null, null, null)
         }
-
-        private fun capitalize(s: String) =
-                s.substring(0, 1).toUpperCase(Locale.getDefault()) + s.substring(1)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt
index 85911f935..fb777c35e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt
@@ -31,7 +31,6 @@ class MaxHeightLinearLayout : LinearLayout {
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
         if (!isInEditMode) {
             init(context, attrs)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.kt
index 65653a816..438bef36b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.kt
@@ -4,59 +4,48 @@ package com.habitrpg.android.habitica.ui
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
-import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.TextView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.Typewriter
+import com.habitrpg.android.habitica.databinding.SpeechbubbleBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 
 class SpeechBubbleView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs), View.OnClickListener {
-
-    private val namePlate: TextView by bindView(R.id.name_plate)
-    private val textView: Typewriter by bindView(R.id.textView)
-    private val npcImageView: ImageView by bindView(R.id.npc_image_view)
-    private val confirmationButtons: ViewGroup by bindView(R.id.confirmation_buttons)
-    private val continueIndicator: View by bindView(R.id.continue_indicator)
+    internal var binding = SpeechbubbleBinding.inflate(context.layoutInflater, this, true)
     private var showNextListener: ShowNextListener? = null
 
     init {
-        inflate(R.layout.speechbubble, true)
-
         val attributes = context.theme.obtainStyledAttributes(
                 attrs,
                 R.styleable.SpeechBubbleView,
                 0, 0)
 
-        namePlate.text = attributes.getString(R.styleable.SpeechBubbleView_namePlate)
-        textView.text = attributes.getString(R.styleable.SpeechBubbleView_text)
+        binding.namePlate.text = attributes.getString(R.styleable.SpeechBubbleView_namePlate)
+        binding.textView.text = attributes.getString(R.styleable.SpeechBubbleView_text)
 
         val iconRes = attributes.getDrawable(R.styleable.SpeechBubbleView_npcDrawable)
         if (iconRes != null) {
-            npcImageView.setImageDrawable(iconRes)
+            binding.npcImageView.setImageDrawable(iconRes)
         }
 
-        confirmationButtons.visibility = View.GONE
+        binding.confirmationButtons.visibility = View.GONE
 
         this.setOnClickListener(this)
     }
 
     fun setConfirmationButtonVisibility(visibility: Int) {
-        confirmationButtons.visibility = visibility
+        binding.confirmationButtons.visibility = visibility
     }
 
     fun animateText(text: String) {
-        this.textView.animateText(text)
+        binding.textView.animateText(text)
     }
 
     fun setText(text: String) {
-        this.textView.text = text
+        binding.textView.text = text
     }
 
     fun setHasMoreContent(hasMoreContent: Boolean) {
-        continueIndicator.visibility = if (hasMoreContent) View.VISIBLE else View.GONE
+        binding.continueIndicator.visibility = if (hasMoreContent) View.VISIBLE else View.GONE
     }
 
     fun setShowNextListener(listener: ShowNextListener) {
@@ -64,8 +53,8 @@ class SpeechBubbleView(context: Context, attrs: AttributeSet) : FrameLayout(cont
     }
 
     override fun onClick(v: View) {
-        if (textView.isAnimating) {
-            textView.stopTextAnimation()
+        if (binding.textView.isAnimating) {
+            binding.textView.stopTextAnimation()
         } else {
             showNextListener?.showNextStep()
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
index ff35de31c..91dfffe84 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
@@ -3,20 +3,13 @@ package com.habitrpg.android.habitica.ui
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.FrameLayout
-import android.widget.RelativeLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.OverlayTutorialBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.TutorialStep
-import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class TutorialView(context: Context, var step: TutorialStep, var onReaction: OnTutorialReaction?) : FrameLayout(context) {
-    private val speechBubbleView: SpeechBubbleView by bindView(R.id.speech_bubble)
-    private val background: RelativeLayout by bindView(R.id.background)
-    private val dismissButton: Button by bindView(R.id.dismissButton)
-    private val completeButton: Button by bindView(R.id.completeButton)
-
+    private val binding = OverlayTutorialBinding.inflate(context.layoutInflater, this, true)
     private var tutorialTexts: List<String> = emptyList()
     private var currentTextIndex: Int = 0
 
@@ -24,22 +17,21 @@ class TutorialView(context: Context, var step: TutorialStep, var onReaction: OnT
         get() = currentTextIndex == tutorialTexts.size - 1
 
     init {
-        inflate(R.layout.overlay_tutorial, true)
-        speechBubbleView.setConfirmationButtonVisibility(View.GONE)
-        speechBubbleView.setShowNextListener(object : SpeechBubbleView.ShowNextListener {
+        binding.speechBubbleView.setConfirmationButtonVisibility(View.GONE)
+        binding.speechBubbleView.setShowNextListener(object : SpeechBubbleView.ShowNextListener {
             override fun showNextStep() {
                 displayNextTutorialText()
             }
         })
 
-        completeButton.setOnClickListener { completeButtonClicked() }
-        dismissButton.setOnClickListener { dismissButtonClicked() }
-        background.setOnClickListener { backgroundClicked() }
+        binding.speechBubbleView.binding.completeButton.setOnClickListener { completeButtonClicked() }
+        binding.speechBubbleView.binding.dismissButton.setOnClickListener { dismissButtonClicked() }
+        binding.background.setOnClickListener { backgroundClicked() }
     }
 
     fun setTutorialText(text: String) {
-        this.speechBubbleView.animateText(text)
-        speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE)
+        binding.speechBubbleView.animateText(text)
+        binding.speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE)
     }
 
     fun setTutorialTexts(texts: List<String>) {
@@ -49,18 +41,18 @@ class TutorialView(context: Context, var step: TutorialStep, var onReaction: OnT
     }
 
     fun setCanBeDeferred(canBeDeferred: Boolean) {
-        dismissButton.visibility = if (canBeDeferred) View.VISIBLE else View.GONE
+        binding.speechBubbleView.binding.dismissButton.visibility = if (canBeDeferred) View.VISIBLE else View.GONE
     }
 
     private fun displayNextTutorialText() {
         currentTextIndex++
         if (currentTextIndex < tutorialTexts.size) {
-            speechBubbleView.animateText(tutorialTexts[currentTextIndex])
+            binding.speechBubbleView.animateText(tutorialTexts[currentTextIndex])
             if (isDisplayingLastStep) {
-                speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE)
-                speechBubbleView.setHasMoreContent(false)
+                binding.speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE)
+                binding.speechBubbleView.setHasMoreContent(false)
             } else {
-                speechBubbleView.setHasMoreContent(true)
+                binding.speechBubbleView.setHasMoreContent(true)
             }
         } else {
             this.onReaction?.onTutorialCompleted(this.step)
@@ -78,7 +70,7 @@ class TutorialView(context: Context, var step: TutorialStep, var onReaction: OnT
     }
 
     private fun backgroundClicked() {
-        speechBubbleView.onClick(speechBubbleView)
+        binding.speechBubbleView.onClick(binding.speechBubbleView)
     }
 
     interface OnTutorialReaction {
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/AddTaskWidgetActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt
index 93819e3e5..a6fcdd5d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt
@@ -5,27 +5,23 @@ import android.appwidget.AppWidgetManager
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.preference.PreferenceManager
-import android.widget.Button
 import androidx.core.content.edit
-import com.habitrpg.android.habitica.R
+import androidx.preference.PreferenceManager
+import com.habitrpg.android.habitica.databinding.WidgetConfigureAddTaskBinding
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider
 
 class AddTaskWidgetActivity : AppCompatActivity() {
 
     private var widgetId: Int = 0
 
-    private val addHabitButton: Button by bindView(R.id.add_habit_button)
-    private val addDailyButton: Button by bindView(R.id.add_daily_button)
-    private val addToDoButton: Button by bindView(R.id.add_todo_button)
-    private val addRewardButton: Button by bindView(R.id.add_reward_button)
+    private lateinit var binding: WidgetConfigureAddTaskBinding
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(Activity.RESULT_CANCELED)
-        setContentView(R.layout.widget_configure_add_task)
+        binding = WidgetConfigureAddTaskBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         val intent = intent
         val extras = intent.extras
@@ -39,10 +35,10 @@ class AddTaskWidgetActivity : AppCompatActivity() {
             finish()
         }
 
-        addHabitButton.setOnClickListener { addHabitSelected() }
-        addDailyButton.setOnClickListener { addDailySelected() }
-        addToDoButton.setOnClickListener { addToDoSelected() }
-        addRewardButton.setOnClickListener { addRewardSelected() }
+        binding.addHabitButton.setOnClickListener { addHabitSelected() }
+        binding.addDailyButton.setOnClickListener { addDailySelected() }
+        binding.addTodoButton.setOnClickListener { addToDoSelected() }
+        binding.addRewardButton.setOnClickListener { addRewardSelected() }
     }
 
     private fun addHabitSelected() {
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..c989e9fda 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
@@ -4,7 +4,6 @@ import android.graphics.Paint
 import android.graphics.PorterDuff
 import android.os.Build
 import android.os.Bundle
-import android.text.Html
 import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
@@ -15,10 +14,10 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.ActivityAdventureGuideBinding
 import com.habitrpg.android.habitica.databinding.AdventureGuideItemBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 
@@ -66,11 +65,7 @@ class AdventureGuideActivity : BaseActivity() {
         )
 
         val descriptionText = getString(R.string.adventure_guide_description)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            binding.descriptionView.setText(Html.fromHtml(descriptionText,  Html.FROM_HTML_MODE_LEGACY), TextView.BufferType.SPANNABLE)
-        } else {
-            binding.descriptionView.setText(Html.fromHtml(descriptionText), TextView.BufferType.SPANNABLE)
-        }
+        binding.descriptionView.setText(descriptionText.fromHtml(), TextView.BufferType.SPANNABLE)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -85,7 +80,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 +113,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..5076d00a9 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,18 @@
 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.content.res.Resources
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
+import android.view.MenuItem
 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,10 +20,12 @@ 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.extensions.updateStatusBarColor
 import com.habitrpg.android.habitica.helpers.LanguageHelper
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
@@ -37,11 +34,15 @@ import java.util.*
 abstract class BaseActivity : AppCompatActivity() {
 
     private var currentTheme: String? = null
+    private var isNightMode: Boolean = false
     internal var forcedTheme: String? = null
+    internal var forcedIsNight: Boolean? = null
     private var destroyed: Boolean = false
 
     open var overrideModernHeader: Boolean? = null
 
+    internal var toolbar: Toolbar? = null
+
     protected abstract fun getLayoutResId(): Int
 
     open fun getContentView(): View {
@@ -62,13 +63,15 @@ abstract class BaseActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         val languageHelper = LanguageHelper(sharedPreferences.getString("language", "en"))
-        Locale.setDefault(languageHelper.locale)
-        val configuration = Configuration()
-        configuration.setLocale(languageHelper.locale)
-        resources.updateConfiguration(configuration, resources.displayMetrics)
+        resources.forceLocale(languageHelper.locale)
+        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)
@@ -87,6 +90,7 @@ abstract class BaseActivity : AppCompatActivity() {
         loadTheme(PreferenceManager.getDefaultSharedPreferences(this))
     }
 
+
     override fun onPause() {
         isActivityVisible = false
         super.onPause()
@@ -99,32 +103,55 @@ abstract class BaseActivity : AppCompatActivity() {
         super.onStop()
     }
 
-    private fun loadTheme(sharedPreferences: SharedPreferences) {
-        val theme = if (forcedTheme != null) {
-            forcedTheme
-        } else {
-            sharedPreferences.getString("theme_name", "purple")
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                return true
+            }
         }
+        return super.onOptionsItemSelected(item)
+    }
+
+    internal open 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 (forcedIsNight ?: 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
+                    "taskform" -> R.style.MainAppTheme_TaskForm
+                    else -> R.style.MainAppTheme
+                })
+            }
         }
-        window.navigationBarColor = getThemeColor(R.attr.colorPrimaryDark)
-        if (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
+
+        window.navigationBarColor = if (forcedIsNight ?: isNightMode) {
+            ContextCompat.getColor(this, R.color.system_bars)
         } else {
-            window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
-            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
+            getThemeColor(R.attr.colorPrimaryDark)
+        }
+        if (!(forcedIsNight ?: isNightMode) && modernHeaderStyle) {
+            window.updateStatusBarColor(getThemeColor(R.attr.headerBackgroundColor), true)
+        } else {
+            window.updateStatusBarColor(getThemeColor(R.attr.statusBarBackground), false)
         }
 
         if (currentTheme != null && theme != currentTheme) {
@@ -137,6 +164,7 @@ abstract class BaseActivity : AppCompatActivity() {
     protected abstract fun injectActivity(component: UserComponent?)
 
     protected fun setupToolbar(toolbar: Toolbar?) {
+        this.toolbar = toolbar
         if (toolbar != null) {
             setSupportActionBar(toolbar)
 
@@ -152,6 +180,12 @@ abstract class BaseActivity : AppCompatActivity() {
         toolbar?.let { ToolbarColorHelper.colorizeToolbar(it, this, overrideModernHeader) }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        val ret = super.onCreateOptionsMenu(menu)
+        toolbar?.let { ToolbarColorHelper.colorizeToolbar(it, this, overrideModernHeader) }
+        return ret
+    }
+
     override fun onDestroy() {
         destroyed = true
 
@@ -161,6 +195,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)
@@ -176,3 +220,10 @@ abstract class BaseActivity : AppCompatActivity() {
         startActivity(intent)
     }
 }
+
+private fun Resources.forceLocale(locale: Locale) {
+    Locale.setDefault(locale)
+    val configuration = Configuration()
+    configuration.setLocale(locale)
+    updateConfiguration(configuration, displayMetrics)
+}
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..6bb7d5eb6 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
@@ -7,17 +7,21 @@ import android.content.Intent
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.*
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.EditText
 import androidx.appcompat.widget.AppCompatCheckedTextView
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.appcompat.widget.Toolbar
-import com.google.android.material.textfield.TextInputLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.ActivityCreateChallengeBinding
+import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
@@ -25,33 +29,24 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragmentDirections
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
-import io.reactivex.rxkotlin.zipWith
+import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.lang.NumberFormatException
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Named
 
 class ChallengeFormActivity : BaseActivity() {
 
-    private val createChallengeTitleInputLayout: TextInputLayout by bindView(R.id.create_challenge_title_input_layout)
-    private val createChallengeTitle: EditText by bindView(R.id.create_challenge_title)
-    private val createChallengeDescription: EditText by bindView(R.id.create_challenge_description)
-    private val createChallengePrize: EditText by bindView(R.id.create_challenge_prize)
-    private val createChallengeTagInputLayout: TextInputLayout by bindView(R.id.create_challenge_tag_input_layout)
-    private val createChallengeTag: EditText by bindView(R.id.create_challenge_tag)
-    private val createChallengeGemError: TextView by bindView(R.id.create_challenge_gem_error)
-    private val createChallengeTaskError: TextView by bindView(R.id.create_challenge_task_error)
-    private val challengeLocationSpinner: Spinner by bindView(R.id.challenge_location_spinner)
-    private val challengeAddGemBtn: Button by bindView(R.id.challenge_add_gem_btn)
-    private val challengeRemoveGemBtn: Button by bindView(R.id.challenge_remove_gem_btn)
-    private val createChallengeTaskList: androidx.recyclerview.widget.RecyclerView by bindView(R.id.create_challenge_task_list)
-    private val gemIconView: ImageView by bindView(R.id.gem_icon)
-    private val challengeCreationViews: ViewGroup by bindView(R.id.challenge_creation_views)
+
+    private lateinit var binding: ActivityCreateChallengeBinding
 
     @Inject
     internal lateinit var challengeRepository: ChallengeRepository
@@ -83,11 +78,16 @@ class ChallengeFormActivity : BaseActivity() {
 
     private var savingInProgress = false
 
+    override fun getContentView(): View {
+        binding = ActivityCreateChallengeBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     private val challengeData: Challenge
         get() {
             val c = Challenge()
 
-            val locationPos = challengeLocationSpinner.selectedItemPosition
+            val locationPos = binding.challengeLocationSpinner.selectedItemPosition
 
             if (challengeId != null) {
                 c.id = challengeId
@@ -96,15 +96,17 @@ class ChallengeFormActivity : BaseActivity() {
             if (groupID != null) {
                 c.groupId = groupID
             } else {
-                val locationGroup = locationAdapter.getItem(locationPos)
-                if (locationGroup != null) {
-                    c.groupId = locationGroup.id
+                if (locationAdapter.count > locationPos) {
+                    val locationGroup = locationAdapter.getItem(locationPos)
+                    if (locationGroup != null) {
+                        c.groupId = locationGroup.id
+                    }
                 }
             }
-            c.name = createChallengeTitle.text.toString()
-            c.description = createChallengeDescription.text.toString()
-            c.shortName = createChallengeTag.text.toString()
-            c.prize = Integer.parseInt(createChallengePrize.text.toString())
+            c.name = binding.createChallengeTitle.text.toString()
+            c.description = binding.createChallengeDescription.text.toString()
+            c.shortName = binding.createChallengeTag.text.toString()
+            c.prize = Integer.parseInt(binding.createChallengePrize.text.toString())
 
             return c
         }
@@ -117,11 +119,12 @@ class ChallengeFormActivity : BaseActivity() {
         component?.inject(this)
     }
 
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         inflater.inflate(R.menu.menu_create_challenge, menu)
         findViewById<Toolbar>(R.id.toolbar).let { ToolbarColorHelper.colorizeToolbar(it, this, overrideModernHeader) }
-        return true
+        return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -136,11 +139,22 @@ class ChallengeFormActivity : BaseActivity() {
                 createChallenge()
             }
 
-            compositeSubscription.add(observable.subscribe({
-                dialog.dismiss()
-                savingInProgress = false
-                finish()
-            }, { throwable ->
+            compositeSubscription.add(observable
+                    .flatMap {
+                        challengeId = it.id
+                        challengeRepository.retrieveChallenges(0, true)
+                    }
+                    .subscribe({
+                        dialog.dismiss()
+                        savingInProgress = false
+                        finish()
+                        if (!editMode) {
+                            GlobalScope.launch(context = Dispatchers.Main) {
+                                delay(500L)
+                                MainNavigationController.navigate(ChallengesOverviewFragmentDirections.openChallengeDetail(challengeId ?: ""))
+                            }
+                        }
+                    }, { throwable ->
                 dialog.dismiss()
                 savingInProgress = false
                 RxErrorHandler.reportError(throwable)
@@ -169,21 +183,21 @@ class ChallengeFormActivity : BaseActivity() {
     private fun validateAllFields(): Boolean {
         val errorMessages = ArrayList<String>()
 
-        if (getEditTextString(createChallengeTitle).isEmpty()) {
+        if (getEditTextString(binding.createChallengeTitle).isEmpty()) {
             val titleEmptyError = getString(R.string.challenge_create_error_title)
-            createChallengeTitleInputLayout.error = titleEmptyError
+            binding.createChallengeTitleInputLayout.error = titleEmptyError
             errorMessages.add(titleEmptyError)
         } else {
-            createChallengeTitleInputLayout.isErrorEnabled = false
+            binding.createChallengeTitleInputLayout.isErrorEnabled = false
         }
 
-        if (getEditTextString(createChallengeTag).isEmpty()) {
+        if (getEditTextString(binding.createChallengeTag).isEmpty()) {
             val tagEmptyError = getString(R.string.challenge_create_error_tag)
 
-            createChallengeTagInputLayout.error = tagEmptyError
+            binding.createChallengeTagInputLayout.error = tagEmptyError
             errorMessages.add(tagEmptyError)
         } else {
-            createChallengeTagInputLayout.isErrorEnabled = false
+            binding.createChallengeTagInputLayout.isErrorEnabled = false
         }
 
         val prizeError = checkPrizeAndMinimumForTavern()
@@ -194,14 +208,15 @@ class ChallengeFormActivity : BaseActivity() {
 
         // all "Add {*}"-Buttons are one task itself, so we need atleast more than 4
         if (challengeTasks.taskList.size <= 4) {
-            createChallengeTaskError.visibility = View.VISIBLE
+            binding.createChallengeTaskError.visibility = View.VISIBLE
             errorMessages.add(getString(R.string.challenge_create_error_no_tasks))
         } else {
-            createChallengeTaskError.visibility = View.GONE
+            binding.createChallengeTaskError.visibility = View.GONE
         }
         if (errorMessages.count() > 0) {
             val alert = HabiticaAlertDialog(this)
             alert.setMessage(errorMessages.joinToString("\n"))
+            alert.addCloseButton(true)
             alert.enqueue()
         }
         return errorMessages.size == 0
@@ -216,7 +231,7 @@ class ChallengeFormActivity : BaseActivity() {
         val intent = intent
         val bundle = intent.extras
 
-        challengeTasks = ChallengeTasksRecyclerViewAdapter(null, 0, this, "", null, false, true)
+        challengeTasks = ChallengeTasksRecyclerViewAdapter(null, 0, this, "", false, true)
         compositeSubscription.add(challengeTasks.taskOpenEvents.subscribe {
             if (it.isValid) {
                 openNewTaskActivity(it.type, it)
@@ -234,11 +249,11 @@ class ChallengeFormActivity : BaseActivity() {
             fillControlsByChallenge()
         }
 
-        compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer { this.user = it }, RxErrorHandler.handleEmptyError()))
-        gemIconView.setImageBitmap(HabiticaIconsHelper.imageOfGem())
+        compositeSubscription.add(userRepository.getUser(userId).subscribe({ this.user = it }, RxErrorHandler.handleEmptyError()))
+        binding.gemIconView.setImageBitmap(HabiticaIconsHelper.imageOfGem())
 
-        challengeAddGemBtn.setOnClickListener { onAddGem() }
-        challengeRemoveGemBtn.setOnClickListener { onRemoveGem() }
+        binding.challengeAddGemBtn.setOnClickListener { onAddGem() }
+        binding.challengeRemoveGemBtn.setOnClickListener { onRemoveGem() }
     }
 
 
@@ -249,27 +264,27 @@ class ChallengeFormActivity : BaseActivity() {
     }
 
     private fun onAddGem() {
-        var stringValue = createChallengePrize.text.toString()
+        var stringValue = binding.createChallengePrize.text.toString()
         if (stringValue.isEmpty()) {
             stringValue = "0"
         }
         var currentVal = Integer.parseInt(stringValue)
         currentVal++
 
-        createChallengePrize.setText(currentVal.toString())
+        binding.createChallengePrize.setText(currentVal.toString())
 
         checkPrizeAndMinimumForTavern()
     }
 
     private fun onRemoveGem() {
-        var stringValue = createChallengePrize.text.toString()
+        var stringValue = binding.createChallengePrize.text.toString()
         if (stringValue.isEmpty()) {
             stringValue = "0"
         }
         var currentVal = Integer.parseInt(stringValue)
         currentVal--
 
-        createChallengePrize.setText(currentVal.toString())
+        binding.createChallengePrize.setText(currentVal.toString())
 
         checkPrizeAndMinimumForTavern()
     }
@@ -277,34 +292,38 @@ class ChallengeFormActivity : BaseActivity() {
     private fun checkPrizeAndMinimumForTavern(): String {
         var errorResult = ""
 
-        var inputValue = createChallengePrize.text.toString()
+        var inputValue = binding.createChallengePrize.text.toString()
 
         if (inputValue.isEmpty()) {
             inputValue = "0"
         }
 
-        val currentVal = Integer.parseInt(inputValue)
+        val currentVal = try {
+            Integer.parseInt(inputValue)
+        } catch (_: NumberFormatException) {
+            0
+        }
 
         // 0 is Tavern
-        val selectedLocation = challengeLocationSpinner.selectedItemPosition
+        val selectedLocation = binding.challengeLocationSpinner.selectedItemPosition
 
         val gemCount = user?.gemCount?.toDouble() ?: 0.toDouble()
 
         if (selectedLocation == 0 && currentVal == 0) {
-            createChallengeGemError.visibility = View.VISIBLE
+            binding.createChallengeGemError.visibility = View.VISIBLE
             val error = getString(R.string.challenge_create_error_tavern_one_gem)
-            createChallengeGemError.text = error
+            binding.createChallengeGemError.text = error
             errorResult = error
         } else if (currentVal > gemCount) {
-            createChallengeGemError.visibility = View.VISIBLE
+            binding.createChallengeGemError.visibility = View.VISIBLE
             val error = getString(R.string.challenge_create_error_enough_gems)
-            createChallengeGemError.text = error
+            binding.createChallengeGemError.text = error
             errorResult = error
         } else {
-            createChallengeGemError.visibility = View.GONE
+            binding.createChallengeGemError.visibility = View.GONE
         }
 
-        challengeRemoveGemBtn.isEnabled = currentVal != 0
+        binding.challengeRemoveGemBtn.isEnabled = currentVal != 0
 
         return errorResult
     }
@@ -324,15 +343,15 @@ class ChallengeFormActivity : BaseActivity() {
 
         locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         compositeSubscription.add(socialRepository.getUserGroups("guild").zipWith(userRepository.getUser()
-                .map { "" }
+                .map { it.party?.id ?: "" }
                 .distinctUntilChanged()
                 .flatMap {
                     if (it.isBlank()) {
                         return@flatMap Flowable.empty<Group>()
                     }
                     socialRepository.retrieveGroup(it)
-                })
-                .subscribe(Consumer { groups ->
+                }, { user, groups -> Pair(user, groups) })
+                .subscribe({ groups ->
             val mutableGroups = groups.first.toMutableList()
             if (groups.first.firstOrNull { it.id == "00000000-0000-4000-A000-000000000000" } == null) {
                 val tavern = Group()
@@ -347,15 +366,15 @@ class ChallengeFormActivity : BaseActivity() {
             locationAdapter.addAll(mutableGroups)
         }, RxErrorHandler.handleEmptyError()))
 
-        challengeLocationSpinner.adapter = locationAdapter
-        challengeLocationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        binding.challengeLocationSpinner.adapter = locationAdapter
+        binding.challengeLocationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
                 checkPrizeAndMinimumForTavern()
             }
 
             override fun onNothingSelected(adapterView: AdapterView<*>) { /* no-on */ }
         }
-        createChallengePrize.setOnKeyListener { _, _, _ ->
+        binding.createChallengePrize.setOnKeyListener { _, _, _ ->
             checkPrizeAndMinimumForTavern()
 
             false
@@ -374,7 +393,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)
@@ -383,38 +402,38 @@ class ChallengeFormActivity : BaseActivity() {
             }
         }, RxErrorHandler.handleEmptyError()))
 
-        createChallengeTaskList.addOnItemTouchListener(object : androidx.recyclerview.widget.RecyclerView.SimpleOnItemTouchListener() {
+        binding.createChallengeTaskList.addOnItemTouchListener(object : androidx.recyclerview.widget.RecyclerView.SimpleOnItemTouchListener() {
             override fun onInterceptTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent): Boolean {
                 // Stop only scrolling.
                 return rv.scrollState == androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING
             }
         })
-        createChallengeTaskList.adapter = challengeTasks
-        createChallengeTaskList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
+        binding.createChallengeTaskList.adapter = challengeTasks
+        binding.createChallengeTaskList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
     }
 
     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)
-                createChallengeDescription.setText(challenge.description)
-                createChallengeTag.setText(challenge.shortName)
-                createChallengePrize.setText(challenge.prize.toString())
-                challengeCreationViews.visibility = View.GONE
+                binding.createChallengeTitle.setText(challenge.name)
+                binding.createChallengeDescription.setText(challenge.description)
+                binding.createChallengeTag.setText(challenge.shortName)
+                binding.createChallengePrize.setText(challenge.prize.toString())
+                binding.challengeCreationViews.visibility = View.GONE
 
                 for (i in 0 until locationAdapter.count) {
                     val group = locationAdapter.getItem(i)
 
                     if (group != null && challenge.groupId == group.id) {
-                        challengeLocationSpinner.setSelection(i)
+                        binding.challengeLocationSpinner.setSelection(i)
                         break
                     }
                 }
                 checkPrizeAndMinimumForTavern()
             }, RxErrorHandler.handleEmptyError())
-            challengeRepository.getChallengeTasks(it).subscribe(Consumer { tasks ->
+            challengeRepository.getChallengeTasks(it).subscribe({ tasks ->
                 tasks.forEach { task ->
                     addOrUpdateTaskInList(task, true)
                 }
@@ -498,7 +517,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 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..1ab0b3682 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
@@ -7,26 +7,23 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
 import android.widget.TextView
-import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.navigation.navArgs
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.ActivityClassSelectionBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.*
-import com.habitrpg.android.habitica.ui.AvatarView
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 
 class ClassSelectionActivity : BaseActivity(), Consumer<User> {
 
+    private lateinit var binding: ActivityClassSelectionBinding
     private var currentClass: String? = null
     private var newClass: String = "healer"
     set(value) {
@@ -42,32 +39,13 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
     private var className: String? = null
     set(value) {
         field = value
-        selectedTitleTextView.text = getString(R.string.x_class, className)
-        selectedButton.text = getString(R.string.become_x, className)
+        binding.selectedTitleTextView.text = getString(R.string.x_class, className)
+        binding.selectedButton.text = getString(R.string.become_x, className)
     }
     private var isInitialSelection: Boolean = false
     private var classWasUnset: Boolean? = false
     private var shouldFinish: Boolean? = false
 
-    private val toolbar: Toolbar by bindView(R.id.toolbar)
-    private val healerAvatarView: AvatarView by bindView(R.id.healerAvatarView)
-    private val healerWrapper: View by bindView(R.id.healerWrapper)
-    private val healerButton: TextView by bindView(R.id.healerButton)
-    private val mageAvatarView: AvatarView by bindView(R.id.mageAvatarView)
-    private val mageWrapper: View by bindView(R.id.mageWrapper)
-    private val mageButton: TextView by bindView(R.id.mageButton)
-    private val rogueAvatarView: AvatarView by bindView(R.id.rogueAvatarView)
-    private val rogueWrapper: View by bindView(R.id.rogueWrapper)
-    private val rogueButton: TextView by bindView(R.id.rogueButton)
-    private val warriorAvatarView: AvatarView by bindView(R.id.warriorAvatarView)
-    private val warriorWrapper: View by bindView(R.id.warriorWrapper)
-    private val warriorButton: TextView by bindView(R.id.warriorButton)
-
-    private val selectedWrapperView: ViewGroup by bindView(R.id.selected_wrapper)
-    private val selectedTitleTextView: TextView by bindView(R.id.selected_title_textview)
-    private val selectedDescriptionTextView: TextView by bindView(R.id.selected_description_textview)
-    private val selectedButton: Button by bindView(R.id.selected_button)
-
     @Inject
     lateinit var userRepository: UserRepository
 
@@ -78,9 +56,14 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         return R.layout.activity_class_selection
     }
 
+    override fun getContentView(): View {
+        binding = ActivityClassSelectionBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
@@ -88,7 +71,9 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         isInitialSelection = args.isInitialSelection
         currentClass = args.className
 
-        compositeSubscription.add(userRepository.getUser().firstElement().subscribe(Consumer {
+        newClass = currentClass ?: "healer"
+
+        compositeSubscription.add(userRepository.getUser().firstElement().subscribe({
             it.preferences?.let {preferences ->
                 val unmanagedPrefs = userRepository.getUnmanagedCopy(preferences)
                 unmanagedPrefs.costume = false
@@ -98,19 +83,14 @@ 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" }
-        mageWrapper.setOnClickListener { newClass = "wizard" }
-        rogueWrapper.setOnClickListener { newClass = "rogue" }
-        warriorWrapper.setOnClickListener { newClass = "warrior" }
-        selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        newClass = currentClass ?: "healer"
+        binding.healerWrapper.setOnClickListener { newClass = "healer" }
+        binding.mageWrapper.setOnClickListener { newClass = "wizard" }
+        binding.rogueWrapper.setOnClickListener { newClass = "rogue" }
+        binding.warriorWrapper.setOnClickListener { newClass = "warrior" }
+        binding.selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
     }
 
 
@@ -120,7 +100,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)
@@ -133,18 +113,18 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         healerOutfit.shield = "shield_healer_5"
         healerOutfit.weapon = "weapon_healer_6"
         val healer = this.makeUser(preferences, healerOutfit)
-        healerAvatarView.setAvatar(healer)
+        binding.healerAvatarView.setAvatar(healer)
         val healerIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfHealerLightBg())
-        healerButton.setCompoundDrawablesWithIntrinsicBounds(healerIcon, null, null, null)
+        binding.healerButton.setCompoundDrawablesWithIntrinsicBounds(healerIcon, null, null, null)
 
         val mageOutfit = Outfit()
         mageOutfit.armor = "armor_wizard_5"
         mageOutfit.head = "head_wizard_5"
         mageOutfit.weapon = "weapon_wizard_6"
         val mage = this.makeUser(preferences, mageOutfit)
-        mageAvatarView.setAvatar(mage)
+        binding.mageAvatarView.setAvatar(mage)
         val mageIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfMageLightBg())
-        mageButton.setCompoundDrawablesWithIntrinsicBounds(mageIcon, null, null, null)
+        binding.mageButton.setCompoundDrawablesWithIntrinsicBounds(mageIcon, null, null, null)
 
         val rogueOutfit = Outfit()
         rogueOutfit.armor = "armor_rogue_5"
@@ -152,9 +132,9 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         rogueOutfit.shield = "shield_rogue_6"
         rogueOutfit.weapon = "weapon_rogue_6"
         val rogue = this.makeUser(preferences, rogueOutfit)
-        rogueAvatarView.setAvatar(rogue)
+        binding.rogueAvatarView.setAvatar(rogue)
         val rogueIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfRogueLightBg())
-        rogueButton.setCompoundDrawablesWithIntrinsicBounds(rogueIcon, null, null, null)
+        binding.rogueButton.setCompoundDrawablesWithIntrinsicBounds(rogueIcon, null, null, null)
 
         val warriorOutfit = Outfit()
         warriorOutfit.armor = "armor_warrior_5"
@@ -162,9 +142,9 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         warriorOutfit.shield = "shield_warrior_5"
         warriorOutfit.weapon = "weapon_warrior_6"
         val warrior = this.makeUser(preferences, warriorOutfit)
-        warriorAvatarView.setAvatar(warrior)
+        binding.warriorAvatarView.setAvatar(warrior)
         val warriorIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfWarriorLightBg())
-        warriorButton.setCompoundDrawablesWithIntrinsicBounds(warriorIcon, null, null, null)
+        binding.warriorButton.setCompoundDrawablesWithIntrinsicBounds(warriorIcon, null, null, null)
     }
 
     override fun injectActivity(component: UserComponent?) {
@@ -182,50 +162,50 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
 
     private fun healerSelected() {
         className = getString(R.string.healer)
-        selectedDescriptionTextView.text = getString(R.string.healer_description)
-        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.yellow_100))
-        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))
+        binding.selectedDescriptionTextView.text = getString(R.string.healer_description)
+        binding.selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.yellow_100))
+        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.dark_brown))
+        binding.selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.dark_brown))
+        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_yellow_10)
+        updateButtonBackgrounds(binding.healerButton, ContextCompat.getDrawable(this,R.drawable.layout_rounded_bg_window_yellow_border))
     }
 
     private fun mageSelected() {
         className = getString(R.string.mage)
-        selectedDescriptionTextView.text = getString(R.string.mage_description)
-        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.blue_10))
-        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))
+        binding.selectedDescriptionTextView.text = getString(R.string.mage_description)
+        binding.selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.blue_10))
+        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
+        updateButtonBackgrounds(binding.mageButton, ContextCompat.getDrawable(this,R.drawable.layout_rounded_bg_window_blue_border))
     }
 
     private fun rogueSelected() {
         className = getString(R.string.rogue)
-        selectedDescriptionTextView.text = getString(R.string.rogue_description)
-        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.brand_200))
-        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))
+        binding.selectedDescriptionTextView.text = getString(R.string.rogue_description)
+        binding.selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.brand_200))
+        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
+        updateButtonBackgrounds(binding.rogueButton, ContextCompat.getDrawable(this,R.drawable.layout_rounded_bg_window_brand_border))
     }
 
     private fun warriorSelected() {
         className = getString(R.string.warrior)
-        selectedDescriptionTextView.text = getString(R.string.warrior_description)
-        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.maroon_50))
-        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))
+        binding.selectedDescriptionTextView.text = getString(R.string.warrior_description)
+        binding.selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.maroon_50))
+        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
+        updateButtonBackgrounds(binding.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)
-        healerButton.background = if (healerButton == selectedButton) background else deselectedBackground
-        mageButton.background = if (mageButton == selectedButton) background else deselectedBackground
-        rogueButton.background = if (rogueButton == selectedButton) background else deselectedBackground
-        warriorButton.background = if (warriorButton == selectedButton) background else deselectedBackground
+        val deselectedBackground = ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window)
+        binding.healerButton.background = if (binding.healerButton == selectedButton) background else deselectedBackground
+        binding.mageButton.background = if (binding.mageButton == selectedButton) background else deselectedBackground
+        binding.rogueButton.background = if (binding.rogueButton == selectedButton) background else deselectedBackground
+        binding.warriorButton.background = if (binding.warriorButton == selectedButton) background else deselectedBackground
     }
 
     private fun optOutSelected() {
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..79f86bd6d 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
@@ -12,14 +12,12 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.ActivityFixcharacterBinding
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.activity_fixcharacter.*
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -49,7 +47,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,19 +55,18 @@ 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())
         binding.manaIconView.setImageBitmap(HabiticaIconsHelper.imageOfMagic())
         binding.goldIconView.setImageBitmap(HabiticaIconsHelper.imageOfGold())
-        binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
         binding.streakIconView.setImageResource(R.drawable.achievement_thermometer)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_save, menu)
-        return true
+        return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -85,7 +82,9 @@ 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(userInfo)
+                    .flatMap { repository.retrieveUser(false, true, true) }
+                    .subscribe({}, RxErrorHandler.handleEmptyError(), {
                 progressDialog.dismiss()
                 finish()
             }))
@@ -114,19 +113,19 @@ class FixCharacterValuesActivity: BaseActivity() {
 
         when (stats.habitClass) {
             Stats.WARRIOR -> {
-                setIconBackground(levelIconBackgroundView, ContextCompat.getColor(this, R.color.red_500))
+                setIconBackground(binding.levelIconBackgroundView, ContextCompat.getColor(this, R.color.red_500))
                 binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
             }
             Stats.MAGE -> {
-                setIconBackground(levelIconBackgroundView, ContextCompat.getColor(this, R.color.blue_500))
+                setIconBackground(binding.levelIconBackgroundView, ContextCompat.getColor(this, R.color.blue_500))
                 binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
             }
             Stats.HEALER -> {
-                setIconBackground(levelIconBackgroundView, ContextCompat.getColor(this, R.color.yellow_500))
+                setIconBackground(binding.levelIconBackgroundView, ContextCompat.getColor(this, R.color.yellow_500))
                 binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
             }
             Stats.ROGUE -> {
-                setIconBackground(levelIconBackgroundView, ContextCompat.getColor(this, R.color.brand_500))
+                setIconBackground(binding.levelIconBackgroundView, ContextCompat.getColor(this, R.color.brand_500))
                 binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
             }
         }
@@ -134,7 +133,7 @@ class FixCharacterValuesActivity: BaseActivity() {
 
     private fun setIconBackground(view: View, color: Int) {
         val backgroundDrawable = ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg)
-        backgroundDrawable?.setColorFilter(color, PorterDuff.Mode.MULTIPLY)
+        backgroundDrawable?.setTintWith(color, PorterDuff.Mode.MULTIPLY)
         backgroundDrawable?.alpha = 50
         view.background = backgroundDrawable
     }
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..cc354aab7 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
@@ -4,12 +4,13 @@ import android.content.Context
 import android.graphics.Typeface
 import android.os.Bundle
 import android.view.*
-import android.widget.*
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.appcompat.widget.Toolbar
+import android.widget.ProgressBar
+import android.widget.TableLayout
+import android.widget.TableRow
+import android.widget.TextView
+import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
-import androidx.core.widget.NestedScrollView
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.controller.BaseControllerListener
 import com.facebook.drawee.view.SimpleDraweeView
@@ -22,6 +23,7 @@ import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.ActivityFullProfileBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.UserStatComputer
@@ -33,17 +35,23 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
 import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter
-import com.habitrpg.android.habitica.ui.helpers.*
+import com.habitrpg.android.habitica.ui.fragments.social.InboxOverviewFragmentDirections
+import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
+import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
-import net.pherth.android.emoji_library.EmojiEditText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.*
 import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
 import kotlin.math.floor
 import kotlin.math.min
 
@@ -59,30 +67,6 @@ class FullProfileActivity : BaseActivity() {
     @Inject
     lateinit var userRepository: UserRepository
 
-    private val toolbar: Toolbar by bindView(R.id.toolbar)
-    private val profileImage: SimpleDraweeView by bindView(R.id.profile_image)
-    private val blurbTextView: TextView by bindView(R.id.profile_blurb)
-    private val attributesCardView: androidx.cardview.widget.CardView by bindView(R.id.profile_attributes_card)
-    private val attributesTableLayout: TableLayout by bindView(R.id.attributes_table)
-    private val attributesCollapseIcon: AppCompatImageView by bindView(R.id.attributes_collapse_icon)
-    private val equipmentTableLayout: TableLayout by bindView(R.id.equipment_table)
-    private val costumeTableLayout: TableLayout by bindView(R.id.costume_table)
-    private val costumeCard: androidx.cardview.widget.CardView by bindView(R.id.profile_costume_card)
-    private val scrollView: NestedScrollView by bindView(R.id.fullprofile_scrollview)
-    private val petsFoundCount: TextView by bindView(R.id.profile_pets_found_count)
-    private val mountsTamedCount: TextView by bindView(R.id.profile_mounts_tamed_count)
-    private val currentPetDrawee: SimpleDraweeView by bindView(R.id.current_pet_drawee)
-    private val currentMountDrawee: SimpleDraweeView by bindView(R.id.current_mount_drawee)
-    private val achievementCard: androidx.cardview.widget.CardView by bindView(R.id.profile_achievements_card)
-    private val achievementProgress: ProgressBar by bindView(R.id.avatar_achievements_progress)
-    private val achievementGroupList: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView)
-    private val joinedView: TextView by bindView(R.id.joined_view)
-    private val lastLoginView: TextView by bindView(R.id.last_login_view)
-    private val totalCheckinsView: TextView by bindView(R.id.total_checkins_view)
-    private val sendMessageButton: Button by bindView(R.id.send_message_button)
-    private val giftGemsButton: Button by bindView(R.id.gift_gems_button)
-    private val giftSubscriptionButton: Button by bindView(R.id.gift_subscription_button)
-
     private var userID = ""
     private var username: String? = null
     private var userDisplayName: String? = null
@@ -94,11 +78,12 @@ 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)
-        setupToolbar(toolbar)
+        setupToolbar(binding.toolbar)
 
         userID = intent?.extras?.getString("userID", "") ?: ""
         if (userID.isEmpty()) {
@@ -107,20 +92,23 @@ 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()
 
         binding.avatarWithBars.root.setBackgroundColor(ContextCompat.getColor(this, R.color.transparent))
+        binding.avatarWithBars.hpBar.barBackgroundColor = getThemeColor(R.color.content_background)
+        binding.avatarWithBars.xpBar.barBackgroundColor = getThemeColor(R.color.content_background)
+        binding.avatarWithBars.mpBar.barBackgroundColor = getThemeColor(R.color.content_background)
 
         attributeRows.clear()
-        attributesCardView.setOnClickListener { toggleAttributeDetails() }
+        binding.attributesCardView.setOnClickListener { toggleAttributeDetails() }
 
-        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 {
+        binding.sendMessageButton.setOnClickListener { showSendMessageToUserDialog() }
+        binding.giftGemsButton.setOnClickListener { MainNavigationController.navigate(R.id.giftGemsActivity, bundleOf(Pair("userID", userID), Pair("username", null))) }
+        binding.giftSubscriptionButton.setOnClickListener { MainNavigationController.navigate(R.id.giftSubscriptionActivity, bundleOf(Pair("userID", userID), Pair("username", null))) }
+        compositeSubscription.add(userRepository.getUser().subscribe({
             blocks = it.inbox?.blocks ?: listOf()
+            binding.blockedDisclaimerView.visibility = if (isUserBlocked()) View.VISIBLE else View.GONE
         }, RxErrorHandler.handleEmptyError()))
     }
 
@@ -129,19 +117,22 @@ class FullProfileActivity : BaseActivity() {
         super.onDestroy()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         inflater.inflate(R.menu.menu_full_profile, menu)
-        val item = menu?.findItem(R.id.block_user)
-        if (blocks.contains(userID)) {
+        val item = menu.findItem(R.id.block_user)
+        if (isUserBlocked()) {
             item?.title = getString(R.string.unblock_user)
         } else {
             item?.title = getString(R.string.block)
         }
-        findViewById<Toolbar>(R.id.toolbar).let { ToolbarColorHelper.colorizeToolbar(it, this, overrideModernHeader) }
         return super.onCreateOptionsMenu(menu)
     }
 
+    private fun isUserBlocked(): Boolean {
+        return blocks.contains(userID)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             android.R.id.home -> {
@@ -152,7 +143,7 @@ class FullProfileActivity : BaseActivity() {
                 val clipboard = this.getSystemService(Context.CLIPBOARD_SERVICE) as? android.content.ClipboardManager
                 val clip = android.content.ClipData.newPlainText(username, username)
                 clipboard?.setPrimaryClip(clip)
-                HabiticaSnackbar.showSnackbar(this@FullProfileActivity.scrollView.getChildAt(0) as ViewGroup,
+                HabiticaSnackbar.showSnackbar(this@FullProfileActivity.binding.scrollView.getChildAt(0) as ViewGroup,
                         String.format(getString(R.string.username_copied), userDisplayName), SnackbarDisplayType.NORMAL)
                 true
             }
@@ -160,7 +151,7 @@ class FullProfileActivity : BaseActivity() {
                 val clipboard = this.getSystemService(Context.CLIPBOARD_SERVICE) as? android.content.ClipboardManager
                 val clip = android.content.ClipData.newPlainText(userID, userID)
                 clipboard?.setPrimaryClip(clip)
-                HabiticaSnackbar.showSnackbar(this@FullProfileActivity.scrollView.getChildAt(0) as ViewGroup,
+                HabiticaSnackbar.showSnackbar(this@FullProfileActivity.binding.scrollView.getChildAt(0) as ViewGroup,
                         String.format(getString(R.string.id_copied), userDisplayName), SnackbarDisplayType.NORMAL)
                 true
             }
@@ -179,7 +170,7 @@ class FullProfileActivity : BaseActivity() {
     private fun useBlock() {
         compositeSubscription.add(socialRepository.blockMember(userID).flatMap {
             userRepository.retrieveUser()
-        }.subscribe(Consumer {
+        }.subscribe({
             invalidateOptionsMenu()
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -196,27 +187,11 @@ class FullProfileActivity : BaseActivity() {
     }
 
     private fun showSendMessageToUserDialog() {
-        val factory = LayoutInflater.from(this)
-        val newMessageView = factory.inflate(R.layout.profile_new_message_dialog, null)
-
-        val emojiEditText = newMessageView.findViewById<EmojiEditText>(R.id.edit_new_message_text)
-
-        val newMessageTitle = newMessageView.findViewById<TextView>(R.id.new_message_title)
-        newMessageTitle.text = String.format(getString(R.string.profile_send_message_to), userDisplayName)
-
-        val addMessageDialog = HabiticaAlertDialog(this)
-        addMessageDialog.addButton(android.R.string.ok, true) { _, _ ->
-                    socialRepository.postPrivateMessage(userID, emojiEditText.text.toString())
-                            .subscribe(Consumer {
-                                HabiticaSnackbar.showSnackbar(this@FullProfileActivity.scrollView.getChildAt(0) as ViewGroup,
-                                        String.format(getString(R.string.profile_message_sent_to), userDisplayName), SnackbarDisplayType.NORMAL)
-                            }, RxErrorHandler.handleEmptyError())
-
-                    dismissKeyboard()
-                }
-        addMessageDialog.addButton(android.R.string.cancel, false) { _, _ -> dismissKeyboard() }
-        addMessageDialog.setAdditionalContentView(newMessageView)
-        addMessageDialog.show()
+        finish()
+        GlobalScope.launch(context = Dispatchers.Main) {
+            delay(1000L)
+            MainNavigationController.navigate(R.id.inboxMessageListFragment, bundleOf(Pair("username", username), Pair("userID", userID)))
+        }
     }
 
     private fun updateView(user: Member) {
@@ -230,13 +205,13 @@ class FullProfileActivity : BaseActivity() {
 
         val imageUrl = profile.imageUrl
         if (imageUrl == null || imageUrl.isEmpty()) {
-            profileImage.visibility = View.GONE
+            binding.profileImage.visibility = View.GONE
         } else {
-            profileImage.controller = Fresco.newDraweeControllerBuilder()
+            binding.profileImage.controller = Fresco.newDraweeControllerBuilder()
                     .setUri(imageUrl)
                     .setControllerListener(object : BaseControllerListener<ImageInfo>() {
                         override fun onFailure(id: String?, throwable: Throwable?) {
-                            profileImage.visibility = View.GONE
+                            binding.profileImage.visibility = View.GONE
                         }
                     })
                     .build()
@@ -244,34 +219,34 @@ class FullProfileActivity : BaseActivity() {
 
         val blurbText = profile.blurb
         if (blurbText != null && blurbText.isNotEmpty()) {
-            blurbTextView.setMarkdown(blurbText)
+            binding.blurbTextView.setMarkdown(blurbText)
         }
 
-        user.authentication?.timestamps?.createdAt?.let { joinedView.text = dateFormatter.format(it) }
-        user.authentication?.timestamps?.lastLoggedIn?.let { lastLoginView.text = dateFormatter.format(it) }
-        totalCheckinsView.text = user.loginIncentives.toString()
+        user.authentication?.timestamps?.createdAt?.let { binding.joinedView.text = dateFormatter.format(it) }
+        user.authentication?.timestamps?.lastLoggedIn?.let { binding.lastLoginView.text = dateFormatter.format(it) }
+        binding.totalCheckinsView.text = user.loginIncentives.toString()
 
         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
+            binding.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) {
-        petsFoundCount.text = user.petsFoundCount.toString()
-        mountsTamedCount.text = user.mountsTamedCount.toString()
+        binding.petsFoundCount.text = user.petsFoundCount.toString()
+        binding.mountsTamedCount.text = user.mountsTamedCount.toString()
 
-        currentPetDrawee.loadImage("Pet-" + user.currentPet)
-        currentMountDrawee.loadImage("Mount_Icon_" + user.currentMount)
+        binding.currentPetDrawee.loadImage("Pet-" + user.currentPet)
+        binding.currentMountDrawee.loadImage("Mount_Icon_" + user.currentMount)
     }
 
     // endregion
@@ -301,16 +276,16 @@ class FullProfileActivity : BaseActivity() {
                 }
             }
         }
-        achievementGroupList.layoutManager = layoutManager
-        achievementGroupList.adapter = adapter
+        binding.achievementGroupList.layoutManager = layoutManager
+        binding.achievementGroupList.adapter = adapter
 
-        stopAndHideProgress(achievementProgress)
+        stopAndHideProgress(binding.achievementProgress)
     }
 
     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)
@@ -372,7 +347,6 @@ class FullProfileActivity : BaseActivity() {
 
     private fun addLevelAttributes(user: Member) {
         val byLevelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f)
-
         addAttributeRow(getString(R.string.profile_level), byLevelStat, byLevelStat, byLevelStat, byLevelStat, true, false)
     }
 
@@ -395,16 +369,16 @@ class FullProfileActivity : BaseActivity() {
         val userStatComputer = UserStatComputer()
         val statsRows = userStatComputer.computeClassBonus(equipmentList, user)
 
-        equipmentTableLayout.removeAllViews()
-        for (index in 1 until attributesTableLayout.childCount) {
-            attributesTableLayout.removeViewAt(index)
+        binding.equipmentTableLayout.removeAllViews()
+        for (index in 1 until binding.attributesTableLayout.childCount) {
+            binding.attributesTableLayout.removeViewAt(index)
         }
 
         addLevelAttributes(user)
 
         for (row in statsRows) {
             if (row is UserStatComputer.EquipmentRow) {
-                addEquipmentRow(equipmentTableLayout, row.gearKey, row.text, row.stats)
+                addEquipmentRow(binding.equipmentTableLayout, row.gearKey, row.text, row.stats)
             } else if (row is UserStatComputer.AttributeRow) {
                 addAttributeRow(getString(row.labelId), row.strVal, row.intVal, row.conVal, row.perVal, row.roundDown, row.summary)
             }
@@ -415,9 +389,9 @@ class FullProfileActivity : BaseActivity() {
 
     private fun gotCostume(obj: List<Equipment>) {
         // fill costume table
-        costumeTableLayout.removeAllViews()
+        binding.costumeTableLayout.removeAllViews()
         for (i in obj) {
-            addEquipmentRow(costumeTableLayout, i.key, i.text, "")
+            addEquipmentRow(binding.costumeTableLayout, i.key, i.text, "")
         }
     }
 
@@ -425,14 +399,15 @@ class FullProfileActivity : BaseActivity() {
         val buffs = stats.buffs
 
         addAttributeRow(getString(R.string.profile_allocated), stats.strength?.toFloat() ?: 0f, stats.intelligence?.toFloat() ?: 0f, stats.constitution?.toFloat() ?: 0f, stats.per?.toFloat() ?: 0f, true, false)
-        addAttributeRow(getString(R.string.buffs), buffs?.getStr() ?: 0f, buffs?.get_int() ?: 0f, buffs?.getCon() ?: 0f, buffs?.getPer() ?: 0f, roundDown = true, isSummary = false)
+        addAttributeRow(getString(R.string.buffs), buffs?.str
+                ?: 0f, buffs?._int ?: 0f, buffs?.con ?: 0f, buffs?.per ?: 0f, roundDown = true, isSummary = false)
 
         // Summary row
         addAttributeRow("", attributeStrSum, attributeIntSum, attributeConSum, attributePerSum, roundDown = false, isSummary = true)
     }
 
     private fun addAttributeRow(label: String, strVal: Float, intVal: Float, conVal: Float, perVal: Float, roundDown: Boolean, isSummary: Boolean) {
-        val tableRow = layoutInflater.inflate(R.layout.profile_attributetablerow, attributesTableLayout, false) as? TableRow ?: return
+        val tableRow = layoutInflater.inflate(R.layout.profile_attributetablerow, binding.attributesTableLayout, false) as? TableRow ?: return
         val keyTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_type)
         keyTextView?.text = label
 
@@ -463,14 +438,14 @@ class FullProfileActivity : BaseActivity() {
             tableRow.visibility = if (attributeDetailsHidden) View.GONE else View.VISIBLE
         }
 
-        attributesTableLayout.addView(tableRow)
+        binding.attributesTableLayout.addView(tableRow)
 
     }
 
     private fun toggleAttributeDetails() {
         attributeDetailsHidden = !attributeDetailsHidden
 
-        attributesCollapseIcon.setImageDrawable(ContextCompat.getDrawable(this, if (attributeDetailsHidden)
+        binding.attributesCollapseIcon.setImageDrawable(ContextCompat.getDrawable(this, if (attributeDetailsHidden)
             R.drawable.ic_keyboard_arrow_right_black_24dp
         else
             R.drawable.ic_keyboard_arrow_down_black_24dp))
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..a7de2a8f1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
@@ -15,7 +15,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.fragments.purchases.GemsPurchaseFragment
 import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment
-import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
 import javax.inject.Inject
 
@@ -27,7 +26,6 @@ class GemPurchaseActivity : BaseActivity() {
     lateinit var userRepository: UserRepository
 
     internal var fragment: CheckoutFragment? = null
-    var isActive = false
     var purchaseHandler: PurchaseHandler? = null
 
     override fun getLayoutResId(): Int {
@@ -75,16 +73,6 @@ class GemPurchaseActivity : BaseActivity() {
         purchaseHandler?.startListening()
     }
 
-    override fun onResume() {
-        super.onResume()
-        isActive = true
-    }
-
-    override fun onPause() {
-        super.onPause()
-        isActive = false
-    }
-
     public override fun onStop() {
         purchaseHandler?.stopListening()
         super.onStop()
@@ -114,9 +102,9 @@ class GemPurchaseActivity : BaseActivity() {
 
     @Subscribe
     fun onConsumablePurchased(event: ConsumablePurchasedEvent) {
-        if (isActive) {
+        if (isActivityVisible) {
             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..2b865a181 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
@@ -3,15 +3,14 @@ package com.habitrpg.android.habitica.ui.activities
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import androidx.appcompat.widget.Toolbar
+import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.navigation.navArgs
-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.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.ActivityGiftGemsBinding
 import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent
 import com.habitrpg.android.habitica.extensions.addOkButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
@@ -20,14 +19,14 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
 import javax.inject.Inject
 
 class GiftGemsActivity : BaseActivity() {
 
+    private lateinit var binding: ActivityGiftGemsBinding
+
     @Inject
     lateinit var crashlyticsProxy: CrashlyticsProxy
     @Inject
@@ -37,9 +36,6 @@ class GiftGemsActivity : BaseActivity() {
 
     private var purchaseHandler: PurchaseHandler? = null
 
-    private val toolbar: Toolbar by bindView(R.id.toolbar)
-    internal val tabLayout: TabLayout by bindView(R.id.tab_layout)
-    internal val viewPager: ViewPager by bindView(R.id.viewPager)
 
     private var giftedUsername: String? = null
     private var giftedUserID: String? = null
@@ -51,6 +47,11 @@ class GiftGemsActivity : BaseActivity() {
         return R.layout.activity_gift_gems
     }
 
+    override fun getContentView(): View {
+        binding = ActivityGiftGemsBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun injectActivity(component: UserComponent?) {
         component?.inject(this)
     }
@@ -59,7 +60,7 @@ class GiftGemsActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
 
         setTitle(R.string.gift_gems)
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
 
         purchaseHandler = PurchaseHandler(this, crashlyticsProxy)
 
@@ -75,7 +76,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
@@ -109,7 +110,7 @@ class GiftGemsActivity : BaseActivity() {
     private fun setViewPagerAdapter() {
         val fragmentManager = supportFragmentManager
 
-        viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding.viewPager.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): Fragment {
                 return if (position == 0) {
@@ -141,7 +142,7 @@ class GiftGemsActivity : BaseActivity() {
             }
         }
 
-        tabLayout.setupWithViewPager(viewPager)
+        binding.tabLayout.setupWithViewPager(binding.viewPager)
     }
 
     @Subscribe
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftOneGetOneInfoActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftOneGetOneInfoActivity.kt
deleted file mode 100644
index b3d9bf36c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftOneGetOneInfoActivity.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.EditText
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.databinding.ActivityGift1get1InfoBinding
-import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-
-class GiftOneGetOneInfoActivity : BaseActivity() {
-    private lateinit var binding: ActivityGift1get1InfoBinding
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_gift1get1_info
-    }
-
-    override fun injectActivity(component: UserComponent?) {
-
-    }
-
-    override fun getContentView(): View {
-        binding = ActivityGift1get1InfoBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding.cancelButton.setOnClickListener {
-            finish()
-        }
-
-        binding.giftButton.setOnClickListener {
-            showGiftSubscriptionDialog()
-        }
-    }
-
-    private fun showGiftSubscriptionDialog() {
-        val chooseRecipientDialogView = layoutInflater.inflate(R.layout.dialog_choose_message_recipient, null)
-
-        val alert = HabiticaAlertDialog(this)
-        alert.setTitle(getString(R.string.gift_title))
-        alert.addButton(getString(R.string.action_continue), true) { _, _ ->
-            val usernameEditText = chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
-            val intent = Intent(this, GiftSubscriptionActivity::class.java).apply {
-                putExtra("username", usernameEditText?.text.toString())
-            }
-            startActivity(intent)
-            finish()
-        }
-        alert.addCancelButton { _, _ ->
-        }
-        alert.setAdditionalContentView(chooseRecipientDialogView)
-        alert.show()
-    }
-}
\ No newline at end of file
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..d71e6a20e 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
@@ -4,16 +4,13 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
 import androidx.navigation.navArgs
 import com.habitrpg.android.habitica.HabiticaPurchaseVerifier
 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.ActivityGiftSubscriptionBinding
 import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent
 import com.habitrpg.android.habitica.extensions.addOkButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
@@ -21,13 +18,8 @@ import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
-import com.habitrpg.android.habitica.ui.AvatarView
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
 import org.solovyev.android.checkout.Inventory
 import org.solovyev.android.checkout.Sku
@@ -36,6 +28,8 @@ import javax.inject.Inject
 
 class GiftSubscriptionActivity : BaseActivity() {
 
+    private lateinit var binding: ActivityGiftSubscriptionBinding
+
     @Inject
     lateinit var crashlyticsProxy: CrashlyticsProxy
     @Inject
@@ -45,21 +39,6 @@ class GiftSubscriptionActivity : BaseActivity() {
 
     private var purchaseHandler: PurchaseHandler? = null
 
-    private val toolbar: Toolbar by bindView(R.id.toolbar)
-
-    private val giftOneGetOneContainer: ViewGroup? by bindView(R.id.gift_subscription_container)
-
-    private val avatarView: AvatarView by bindView(R.id.avatar_view)
-    private val displayNameTextView: UsernameLabel by bindView(R.id.display_name_textview)
-    private val usernameTextView: TextView by bindView(R.id.username_textview)
-
-    private val subscription1MonthView: SubscriptionOptionView? by bindView(R.id.subscription1month)
-    private val subscription3MonthView: SubscriptionOptionView? by bindView(R.id.subscription3month)
-    private val subscription6MonthView: SubscriptionOptionView? by bindView(R.id.subscription6month)
-    private val subscription12MonthView: SubscriptionOptionView? by bindView(R.id.subscription12month)
-
-    private val subscriptionButton: Button? by bindOptionalView(R.id.subscribeButton)
-
     private var giftedUsername: String? = null
     private var giftedUserID: String? = null
 
@@ -74,11 +53,16 @@ class GiftSubscriptionActivity : BaseActivity() {
         component?.inject(this)
     }
 
+    override fun getContentView(): View {
+        binding = ActivityGiftSubscriptionBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setTitle(R.string.gift_subscription)
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
@@ -90,17 +74,15 @@ class GiftSubscriptionActivity : BaseActivity() {
             giftedUsername = navArgs<GiftSubscriptionActivityArgs>().value.username
         }
 
-        subscriptionButton?.setOnClickListener {
+        binding.subscriptionButton.setOnClickListener {
             selectedSubscriptionSku?.let { sku -> purchaseSubscription(sku) }
         }
 
-        giftOneGetOneContainer?.isVisible = appConfigManager.enableGiftOneGetOne()
-
-        compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).subscribe(Consumer {
-            avatarView.setAvatar(it)
-            displayNameTextView.username = it.profile?.name
-            displayNameTextView.tier = it.contributor?.level ?: 0
-            usernameTextView.text = "@${it.username}"
+        compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).subscribe({
+            binding.avatarView.setAvatar(it)
+            binding.displayNameTextView.username = it.profile?.name
+            binding.displayNameTextView.tier = it.contributor?.level ?: 0
+            binding.usernameTextView.text = "@${it.username}"
             giftedUserID = it.id
             giftedUsername = it.username
         }, RxErrorHandler.handleEmptyError()))
@@ -122,10 +104,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) })
+        binding.subscription1MonthView.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription1MonthNoRenew) }
+        binding.subscription3MonthView.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription3MonthNoRenew) }
+        binding.subscription6MonthView.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription6MonthNoRenew) }
+        binding.subscription12MonthView.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription12MonthNoRenew) }
     }
 
     override fun onStop() {
@@ -171,9 +153,7 @@ class GiftSubscriptionActivity : BaseActivity() {
         this.selectedSubscriptionSku = sku
         val subscriptionOptionButton = buttonForSku(this.selectedSubscriptionSku)
         subscriptionOptionButton?.setIsPurchased(true)
-        if (this.subscriptionButton != null) {
-            this.subscriptionButton?.isEnabled = true
-        }
+        binding.subscriptionButton.isEnabled = true
     }
 
     private fun buttonForSku(sku: Sku?): SubscriptionOptionView? {
@@ -182,10 +162,10 @@ class GiftSubscriptionActivity : BaseActivity() {
 
     private fun buttonForSku(sku: String?): SubscriptionOptionView? {
         return when (sku) {
-            PurchaseTypes.Subscription1MonthNoRenew -> subscription1MonthView
-            PurchaseTypes.Subscription3MonthNoRenew -> subscription3MonthView
-            PurchaseTypes.Subscription6MonthNoRenew -> subscription6MonthView
-            PurchaseTypes.Subscription12MonthNoRenew -> subscription12MonthView
+            PurchaseTypes.Subscription1MonthNoRenew -> binding.subscription1MonthView
+            PurchaseTypes.Subscription3MonthNoRenew -> binding.subscription3MonthView
+            PurchaseTypes.Subscription6MonthNoRenew -> binding.subscription6MonthView
+            PurchaseTypes.Subscription12MonthNoRenew -> binding.subscription12MonthView
             else -> null
         }
     }
@@ -218,7 +198,7 @@ class GiftSubscriptionActivity : BaseActivity() {
     }
 
     private fun displayConfirmationDialog() {
-        val message = getString(if (appConfigManager.enableGiftOneGetOne()){
+        val message = getString(if (appConfigManager.activePromo(this)?.identifier == "g1g1"){
             R.string.gift_confirmation_text_sub_g1g1
         } else {
             R.string.gift_confirmation_text_sub
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
index 843b959ee..4ac6a5e35 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
@@ -4,14 +4,17 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import android.widget.*
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.ui.helpers.*
-import com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
+import com.habitrpg.android.habitica.databinding.ActivityGroupFormBinding
+import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
+import com.habitrpg.android.habitica.ui.helpers.AutocompleteTokenizer
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 
 class GroupFormActivity : BaseActivity() {
 
+    private lateinit var binding: ActivityGroupFormBinding
     private var groupID: String? = null
     private var groupType: String? = null
     private var groupName: String? = null
@@ -20,21 +23,17 @@ class GroupFormActivity : BaseActivity() {
     private var groupLeader: String? = null
     private var leaderCreateChallenge = false
 
-    private val cancelButton: ImageButton by bindView(R.id.cancel_button)
-    private val saveButton: Button by bindView(R.id.save_button)
-    private val groupNameEditText: HabiticaAutocompleteTextView by bindView(R.id.group_name_edittext)
-    private val groupDescriptionEditText: HabiticaAutocompleteTextView by bindView(R.id.group_description_edittext)
-    private val leaderCreateChallengeSwitch: Switch by bindView(R.id.leader_create_challenge_switch)
-    private val privacyWrapper: LinearLayout by bindView(R.id.privacyWrapper)
-    internal val privacySpinner: Spinner by bindView(R.id.privacySpinner)
-    private val privacySeparator: View by bindView(R.id.privacy_separator)
-
     private var autocompleteAdapter: AutocompleteAdapter? = null
 
     override fun getLayoutResId(): Int {
         return R.layout.activity_group_form
     }
 
+    override fun getContentView(): View {
+        binding = ActivityGroupFormBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -49,31 +48,22 @@ class GroupFormActivity : BaseActivity() {
         }
 
         if (groupType == "party") {
-            privacyWrapper.visibility = View.GONE
-            privacySeparator.visibility = View.GONE
+            binding.privacyWrapper.visibility = View.GONE
+            binding.privacySeparator.visibility = View.GONE
         }
 
         if (groupID != null) {
             fillForm()
         }
 
-        cancelButton.setOnClickListener {
+        binding.cancelButton.setOnClickListener {
             finish()
             dismissKeyboard()
         }
 
-        saveButton.setOnClickListener {
+        binding.saveButton.setOnClickListener {
             finishActivitySuccessfuly()
         }
-
-        autocompleteAdapter = AutocompleteAdapter(this)
-        val tokenizer = AutocompleteTokenizer(listOf(':'))
-        groupNameEditText.setAdapter(autocompleteAdapter)
-        groupNameEditText.threshold = 2
-        groupNameEditText.setTokenizer(tokenizer)
-        groupDescriptionEditText.setAdapter(autocompleteAdapter)
-        groupDescriptionEditText.setTokenizer(tokenizer)
-        groupDescriptionEditText.threshold = 2
     }
 
 
@@ -82,11 +72,11 @@ class GroupFormActivity : BaseActivity() {
     }
 
     private fun fillForm() {
-        groupNameEditText.setText(groupName)
-        groupDescriptionEditText.setText(groupDescription)
-        leaderCreateChallengeSwitch.isChecked = leaderCreateChallenge
-        privacyWrapper.visibility = View.GONE
-        saveButton.text = getString(R.string.save)
+        binding.groupNameEditText.setText(groupName)
+        binding.groupDescriptionEditText.setText(groupDescription)
+        binding.leaderCreateChallengeSwitch.isChecked = leaderCreateChallenge
+        binding.privacyWrapper.visibility = View.GONE
+        binding.saveButton.text = getString(R.string.save)
     }
 
     override fun onSupportNavigateUp(): Boolean {
@@ -101,7 +91,7 @@ class GroupFormActivity : BaseActivity() {
     }
 
     private fun finishActivitySuccessfuly() {
-        val name = groupNameEditText.text.toString()
+        val name = binding.groupNameEditText.text.toString()
         if (name.isEmpty()) {
             return
         }
@@ -109,8 +99,8 @@ class GroupFormActivity : BaseActivity() {
         val bundle = Bundle()
         bundle.putString("name", name)
         bundle.putString("groupType", groupType)
-        bundle.putString("description", MarkdownParser.parseCompiled(this.groupDescriptionEditText.text))
-        bundle.putBoolean("leaderOnlyChallenges", leaderCreateChallengeSwitch.isChecked)
+        bundle.putString("description", MarkdownParser.parseCompiled(binding.groupDescriptionEditText.text.toString()))
+        bundle.putBoolean("leaderOnlyChallenges", binding.leaderCreateChallengeSwitch.isChecked)
         bundle.putString("leader", this.groupLeader)
         resultIntent.putExtras(bundle)
         setResult(Activity.RESULT_OK, resultIntent)
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..2b59fc38e 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
@@ -5,36 +5,32 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.ViewGroup
-import androidx.appcompat.widget.Toolbar
+import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
-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.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.ActivityPartyInviteBinding
 import com.habitrpg.android.habitica.extensions.runDelayed
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment
-import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import io.reactivex.functions.Consumer
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Named
 
 
-
 class GroupInviteActivity : BaseActivity() {
 
+    private lateinit var binding: ActivityPartyInviteBinding
+
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
     @Inject
@@ -42,10 +38,6 @@ class GroupInviteActivity : BaseActivity() {
     @Inject
     lateinit var userRepository: UserRepository
 
-    internal val tabLayout: TabLayout by bindView(R.id.tab_layout)
-    internal val viewPager: ViewPager by bindView(R.id.viewPager)
-    private val snackbarView: ViewGroup by bindView(R.id.snackbar_view)
-
     internal var fragments: MutableList<PartyInviteFragment> = ArrayList()
     private var userIdToInvite: String? = null
 
@@ -53,10 +45,15 @@ class GroupInviteActivity : BaseActivity() {
         return R.layout.activity_party_invite
     }
 
+    override fun getContentView(): View {
+        binding = ActivityPartyInviteBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setupToolbar(findViewById(R.id.toolbar))
-        viewPager.currentItem = 0
+        binding.viewPager.currentItem = 0
 
         supportActionBar?.title = null
 
@@ -69,7 +66,7 @@ class GroupInviteActivity : BaseActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_party_invite, menu)
-        return true
+        return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -78,8 +75,8 @@ class GroupInviteActivity : BaseActivity() {
             R.id.action_send_invites -> {
                 setResult(Activity.RESULT_OK, createResultIntent())
                 dismissKeyboard()
-                if (fragments.size > viewPager.currentItem && fragments[viewPager.currentItem].values.isNotEmpty()) {
-                    showSnackbar(snackbarView, "Invite Sent!", HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
+                if (fragments.size > binding.viewPager.currentItem && fragments[binding.viewPager.currentItem].values.isNotEmpty()) {
+                    showSnackbar(binding.snackbarView, "Invite Sent!", HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
                     runDelayed(1, TimeUnit.SECONDS, this::finish)
                 } else {
                     finish()
@@ -97,7 +94,7 @@ class GroupInviteActivity : BaseActivity() {
     private fun createResultIntent(): Intent {
         val intent = Intent()
         if (fragments.size == 0) return intent
-        val fragment = fragments[viewPager.currentItem]
+        val fragment = fragments[binding.viewPager.currentItem]
         intent.putExtra(EMAILS_KEY, fragments[1].values)
         intent.putExtra(USER_IDS_KEY, fragments[0].values)
         return intent
@@ -106,7 +103,7 @@ class GroupInviteActivity : BaseActivity() {
     private fun setViewPagerAdapter() {
         val fragmentManager = supportFragmentManager
 
-        viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding.viewPager.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): Fragment {
                 val fragment = PartyInviteFragment()
@@ -133,27 +130,10 @@ class GroupInviteActivity : BaseActivity() {
             }
         }
 
-        tabLayout.setupWithViewPager(viewPager)
-    }
-
-    private fun handleUserReceived(user: User) {
-        if (this.userIdToInvite == null) {
-            return
-        }
-
-        val inviteData = HashMap<String, Any>()
-        val invites = ArrayList<String>()
-        userIdToInvite?.let {
-            invites.add(it)
-        }
-        inviteData["uuids"] = invites
-
-        compositeSubscription.add(this.socialRepository.inviteToGroup(user.party?.id ?: "", inviteData)
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        binding.tabLayout.setupWithViewPager(binding.viewPager)
     }
 
     companion object {
-
         const val RESULT_SEND_INVITES = 100
         const val USER_IDS_KEY = "userIDs"
         const val IS_EMAIL_KEY = "isEmail"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
index a94ee1ea2..914f32a30 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
@@ -30,10 +30,10 @@ class GuidelinesActivity: BaseActivity() {
 
             @Throws(IOException::class)
             override fun onResponse(call: Call, response: Response) {
-                val `in` = response.body()?.byteStream()
+                val `in` = response.body?.byteStream()
                 val reader = BufferedReader(InputStreamReader(`in`))
                 val text = reader.readText()
-                response.body()?.close()
+                response.body?.close()
 
                 findViewById<TextView>(R.id.text_view).post {
                     findViewById<TextView>(R.id.text_view).setMarkdown(text)
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..34ffbc798 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
@@ -4,31 +4,31 @@ import android.app.Activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.databinding.WidgetConfigureHabitButtonBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 import javax.inject.Named
 
 class HabitButtonWidgetActivity : BaseActivity() {
 
+    private lateinit var binding: WidgetConfigureHabitButtonBinding
+
     @Inject
     lateinit var taskRepository: TaskRepository
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
 
-    internal val recyclerView: RecyclerView by bindView(R.id.recyclerView)
     private var widgetId: Int = 0
     private var adapter: SkillTasksRecyclerViewAdapter? = null
 
@@ -36,6 +36,11 @@ class HabitButtonWidgetActivity : BaseActivity() {
         return R.layout.widget_configure_habit_button
     }
 
+    override fun getContentView(): View {
+        binding = WidgetConfigureHabitButtonBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun injectActivity(component: UserComponent?) {
         component?.inject(this)
     }
@@ -55,21 +60,21 @@ class HabitButtonWidgetActivity : BaseActivity() {
             finish()
         }
 
-        var layoutManager: LinearLayoutManager? = recyclerView.layoutManager as? LinearLayoutManager
+        var layoutManager: LinearLayoutManager? = binding.recyclerView.layoutManager as? LinearLayoutManager
 
         if (layoutManager == null) {
             layoutManager = LinearLayoutManager(this)
 
-            recyclerView.layoutManager = layoutManager
+            binding.recyclerView.layoutManager = layoutManager
         }
 
-        adapter = SkillTasksRecyclerViewAdapter(null, true)
-        adapter?.getTaskSelectionEvents()?.subscribe(Consumer { task -> taskSelected(task.id) },
+        adapter = SkillTasksRecyclerViewAdapter()
+        adapter?.getTaskSelectionEvents()?.subscribe({ task -> taskSelected(task.id) },
                 RxErrorHandler.handleEmptyError())
                 ?.let { compositeSubscription.add(it) }
-        recyclerView.adapter = adapter
+        binding.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).subscribe({ adapter?.data = 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..e1fa54372 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
@@ -1,9 +1,11 @@
 package com.habitrpg.android.habitica.ui.activities
 
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
@@ -17,7 +19,6 @@ import com.habitrpg.android.habitica.databinding.ActivityIntroBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment
 import com.viewpagerindicator.IconPagerAdapter
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 
@@ -40,12 +41,16 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         super.onCreate(savedInstanceState)
 
         setupIntro()
-        //binding.viewPagerIndicator.setViewPager(binding.viewPager)
+        binding.viewPagerIndicator.setViewPager(binding.viewPager)
 
         binding.skipButton.setOnClickListener(this)
         binding.finishButton.setOnClickListener(this)
 
-        compositeSubscription.add(contentRepository.retrieveContent(this).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(contentRepository.retrieveContent(this).subscribe({ }, RxErrorHandler.handleEmptyError()))
+
+
+        window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
+        window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
     }
 
     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..5e196d05c 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
@@ -10,13 +10,15 @@ import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.text.SpannableString
+import android.text.method.LinkMovementMethod
 import android.text.style.UnderlineSpan
 import android.view.MenuItem
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
-import android.widget.*
+import android.widget.EditText
+import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
@@ -39,27 +41,28 @@ import com.habitrpg.android.habitica.api.HostConfig
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.ActivityLoginBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.addOkButton
+import com.habitrpg.android.habitica.extensions.updateStatusBarColor
 import com.habitrpg.android.habitica.helpers.*
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.login.LockableScrollView
-import com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView
 import com.willowtreeapps.signinwithapplebutton.SignInWithAppleConfiguration
-import io.reactivex.Flowable
-import io.reactivex.exceptions.Exceptions
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.exceptions.Exceptions
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
 import java.io.IOException
 import javax.inject.Inject
 
 class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
 
+    private lateinit var binding: ActivityLoginBinding
+
     @Inject
     lateinit var apiClient: ApiClient
     @Inject
@@ -79,36 +82,17 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
     private var isRegistering: Boolean = false
     private var isShowingForm: Boolean = false
 
-    private val backgroundContainer: LockableScrollView by bindView(R.id.background_container)
-    internal val backgroundView: LoginBackgroundView by bindView(R.id.background_view)
-    internal val newGameButton: Button by bindView(R.id.new_game_button)
-    internal val showLoginButton: Button by bindView(R.id.show_login_button)
-    internal val scrollView: ScrollView by bindView(R.id.login_scrollview)
-    private val formWrapper: LinearLayout by bindView(R.id.login_linear_layout)
-    private val backButton: Button by bindView(R.id.back_button)
-    private val logoView: ImageView by bindView(R.id.logo_view)
-    private val mLoginNormalBtn: Button by bindView(R.id.login_btn)
-    private val mProgressBar: ProgressBar by bindView(R.id.PB_AsyncTask)
-    private val mUsernameET: EditText by bindView(R.id.username)
-    private val mPasswordET: EditText by bindView(R.id.password)
-    private val mEmail: EditText by bindView(R.id.email)
-    private val mConfirmPassword: EditText by bindView(R.id.confirm_password)
-    private val forgotPasswordButton: Button by bindView(R.id.forgot_password)
-    private val facebookLoginButton: Button by bindView(R.id.fb_login_button)
-    private val googleLoginButton: Button by bindView(R.id.google_login_button)
-    private val appleLoginButton: Button by bindView(R.id.apple_login_button)
-
     private var callbackManager = CallbackManager.Factory.create()
     private var googleEmail: String? = null
     private var loginManager = LoginManager.getInstance()
 
     private val loginClick = View.OnClickListener {
-        mProgressBar.visibility = View.VISIBLE
+        binding.PBAsyncTask.visibility = View.VISIBLE
         if (isRegistering) {
-            val username: String = mUsernameET.text.toString().trim { it <= ' ' }
-            val email: String = mEmail.text.toString().trim { it <= ' ' }
-            val password: String = mPasswordET.text.toString()
-            val confirmPassword: String = mConfirmPassword.text.toString()
+            val username: String = binding.username.text.toString().trim { it <= ' ' }
+            val email: String = binding.email.text.toString().trim { it <= ' ' }
+            val password: String = binding.password.text.toString()
+            val confirmPassword: String = binding.confirmPassword.text.toString()
             if (username.isEmpty() || password.isEmpty() || email.isEmpty() || confirmPassword.isEmpty()) {
                 showValidationError(R.string.login_validation_error_fieldsmissing)
                 return@OnClickListener
@@ -119,19 +103,19 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
             }
             apiClient.registerUser(username, email, password, confirmPassword)
                     .subscribe(this@LoginActivity,
-                            Consumer {
+                            {
                                 hideProgress()
                                 RxErrorHandler.reportError(it)
                             })
         } else {
-            val username: String = mUsernameET.text.toString().trim { it <= ' ' }
-            val password: String = mPasswordET.text.toString()
+            val username: String = binding.username.text.toString().trim { it <= ' ' }
+            val password: String = binding.password.text.toString()
             if (username.isEmpty() || password.isEmpty()) {
                 showValidationError(R.string.login_validation_error_fieldsmissing)
                 return@OnClickListener
             }
             apiClient.connectUser(username, password).subscribe(this@LoginActivity,
-                    Consumer {
+                    {
                         hideProgress()
                         RxErrorHandler.reportError(it)
                     })
@@ -143,6 +127,11 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         return R.layout.activity_login
     }
 
+    override fun getContentView(): View {
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
             supportActionBar?.hide()
@@ -151,11 +140,12 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
 
         setupFacebookLogin()
 
-        mLoginNormalBtn.setOnClickListener(loginClick)
+        binding.loginBtn.setOnClickListener(loginClick)
 
-        val content = SpannableString(forgotPasswordButton.text)
+        val content = SpannableString(binding.forgotPassword.text)
         content.setSpan(UnderlineSpan(), 0, content.length, 0)
-        forgotPasswordButton.text = content
+        binding.forgotPassword.text = content
+        binding.privacyPolicy.movementMethod = LinkMovementMethod.getInstance()
 
         this.isRegistering = true
 
@@ -163,22 +153,19 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         additionalData["page"] = this.javaClass.simpleName
         AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData)
 
-        backgroundContainer.post { backgroundContainer.scrollTo(0, backgroundContainer.bottom) }
-        backgroundContainer.setScrollingEnabled(false)
+        binding.backgroundContainer.post { binding.backgroundContainer.scrollTo(0, binding.backgroundContainer.bottom) }
+        binding.backgroundContainer.isScrollable = false
 
-        val window = window
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
-        }
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+        window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
+        window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
 
-        newGameButton.setOnClickListener { newGameButtonClicked() }
-        showLoginButton.setOnClickListener { showLoginButtonClicked() }
-        backButton.setOnClickListener { backButtonClicked() }
-        forgotPasswordButton.setOnClickListener { onForgotPasswordClicked() }
-        facebookLoginButton.setOnClickListener { handleFacebookLogin() }
-        googleLoginButton.setOnClickListener { handleGoogleLogin() }
-        appleLoginButton.setOnClickListener {
+        binding.newGameButton.setOnClickListener { newGameButtonClicked() }
+        binding.showLoginButton.setOnClickListener { showLoginButtonClicked() }
+        binding.backButton.setOnClickListener { backButtonClicked() }
+        binding.forgotPassword.setOnClickListener { onForgotPasswordClicked() }
+        binding.fbLoginButton.setOnClickListener { handleFacebookLogin() }
+        binding.googleLoginButton.setOnClickListener { handleGoogleLogin() }
+        binding.appleLoginButton.setOnClickListener {
             val configuration = SignInWithAppleConfiguration(
                     clientId = BuildConfig.APPLE_AUTH_CLIENT_ID,
                     redirectUri = "${hostConfig.address}/api/v4/user/auth/apple",
@@ -199,6 +186,11 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         }
     }
 
+    override fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean) {
+        super.loadTheme(sharedPreferences, forced)
+        window.updateStatusBarColor(R.color.black_20_alpha, false)
+    }
+
     private fun setupFacebookLogin() {
         callbackManager = CallbackManager.Factory.create()
         loginManager.registerCallback(callbackManager,
@@ -232,18 +224,18 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
 
     private fun resetLayout() {
         if (this.isRegistering) {
-            if (this.mEmail.visibility == View.GONE) {
-                show(this.mEmail)
+            if (binding.email.visibility == View.GONE) {
+                show(binding.email)
             }
-            if (this.mConfirmPassword.visibility == View.GONE) {
-                show(this.mConfirmPassword)
+            if (binding.confirmPassword.visibility == View.GONE) {
+                show(binding.confirmPassword)
             }
         } else {
-            if (this.mEmail.visibility == View.VISIBLE) {
-                hide(this.mEmail)
+            if (binding.email.visibility == View.VISIBLE) {
+                hide(binding.email)
             }
-            if (this.mConfirmPassword.visibility == View.VISIBLE) {
-                hide(this.mConfirmPassword)
+            if (binding.confirmPassword.visibility == View.VISIBLE) {
+                hide(binding.confirmPassword)
             }
         }
     }
@@ -269,17 +261,25 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
 
     private fun setRegistering() {
         if (this.isRegistering) {
-            this.mLoginNormalBtn.text = getString(R.string.register_btn)
-            mUsernameET.setHint(R.string.username)
-            mPasswordET.imeOptions = EditorInfo.IME_ACTION_NEXT
-            facebookLoginButton.setText(R.string.register_btn_fb)
-            googleLoginButton.setText(R.string.register_btn_google)
+            binding.loginBtn.text = getString(R.string.register_btn)
+            binding.username.setHint(R.string.username)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                binding.username.setAutofillHints("newUsername")
+                binding.password.setAutofillHints("newPassword")
+            }
+            binding.password.imeOptions = EditorInfo.IME_ACTION_NEXT
+            binding.fbLoginButton.setText(R.string.register_btn_fb)
+            binding.googleLoginButton.setText(R.string.register_btn_google)
         } else {
-            this.mLoginNormalBtn.text = getString(R.string.login_btn)
-            mUsernameET.setHint(R.string.email_username)
-            mPasswordET.imeOptions = EditorInfo.IME_ACTION_DONE
-            facebookLoginButton.setText(R.string.login_btn_fb)
-            googleLoginButton.setText(R.string.login_btn_google)
+            binding.loginBtn.text = getString(R.string.login_btn)
+            binding.username.setHint(R.string.email_username)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                binding.username.setAutofillHints("username")
+                binding.password.setAutofillHints("password")
+            }
+            binding.password.imeOptions = EditorInfo.IME_ACTION_DONE
+            binding.fbLoginButton.setText(R.string.login_btn_fb)
+            binding.googleLoginButton.setText(R.string.login_btn_google)
         }
         this.resetLayout()
     }
@@ -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() }))
             }
         }
     }
@@ -343,7 +343,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
 
     private fun hideProgress() {
         runOnUiThread {
-            mProgressBar.visibility = View.GONE
+            binding.PBAsyncTask.visibility = View.GONE
         }
     }
 
@@ -352,7 +352,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
     }
 
     private fun showValidationError(message: String) {
-        mProgressBar.visibility = View.GONE
+        binding.PBAsyncTask.visibility = View.GONE
         val alert = HabiticaAlertDialog(this)
         alert.setTitle(R.string.login_validation_error_title)
         alert.setMessage(message)
@@ -376,12 +376,12 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         }
 
         compositeSubscription.add(userRepository.retrieveUser(true)
-                .subscribe(Consumer {
+                .subscribe({
                     if (userAuthResponse.newUser) {
                         this.startSetupActivity()
                     } else {
-                        AmplitudeManager.sendEvent("login", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT)
                         this.startMainActivity()
+                        AmplitudeManager.sendEvent("login", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT)
                     }
                 }, RxErrorHandler.handleEmptyError()))
     }
@@ -412,7 +412,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
     private fun handleGoogleLoginResult() {
         val scopesString = Scopes.PROFILE + " " + Scopes.EMAIL
         val scopes = "oauth2:$scopesString"
-        Flowable.defer<String> {
+        compositeSubscription.add(Flowable.defer {
             try {
                 @Suppress("Deprecation")
                 return@defer Flowable.just(GoogleAuthUtil.getToken(this, googleEmail, scopes))
@@ -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 {
@@ -433,7 +433,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
                         }
                     }
 
-                })
+                }))
     }
 
     private fun handleGoogleAuthException(e: Exception) {
@@ -493,15 +493,15 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
 
     private fun showForm() {
         isShowingForm = true
-        val panAnimation = ObjectAnimator.ofInt(backgroundContainer, "scrollY", 0).setDuration(1000)
-        val newGameAlphaAnimation = ObjectAnimator.ofFloat<View>(newGameButton, View.ALPHA, 0.toFloat())
-        val showLoginAlphaAnimation = ObjectAnimator.ofFloat<View>(showLoginButton, View.ALPHA, 0.toFloat())
-        val scaleLogoAnimation = ValueAnimator.ofInt(logoView.measuredHeight, (logoView.measuredHeight * 0.75).toInt())
+        val panAnimation = ObjectAnimator.ofInt(binding.backgroundContainer, "scrollY", 0).setDuration(1000)
+        val newGameAlphaAnimation = ObjectAnimator.ofFloat(binding.newGameButton, View.ALPHA, 0.toFloat())
+        val showLoginAlphaAnimation = ObjectAnimator.ofFloat(binding.showLoginButton, View.ALPHA, 0.toFloat())
+        val scaleLogoAnimation = ValueAnimator.ofInt(binding.logoView.measuredHeight, (binding.logoView.measuredHeight * 0.75).toInt())
         scaleLogoAnimation.addUpdateListener { valueAnimator ->
             val value = valueAnimator.animatedValue as? Int ?: 0
-            val layoutParams = logoView.layoutParams
+            val layoutParams = binding.logoView.layoutParams
             layoutParams.height = value
-            logoView.layoutParams = layoutParams
+            binding.logoView.layoutParams = layoutParams
         }
         if (isRegistering) {
             newGameAlphaAnimation.startDelay = 600
@@ -509,10 +509,10 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
             showLoginAlphaAnimation.duration = 400
             newGameAlphaAnimation.addListener(object : AnimatorListenerAdapter() {
                 override fun onAnimationEnd(animation: Animator) {
-                    newGameButton.visibility = View.GONE
-                    showLoginButton.visibility = View.GONE
-                    scrollView.visibility = View.VISIBLE
-                    scrollView.alpha = 1f
+                    binding.newGameButton.visibility = View.GONE
+                    binding.showLoginButton.visibility = View.GONE
+                    binding.loginScrollview.visibility = View.VISIBLE
+                    binding.loginScrollview.alpha = 1f
                 }
             })
         } else {
@@ -521,21 +521,21 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
             newGameAlphaAnimation.duration = 400
             showLoginAlphaAnimation.addListener(object : AnimatorListenerAdapter() {
                 override fun onAnimationEnd(animation: Animator) {
-                    newGameButton.visibility = View.GONE
-                    showLoginButton.visibility = View.GONE
-                    scrollView.visibility = View.VISIBLE
-                    scrollView.alpha = 1f
+                    binding.newGameButton.visibility = View.GONE
+                    binding.showLoginButton.visibility = View.GONE
+                    binding.loginScrollview.visibility = View.VISIBLE
+                    binding.loginScrollview.alpha = 1f
                 }
             })
         }
-        val backAlphaAnimation = ObjectAnimator.ofFloat<View>(backButton, View.ALPHA, 1.toFloat()).setDuration(800)
+        val backAlphaAnimation = ObjectAnimator.ofFloat(binding.backButton, View.ALPHA, 1.toFloat()).setDuration(800)
         val showAnimation = AnimatorSet()
         showAnimation.playTogether(panAnimation, newGameAlphaAnimation, showLoginAlphaAnimation, scaleLogoAnimation)
         showAnimation.play(backAlphaAnimation).after(panAnimation)
-        for (i in 0 until formWrapper.childCount) {
-            val view = formWrapper.getChildAt(i)
+        for (i in 0 until binding.formWrapper.childCount) {
+            val view = binding.formWrapper.getChildAt(i)
             view.alpha = 0f
-            val animator = ObjectAnimator.ofFloat<View>(view, View.ALPHA, 1.toFloat()).setDuration(400)
+            val animator = ObjectAnimator.ofFloat(view, View.ALPHA, 1.toFloat()).setDuration(400)
             animator.startDelay = (100 * i).toLong()
             showAnimation.play(animator).after(panAnimation)
         }
@@ -545,26 +545,26 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
 
     private fun hideForm() {
         isShowingForm = false
-        val panAnimation = ObjectAnimator.ofInt(backgroundContainer, "scrollY", backgroundContainer.bottom).setDuration(1000)
-        val newGameAlphaAnimation = ObjectAnimator.ofFloat<View>(newGameButton, View.ALPHA, 1.toFloat()).setDuration(700)
-        val showLoginAlphaAnimation = ObjectAnimator.ofFloat<View>(showLoginButton, View.ALPHA, 1.toFloat()).setDuration(700)
-        val scaleLogoAnimation = ValueAnimator.ofInt(logoView.measuredHeight, (logoView.measuredHeight * 1.333333).toInt())
+        val panAnimation = ObjectAnimator.ofInt(binding.backgroundContainer, "scrollY", binding.backgroundContainer.bottom).setDuration(1000)
+        val newGameAlphaAnimation = ObjectAnimator.ofFloat(binding.newGameButton, View.ALPHA, 1.toFloat()).setDuration(700)
+        val showLoginAlphaAnimation = ObjectAnimator.ofFloat(binding.showLoginButton, View.ALPHA, 1.toFloat()).setDuration(700)
+        val scaleLogoAnimation = ValueAnimator.ofInt(binding.logoView.measuredHeight, (binding.logoView.measuredHeight * 1.333333).toInt())
         scaleLogoAnimation.addUpdateListener { valueAnimator ->
             val value = valueAnimator.animatedValue as? Int
-            val layoutParams = logoView.layoutParams
+            val layoutParams = binding.logoView.layoutParams
             layoutParams.height = value ?: 0
-            logoView.layoutParams = layoutParams
+            binding.logoView.layoutParams = layoutParams
         }
         showLoginAlphaAnimation.startDelay = 300
-        val scrollViewAlphaAnimation = ObjectAnimator.ofFloat<View>(scrollView, View.ALPHA, 0.toFloat()).setDuration(800)
+        val scrollViewAlphaAnimation = ObjectAnimator.ofFloat(binding.loginScrollview, View.ALPHA, 0.toFloat()).setDuration(800)
         scrollViewAlphaAnimation.addListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
-                newGameButton.visibility = View.VISIBLE
-                showLoginButton.visibility = View.VISIBLE
-                scrollView.visibility = View.INVISIBLE
+                binding.newGameButton.visibility = View.VISIBLE
+                binding.showLoginButton.visibility = View.VISIBLE
+                binding.loginScrollview.visibility = View.INVISIBLE
             }
         })
-        val backAlphaAnimation = ObjectAnimator.ofFloat<View>(backButton, View.ALPHA, 0.toFloat()).setDuration(800)
+        val backAlphaAnimation = ObjectAnimator.ofFloat(binding.backButton, View.ALPHA, 0.toFloat()).setDuration(800)
         val showAnimation = AnimatorSet()
         showAnimation.playTogether(panAnimation, scrollViewAlphaAnimation, backAlphaAnimation, scaleLogoAnimation)
         showAnimation.play(newGameAlphaAnimation).after(scrollViewAlphaAnimation)
@@ -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..997ba799c 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
@@ -13,7 +13,6 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
 import android.util.Log
 import android.view.*
 import android.widget.FrameLayout
@@ -22,11 +21,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
@@ -36,12 +33,11 @@ import com.habitrpg.android.habitica.api.HostConfig
 import com.habitrpg.android.habitica.api.MaintenanceApiService
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.*
+import com.habitrpg.android.habitica.data.local.UserQuestStatus
 import com.habitrpg.android.habitica.databinding.ActivityMainBinding
 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.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.extensions.*
 import com.habitrpg.android.habitica.helpers.*
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
 import com.habitrpg.android.habitica.interactors.CheckClassSelectionUseCase
@@ -51,6 +47,7 @@ import com.habitrpg.android.habitica.models.Notification
 import com.habitrpg.android.habitica.models.TutorialStep
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.notifications.ChallengeWonData
 import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData
 import com.habitrpg.android.habitica.models.responses.MaintenanceResponse
 import com.habitrpg.android.habitica.models.responses.TaskScoringResult
@@ -67,22 +64,23 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
 import com.habitrpg.android.habitica.ui.views.ValueBar
-import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDialog
-import com.habitrpg.android.habitica.ui.views.dialogs.FirstDropDialog
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.dialogs.QuestCompletedDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.*
 import com.habitrpg.android.habitica.ui.views.yesterdailies.YesterdailyDialog
 import com.habitrpg.android.habitica.userpicture.BitmapUtils
 import com.habitrpg.android.habitica.widget.AvatarStatsWidgetProvider
 import com.habitrpg.android.habitica.widget.DailiesWidgetProvider
 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 io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
+import io.realm.kotlin.isValid
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
@@ -140,9 +138,8 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     private var drawerFragment: NavigationDrawerFragment? = null
     var drawerToggle: ActionBarDrawerToggle? = null
     private var resumeFromActivity = false
-    private var userIsOnQuest = false
-
-    private var connectionIssueHandler: Handler? = null
+    private var userQuestStatus = UserQuestStatus.NO_QUEST
+    private var lastNotificationOpen: Long? = null
 
     val userID: String
         get() = user?.id ?: ""
@@ -162,7 +159,6 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
     private var launchTrace: com.google.firebase.perf.metrics.Trace? = null
 
-    @SuppressLint("ObsoleteSdkInt")
     public override fun onCreate(savedInstanceState: Bundle?) {
         try {
             launchTrace = FirebasePerformance.getInstance().newTrace("MainActivityLaunch")
@@ -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 {
-            userIsOnQuest = it
-        }))
+        compositeSubscription.add(userRepository.getUserQuestStatus().subscribeWithErrorHandler {
+            userQuestStatus = 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,33 +211,32 @@ 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) {
                     if (slideOffset < 0.5f && isOpeningDrawer == null) {
-                        window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
-                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
+                        window.updateStatusBarColor(getThemeColor(R.attr.colorPrimaryDark), false)
                         isOpeningDrawer = true
                     } else if (slideOffset > 0.5f && isOpeningDrawer == null) {
-                        window.statusBarColor = getThemeColor(R.attr.headerBackgroundColor)
-                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                        window.updateStatusBarColor(getThemeColor(R.attr.headerBackgroundColor), true)
                         isOpeningDrawer = false
                     }
                 }
             }
 
             override fun onDrawerOpened(drawerView: View) {
+                hideKeyboard()
                 val modernHeaderStyle = sharedPreferences.getBoolean("modern_header_style", true)
-                if (modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
-                    window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
+                if (!isUsingNightModeResources() && modernHeaderStyle) {
+                    window.updateStatusBarColor(getThemeColor(R.attr.colorPrimaryDark), false)
                 }
                 isOpeningDrawer = null
+
+                drawerFragment?.updatePromo()
             }
 
             override fun onDrawerClosed(drawerView: View) {
                 val modernHeaderStyle = sharedPreferences.getBoolean("modern_header_style", true)
-                if (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
+                if (!isUsingNightModeResources() && modernHeaderStyle) {
+                    window.updateStatusBarColor(getThemeColor(R.attr.headerBackgroundColor), true)
                 }
                 isOpeningDrawer = null
             }
@@ -257,10 +251,9 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
         val navigationController = findNavController(R.id.nav_host_fragment)
         navigationController.addOnDestinationChangedListener { _, destination, arguments ->
+            hideKeyboard()
             updateToolbarTitle(destination, arguments)
         }
-        MainNavigationController.setup(navigationController)
-
         setupNotifications()
         setupBottomnavigationLayoutListener()
 
@@ -271,18 +264,29 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         }
     }
 
+    override fun setTitle(title: CharSequence?) {
+        binding.toolbarTitle.text = title
+    }
+
+    override fun setTitle(titleId: Int) {
+        binding.toolbarTitle.text = getString(titleId)
+    }
+
     private fun updateToolbarTitle(destination: NavDestination, arguments: Bundle?) {
-        binding.toolbarTitle.text = if (destination.id == R.id.petDetailRecyclerFragment || destination.id == R.id.mountDetailRecyclerFragment) {
+        title = if (destination.id == R.id.promoInfoFragment) {
+            ""
+        } else if (destination.id == R.id.petDetailRecyclerFragment || destination.id == R.id.mountDetailRecyclerFragment) {
             arguments?.getString("type")
         } else if (destination.label.isNullOrEmpty() && user?.isValid == true) {
             user?.profile?.name
-        } else if (user?.isValid == true && user?.profile != null) {
+        } else if (destination.label != null) {
             destination.label
         } else {
             ""
         }
         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({
+                if (!it.isValid()) return@subscribe
                 binding.toolbarTitle.text = if (destination.id == R.id.petDetailRecyclerFragment) {
                     (it as? Egg)?.text
                 } else {
@@ -294,6 +298,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     }
 
     override fun onSupportNavigateUp(): Boolean {
+        hideKeyboard()
         onBackPressed()
         return true
     }
@@ -349,6 +354,9 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     override fun onResume() {
         super.onResume()
 
+        val navigationController = findNavController(R.id.nav_host_fragment)
+        MainNavigationController.setup(navigationController)
+
         if(!resumeFromActivity){
             retrieveUser()
             this.checkMaintenance()
@@ -361,16 +369,23 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             putBoolean("preventDailyReminder", false)
         }
 
-        if (intent.hasExtra("notificationIdentifier")) {
+        if (intent.hasExtra("notificationIdentifier") && lastNotificationOpen != intent.getLongExtra("notificationTimeStamp", 0)) {
+            lastNotificationOpen = intent.getLongExtra("notificationTimeStamp", 0)
             val identifier = intent.getStringExtra("notificationIdentifier") ?: ""
             val additionalData = HashMap<String, Any>()
             additionalData["identifier"] = identifier
             AmplitudeManager.sendEvent("open notification", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
+            retrieveUser(true)
             NotificationOpenHandler.handleOpenedByNotification(identifier, intent, user)
         }
 
         launchTrace?.stop()
         launchTrace = null
+
+
+        if (binding.toolbarTitle.text?.isNotBlank() != true) {
+            navigationController.currentDestination?.let { updateToolbarTitle(it, null) }
+        }
     }
 
     override fun onPause() {
@@ -422,22 +437,22 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             displayDeathDialogIfNeeded()
             YesterdailyDialog.showDialogIfNeeded(this, user?.id, userRepository, taskRepository)
 
-            if (user?.flags?.isVerifiedUsername == false && isActivityVisible) {
+            if (user?.flags?.verifiedUsername == false && isActivityVisible) {
                 val intent = Intent(this, VerifyUsernameActivity::class.java)
                 startActivity(intent)
             }
 
             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("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("flags.welcomed", true).subscribe({}, RxErrorHandler.handleEmptyError()))
             }
 
             if (appConfigManager.enableAdventureGuide()) {
@@ -445,6 +460,11 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             } else {
                 drawerIcon.setEnabled(false)
             }
+
+            val navigationController = findNavController(R.id.nav_host_fragment)
+            if (binding.toolbarTitle.text?.isNotBlank() != true) {
+                navigationController.currentDestination?.let { updateToolbarTitle(it, null) }
+            }
         }
     }
 
@@ -506,7 +526,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
@@ -538,13 +558,21 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
     internal fun displayTaskScoringResponse(data: TaskScoringResult?) {
         if (user != null && data != null) {
+            val damageValue = when (userQuestStatus) {
+                UserQuestStatus.QUEST_BOSS -> data.questDamage
+                else -> 0.0
+            }
             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()))
+                    user, data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta, damageValue, data.hasLeveledUp, data.level))
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
 
-        compositeSubscription.add(displayItemDropUseCase.observable(DisplayItemDropUseCase.RequestValues(data, this, snackbarContainer))
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        val showItemsFound = when (userQuestStatus) {
+            UserQuestStatus.QUEST_COLLECT -> true
+            else -> false
+        }
+        compositeSubscription.add(displayItemDropUseCase.observable(DisplayItemDropUseCase.RequestValues(data, this, snackbarContainer, showItemsFound))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
 
@@ -572,7 +600,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)
@@ -599,9 +627,10 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                         pushNotificationManager.setUser(user1)
                         pushNotificationManager.addPushDeviceUsingStoredToken()
                     }
+                    .flatMap { userRepository.retrieveTeamPlans() }
                     .flatMap { contentRepository.retrieveContent(this,false) }
-                    .flatMap { contentRepository.retrieveWorldState() }
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    .flatMap { contentRepository.retrieveWorldState(this) }
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
     }
 
@@ -638,11 +667,8 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     }
 
     override fun onTutorialCompleted(step: TutorialStep) {
-        val path = "flags.tutorial." + step.tutorialGroup + "." + step.identifier
-        val updateData = HashMap<String, Any>()
-        updateData[path] = true
-        compositeSubscription.add(userRepository.updateUser(user, updateData)
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.updateUser("flags.tutorial." + step.tutorialGroup + "." + step.identifier, true)
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
         binding.overlayFrameLayout.removeView(this.activeTutorialView)
         this.removeActiveTutorialView()
 
@@ -654,7 +680,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     }
 
     override fun onTutorialDeferred(step: TutorialStep) {
-        taskRepository.executeTransaction(Realm.Transaction { step.displayedOn = Date() })
+        taskRepository.modify(step) { it.displayedOn = Date() }
         this.removeActiveTutorialView()
     }
 
@@ -671,7 +697,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 +783,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()))
@@ -773,40 +799,54 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     fun showAchievementDialog(event: ShowAchievementDialog) {
         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())
+                compositeSubscription.add(apiClient.readNotification(event.id)
+                        .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.setType(event.type, event.message, event.text)
                     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()))
+    }
+
+    @Subscribe
+    fun showWonAchievementDialog(event: ShowWonChallengeDialog) {
+        compositeSubscription.add(Completable.complete()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({
+                    retrieveUser(true)
+                    val dialog = WonChallengeDialog(this)
+                    dialog.configure(event.data)
+                    dialog.enqueue()
+                    apiClient.readNotification(event.id)
+                            .subscribe({ }, RxErrorHandler.handleEmptyError())
                 }, RxErrorHandler.handleEmptyError()))
     }
 
@@ -814,13 +854,13 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         if (event.title != null) {
             super.onEvent(event)
         } else {
-            connectionIssueHandler?.removeCallbacksAndMessages(null)
             binding.connectionIssueTextview.visibility = View.VISIBLE
             binding.connectionIssueTextview.text = event.message
-            connectionIssueHandler = Handler()
-            connectionIssueHandler?.postDelayed({
-                binding.connectionIssueTextview.visibility = View.GONE
-            }, 5000)
+            compositeSubscription.add(Observable.just("")
+                    .delay(500, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
+                    .subscribe( {
+                        binding.connectionIssueTextview.visibility = View.GONE
+                    }, {}))
         }
     }
 
@@ -829,7 +869,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             val petWrapper = View.inflate(this, R.layout.pet_imageview, null) as? FrameLayout
             val petImageView = petWrapper?.findViewById(R.id.pet_imageview) as? SimpleDraweeView
 
-            DataBindingUtils.loadImage(petImageView, "social_Pet-" + egg.key + "-" + potion.key)
+            DataBindingUtils.loadImage(petImageView, "stable_Pet-" + egg.key + "-" + potion.key)
             val potionName = potion.text
             val eggName = egg.text
             val dialog = HabiticaAlertDialog(this)
@@ -837,7 +877,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 +893,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..7471602d1 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
@@ -4,61 +4,59 @@ import android.content.Intent
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.View
-import android.widget.Button
-import android.widget.TextView
 import androidx.core.net.toUri
-import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.api.MaintenanceApiService
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.databinding.ActivityMaintenanceBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-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 io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import javax.inject.Inject
 
 class MaintenanceActivity : BaseActivity() {
 
+    private lateinit var binding: ActivityMaintenanceBinding
+
     @Inject
     lateinit var maintenanceService: MaintenanceApiService
 
     @Inject
     lateinit var apiClient: ApiClient
 
-    internal val titleTextView: TextView by bindView(R.id.titleTextView)
-    internal val imageView: SimpleDraweeView by bindView(R.id.imageView)
-    internal val descriptionTextView: HabiticaEmojiTextView by bindView(R.id.descriptionTextView)
-    internal val playStoreButton: Button by bindView(R.id.playStoreButton)
     private var isDeprecationNotice: Boolean = false
 
     override fun getLayoutResId(): Int {
         return R.layout.activity_maintenance
     }
 
+    override fun getContentView(): View {
+        binding = ActivityMaintenanceBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         val data = intent.extras ?: return
 
-        this.titleTextView.text = data.getString("title")
+        binding.titleTextView.text = data.getString("title")
 
         @Suppress("DEPRECATION")
-        imageView.setImageURI(data.getString("imageUrl")?.toUri())
-        this.descriptionTextView.setMarkdown(data.getString("description"))
-        this.descriptionTextView.movementMethod = LinkMovementMethod.getInstance()
+        binding.imageView.setImageURI(data.getString("imageUrl")?.toUri())
+        binding.descriptionTextView.setMarkdown(data.getString("description"))
+        binding.descriptionTextView.movementMethod = LinkMovementMethod.getInstance()
 
         isDeprecationNotice = data.getBoolean("deprecationNotice")
         if (isDeprecationNotice) {
-            this.playStoreButton.visibility = View.VISIBLE
+            binding.playStoreButton.visibility = View.VISIBLE
         } else {
-            this.playStoreButton.visibility = View.GONE
+            binding.playStoreButton.visibility = View.GONE
         }
 
-        playStoreButton.setOnClickListener { openInPlayStore() }
+        binding.playStoreButton.setOnClickListener { openInPlayStore() }
     }
 
     override fun injectActivity(component: UserComponent?) {
@@ -71,7 +69,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..1162cccef 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
@@ -8,20 +8,19 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.*
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.databinding.ActivityIntroBinding
 import com.habitrpg.android.habitica.databinding.ActivityNotificationsBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.Notification
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.notifications.*
 import com.habitrpg.android.habitica.ui.activities.MainActivity.Companion.NOTIFICATION_CLICK
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
@@ -52,10 +51,9 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
 
         inflater = getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
 
-        viewModel = ViewModelProviders.of(this)
-                .get(NotificationsViewModel::class.java)
+        viewModel = ViewModelProvider(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 +76,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()))
     }
@@ -86,10 +84,6 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
     private fun setNotifications(notifications: List<Notification>) {
         this.notifications = notifications
 
-        if (binding.notificationItems == null) {
-            return
-        }
-
         binding.notificationItems.removeAllViewsInLayout()
 
         if (notifications.isEmpty()) {
@@ -303,7 +297,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
 
         compositeSubscription.add(inventoryRepository.getQuestContent(data?.questKey ?: "")
                 .firstElement()
-                .subscribe(Consumer {
+                .subscribe({
                     updateQuestInvitationView(view, it)
                 }, RxErrorHandler.handleEmptyError()))
 
@@ -373,11 +367,6 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
     }
 
     private fun fromHtml(text: String): CharSequence {
-        return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY)
-        } else {
-            @Suppress("DEPRECATION")
-            Html.fromHtml(text)
-        }
+        return text.fromHtml()
     }
-}
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
index 8e1d9dd5f..8e188ceef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
@@ -5,7 +5,10 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.events.ShowSnackbarEvent
 import com.habitrpg.android.habitica.ui.fragments.preferences.*
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import org.greenrobot.eventbus.Subscribe
 
 class PrefsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
 
@@ -49,6 +52,11 @@ class PrefsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStart
         return false
     }
 
+    @Subscribe
+    fun showSnackBarEvent(event: ShowSnackbarEvent) {
+        HabiticaSnackbar.showSnackbar(findViewById(R.id.snackbar_container), event.leftImage, event.title, event.text, event.specialView, event.rightIcon, event.rightTextColor, event.rightText, event.type)
+    }
+
     private fun createNextPage(preferenceScreen: PreferenceScreen): PreferenceFragmentCompat? =
             when (preferenceScreen.key) {
                 "profile" -> ProfilePreferencesFragment()
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..891700c37 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
@@ -6,47 +6,29 @@ import android.os.Build
 import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.EditText
-import android.widget.ImageButton
-import android.widget.TextView
 import androidx.annotation.RequiresApi
-import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.navigation.navArgs
-import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.ActivityReportMessageBinding
 import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 
 class ReportMessageActivity : BaseActivity() {
 
+    private lateinit var binding: ActivityReportMessageBinding
+
     @Inject
     lateinit var socialRepository: SocialRepository
 
-    private val toolbar: Toolbar by bindView(R.id.toolbar)
-    private val toolbarTextView: TextView by bindView(R.id.toolbar_title)
-    private val closeButton: ImageButton by bindView(R.id.close_button)
-    private val reportButton: Button by bindView(R.id.report_button)
-    private val appBar: AppBarLayout by bindView(R.id.app_bar)
-    private val bottomSheetView: View by bindView(R.id.bottom_sheet)
-    private val contentContainer: ViewGroup by bindView(R.id.content_container)
-    private val dismissTouchView: View by bindView(R.id.touch_outside)
-    private val titleTextView: TextView by bindView(R.id.title_text_view)
-    private val messageTextView: TextView by bindView(R.id.message_text_view)
-    private val additionInfoEditText: EditText by bindView(R.id.additional_info_edittext)
-    private val reportExplanationTextView: TextView by bindView(R.id.report_explanation_textview)
     private var raisedElevation = 0f
 
     private var messageID: String? = null
@@ -60,21 +42,26 @@ class ReportMessageActivity : BaseActivity() {
         component?.inject(this)
     }
 
+    override fun getContentView(): View {
+        binding = ActivityReportMessageBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     private var chatMessage: ChatMessage? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.title = ""
-        raisedElevation = appBar.elevation
+        raisedElevation = binding.appBar.elevation
         setStatusBarDim(true)
 
-        contentContainer.setOnTouchListener { _, _ -> true }
-        dismissTouchView.setOnClickListener { finish() }
-        reportExplanationTextView.setMarkdown(getString(R.string.report_explanation))
+        binding.contentContainer.setOnTouchListener { _, _ -> true }
+        binding.touchOutside.setOnClickListener { finish() }
+        binding.reportExplanationTextview.setMarkdown(getString(R.string.report_explanation))
 
-        BottomSheetBehavior.from<View>(bottomSheetView)
-                .setBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
+        BottomSheetBehavior.from<View>(binding.bottomSheet)
+                .addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
                     @SuppressLint("SwitchIntDef")
                     override fun onStateChanged(bottomSheet: View, newState: Int) {
                         when (newState) {
@@ -91,17 +78,17 @@ class ReportMessageActivity : BaseActivity() {
 
         val args = navArgs<ReportMessageActivityArgs>().value
         messageID = args.messageID
-        titleTextView.text = getString(R.string.report_message_title, args.profileName)
-        messageTextView.text = args.text
+        binding.titleTextView.text = getString(R.string.report_message_title, args.profileName)
+        binding.messageTextView.text = args.text
 
         messageID?.let {messageID ->
-            compositeSubscription.add(socialRepository.getChatmessage(messageID).subscribe(Consumer {
+            compositeSubscription.add(socialRepository.getChatmessage(messageID).subscribe({
                 chatMessage = it
             }, RxErrorHandler.handleEmptyError()))
         }
 
-        reportButton.setOnClickListener { reportMessage() }
-        closeButton.setOnClickListener { finish() }
+        binding.reportButton.setOnClickListener { reportMessage() }
+        binding.closeButton.setOnClickListener { finish() }
     }
 
     override fun onBackPressed() {
@@ -115,9 +102,9 @@ class ReportMessageActivity : BaseActivity() {
         }
         chatMessage?.let {
             isReporting = true
-            socialRepository.flagMessage(it, additionInfoEditText.text.toString())
+            socialRepository.flagMessage(it, binding.additionalInfoEdittext.text.toString())
                     .doOnError { isReporting = false }
-                    .subscribe(Consumer {
+                    .subscribe({
                 finish()
             }, RxErrorHandler.handleEmptyError())
         }
@@ -125,15 +112,15 @@ class ReportMessageActivity : BaseActivity() {
 
     private fun setStatusBarDim(dim: Boolean) {
         if (dim) {
-            appBar.elevation = 0f
+            binding.appBar.elevation = 0f
             window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
-            closeButton.visibility = View.GONE
-            toolbarTextView.setTypeface(null, Typeface.BOLD)
+            binding.closeButton.visibility = View.GONE
+            binding.toolbarTitle.setTypeface(null, Typeface.BOLD)
         } else {
-            appBar.elevation = 8f
-            window.statusBarColor = ContextCompat.getColor(this, R.color.gray_600)
-            closeButton.visibility = View.VISIBLE
-            toolbarTextView.setTypeface(null, Typeface.NORMAL)
+            binding.appBar.elevation = 8f
+            window.statusBarColor = ContextCompat.getColor(this, R.color.offset_background)
+            binding.closeButton.visibility = View.VISIBLE
+            binding.toolbarTitle.setTypeface(null, Typeface.NORMAL)
         }
 
         if (Build.VERSION.SDK_INT >= VERSION_CODES.M) {
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..a32b6df70 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
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
-import android.widget.Button
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
@@ -24,23 +23,22 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.ActivitySetupBinding
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.FadingViewPager
-import com.viewpagerindicator.IconPageIndicator
 import com.viewpagerindicator.IconPagerAdapter
-import io.reactivex.BackpressureStrategy
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.BackpressureStrategy
 import java.util.*
 import javax.inject.Inject
 
 class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
 
+    private lateinit var binding: ActivitySetupBinding
+
     @Inject
     lateinit var apiClient: ApiClient
     @Inject
@@ -52,11 +50,6 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     @Inject
     lateinit var taskRepository: TaskRepository
 
-    private val pager: FadingViewPager by bindView(R.id.viewPager)
-    private val nextButton: Button by bindView(R.id.nextButton)
-    private val previousButton: Button by bindView(R.id.previousButton)
-    private val indicator: IconPageIndicator by bindView(R.id.view_pager_indicator)
-
     internal var welcomeFragment: WelcomeFragment? = null
     internal var avatarSetupFragment: AvatarSetupFragment? = null
     internal var taskSetupFragment: TaskSetupFragment? = null
@@ -65,16 +58,21 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     private var createdTasks = false
 
     private val isLastPage: Boolean
-        get() = this.pager.adapter == null || this.pager.currentItem == (this.pager.adapter?.count ?: 0) - 1
+        get() = binding.viewPager.adapter == null || binding.viewPager.currentItem == (binding.viewPager.adapter?.count ?: 0) - 1
 
     override fun getLayoutResId(): Int {
         return R.layout.activity_setup
     }
 
+    override fun getContentView(): View {
+        binding = ActivitySetupBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     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 +81,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()))
             }
         }
 
@@ -96,10 +94,10 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             window.statusBarColor = ContextCompat.getColor(this, R.color.days_gray)
         }
 
-        pager.disableFading = true
+        binding.viewPager.disableFading = true
 
-        previousButton.setOnClickListener { previousClicked() }
-        nextButton.setOnClickListener { nextClicked() }
+        binding.previousButton.setOnClickListener { previousClicked() }
+        binding.nextButton.setOnClickListener { nextClicked() }
     }
 
     override fun injectActivity(component: UserComponent?) {
@@ -114,10 +112,10 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     private fun setupViewpager() {
         val fragmentManager = supportFragmentManager
 
-        pager.adapter = ViewPageAdapter(fragmentManager)
+        binding.viewPager.adapter = ViewPageAdapter(fragmentManager)
 
-        pager.addOnPageChangeListener(this)
-        indicator.setViewPager(pager)
+        binding.viewPager.addOnPageChangeListener(this)
+        binding.viewPagerIndicator.setViewPager(binding.viewPager)
     }
 
     private fun nextClicked() {
@@ -137,45 +135,45 @@ 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) {
+        } else if (binding.viewPager.currentItem == 0) {
 
             confirmNames(welcomeFragment?.displayName ?: "", welcomeFragment?.username ?: "")
 
             val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
             imm?.hideSoftInputFromWindow(currentFocus?.windowToken, 0)
         }
-        this.pager.currentItem = this.pager.currentItem + 1
+        binding.viewPager.currentItem = binding.viewPager.currentItem + 1
     }
 
     private fun previousClicked() {
-        this.pager.currentItem = this.pager.currentItem - 1
+        binding.viewPager.currentItem = binding.viewPager.currentItem - 1
     }
 
     private fun setPreviousButtonEnabled(enabled: Boolean) {
         val leftDrawable: Drawable?
         if (enabled) {
-            previousButton.setText(R.string.action_back)
+            binding.previousButton.setText(R.string.action_back)
             leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_enabled)
         } else {
-            previousButton.text = null
+            binding.previousButton.text = null
             leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_disabled)
         }
-        previousButton.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, null, null, null)
+        binding.previousButton.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, null, null, null)
     }
 
     private fun setNextButtonEnabled(enabled: Boolean) {
-        nextButton.isEnabled = enabled
+        binding.nextButton.isEnabled = enabled
         val rightDrawable = AppCompatResources.getDrawable(this, R.drawable.forward_arrow_enabled)
         if (enabled) {
-            nextButton.setTextColor(ContextCompat.getColor(this, R.color.white))
+            binding.nextButton.setTextColor(ContextCompat.getColor(this, R.color.white))
             rightDrawable?.alpha = 255
         } else {
-            nextButton.setTextColor(ContextCompat.getColor(this, R.color.white_50_alpha))
+            binding.nextButton.setTextColor(ContextCompat.getColor(this, R.color.white_50_alpha))
             rightDrawable?.alpha = 127
         }
-        nextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rightDrawable, null)
+        binding.nextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rightDrawable, null)
     }
 
     override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = Unit
@@ -184,15 +182,15 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         when {
             position == 0 -> {
                 this.setPreviousButtonEnabled(false)
-                this.nextButton.text = this.getString(R.string.next_button)
+                binding.nextButton.text = this.getString(R.string.next_button)
             }
             isLastPage -> {
                 this.setPreviousButtonEnabled(true)
-                this.nextButton.text = this.getString(R.string.intro_finish_button)
+                binding.nextButton.text = this.getString(R.string.finish)
             }
             else -> {
                 this.setPreviousButtonEnabled(true)
-                this.nextButton.text = this.getString(R.string.next_button)
+                binding.nextButton.text = this.getString(R.string.next_button)
             }
         }
     }
@@ -205,7 +203,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("flags.welcomed", true).subscribe({
                 if (!compositeSubscription.isDisposed) {
                     compositeSubscription.dispose()
                 }
@@ -214,7 +212,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             return
         }
         this.user = user
-        if (pager.adapter == null) {
+        if (binding.viewPager.adapter == null) {
             setupViewpager()
         }
         avatarSetupFragment?.setUser(user)
@@ -229,12 +227,12 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     }
 
     private fun confirmNames(displayName: String, username: String) {
-        compositeSubscription.add(userRepository.updateUser(null, "profile.name", displayName)
+        compositeSubscription.add(userRepository.updateUser("profile.name", displayName)
                 .flatMap { userRepository.updateLoginName(username).toFlowable() }
-                .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+                .subscribe({  }, RxErrorHandler.handleEmptyError()))
     }
 
-    private inner class ViewPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter {
+    private inner class ViewPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
 
         override fun getItem(position: Int): Fragment {
             return when (position) {
@@ -242,7 +240,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
                     val fragment = AvatarSetupFragment()
                     fragment.activity = this@SetupActivity
                     fragment.setUser(user)
-                    fragment.width = pager.width
+                    fragment.width = binding.viewPager.width
                     avatarSetupFragment = fragment
                     fragment
                 }
@@ -270,7 +268,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
                     avatarSetupFragment = item
                     item.activity = this@SetupActivity
                     item.setUser(user)
-                    item.width = pager.width
+                    item.width = binding.viewPager.width
                 }
                 is TaskSetupFragment -> {
                     taskSetupFragment = item
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..58b91aad9 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
@@ -3,21 +3,19 @@ package com.habitrpg.android.habitica.ui.activities
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 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.databinding.ActivitySkillMembersBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 class SkillMemberActivity : BaseActivity() {
-    private val recyclerView: RecyclerView by bindView(R.id.recyclerView)
-
+    private lateinit var binding: ActivitySkillMembersBinding
     private var viewAdapter: PartyMemberRecyclerViewAdapter? = null
 
     @Inject
@@ -33,6 +31,11 @@ class SkillMemberActivity : BaseActivity() {
         component?.inject(this)
     }
 
+    override fun getContentView(): View {
+        binding = ActivitySkillMembersBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setupToolbar(findViewById(R.id.toolbar))
@@ -40,19 +43,18 @@ class SkillMemberActivity : BaseActivity() {
     }
 
     private fun loadMemberList() {
-        recyclerView.layoutManager = LinearLayoutManager(this)
-        viewAdapter = PartyMemberRecyclerViewAdapter(null, true)
-        viewAdapter?.getUserClickedEvents()?.subscribe(Consumer { userId ->
+        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        viewAdapter = PartyMemberRecyclerViewAdapter()
+        viewAdapter?.getUserClickedEvents()?.subscribe({ userId ->
             val resultIntent = Intent()
             resultIntent.putExtra("member_id", userId)
             setResult(Activity.RESULT_OK, resultIntent)
             finish()
         }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
-        recyclerView.adapter = viewAdapter
+        binding.recyclerView.adapter = viewAdapter
 
         compositeSubscription.add(userRepository.getUser()
-                .firstElement()
-                .flatMap { user -> socialRepository.getGroupMembers(user.party?.id ?: "").firstElement() }
-                .subscribe(Consumer { viewAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
+                .flatMap { user -> socialRepository.getGroupMembers(user.party?.id ?: "") }
+                .subscribe({ viewAdapter?.data = 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..dbdbbffcc 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
@@ -5,33 +5,30 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.SparseArray
 import android.view.MenuItem
+import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
-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.data.TaskRepository
+import com.habitrpg.android.habitica.databinding.ActivitySkillTasksBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 import javax.inject.Named
 
 class SkillTasksActivity : BaseActivity() {
 
+    private lateinit var binding: ActivitySkillTasksBinding
+
     @Inject
     lateinit var taskRepository: TaskRepository
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
 
-    private val viewPager: ViewPager by bindView(R.id.viewPager)
-    private val tabLayout: TabLayout by bindView(R.id.tab_layout)
-
     internal var viewFragmentsDictionary = SparseArray<SkillTasksRecyclerViewFragment>()
 
     override fun getLayoutResId(): Int {
@@ -44,6 +41,11 @@ class SkillTasksActivity : BaseActivity() {
         loadTaskLists()
     }
 
+    override fun getContentView(): View {
+        binding = ActivitySkillTasksBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun injectActivity(component: UserComponent?) {
         component?.inject(this)
     }
@@ -51,7 +53,7 @@ class SkillTasksActivity : BaseActivity() {
     private fun loadTaskLists() {
         val fragmentManager = supportFragmentManager
 
-        viewPager.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+        binding.viewPager.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): Fragment {
                 val fragment = SkillTasksRecyclerViewFragment()
@@ -61,7 +63,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 +79,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
@@ -98,7 +100,7 @@ class SkillTasksActivity : BaseActivity() {
         }
 
 
-        tabLayout.setupWithViewPager(viewPager)
+        binding.tabLayout.setupWithViewPager(binding.viewPager)
     }
 
     fun taskSelected(task: Task) {
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 77f5e90df..9ebd4d9f5 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
@@ -1,29 +1,28 @@
 package com.habitrpg.android.habitica.ui.activities
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.os.Handler
 import android.view.*
-import android.view.inputmethod.InputMethodManager
 import android.widget.CheckBox
-import android.widget.EditText
-import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatCheckBox
-import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.core.view.children
 import androidx.core.view.forEachIndexed
 import androidx.core.widget.NestedScrollView
-import com.google.android.material.textfield.TextInputLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.*
+import com.habitrpg.android.habitica.data.ChallengeRepository
+import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.ActivityTaskFormBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.dpToPx
@@ -35,11 +34,8 @@ import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.tasks.HabitResetOption
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.tasks.form.*
-import io.reactivex.functions.Consumer
 import io.realm.RealmList
 import java.util.*
 import javax.inject.Inject
@@ -47,6 +43,7 @@ import javax.inject.Inject
 
 class TaskFormActivity : BaseActivity() {
 
+    private lateinit var binding: ActivityTaskFormBinding
     private var userScrolled: Boolean = false
     private var isSaving: Boolean = false
     @Inject
@@ -59,46 +56,9 @@ class TaskFormActivity : BaseActivity() {
     lateinit var taskAlarmManager: TaskAlarmManager
     @Inject
     lateinit var challengeRepository: ChallengeRepository
+    @Inject
+    lateinit var sharedPreferences: SharedPreferences
 
-    private val toolbar: Toolbar by bindView(R.id.toolbar)
-    private val scrollView: NestedScrollView by bindView(R.id.scroll_view)
-    private val upperTextWrapper: LinearLayout by bindView(R.id.upper_text_wrapper)
-    private val textInputLayout: TextInputLayout by bindView(R.id.text_input_layout)
-    private val textEditText: EditText by bindView(R.id.text_edit_text)
-    private val notesInputLayout: TextInputLayout by bindView(R.id.notes_input_layout)
-    private val notesEditText: EditText by bindView(R.id.notes_edit_text)
-    private val habitScoringButtons: HabitScoringButtonsView by bindView(R.id.habit_scoring_buttons)
-    private val checklistTitleView: TextView by bindView(R.id.checklist_title)
-    private val checklistContainer: ChecklistContainer by bindView(R.id.checklist_container)
-    private val habitResetStreakTitleView: TextView by bindView(R.id.habit_reset_streak_title)
-    private val habitResetStreakButtons: HabitResetStreakButtons by bindView(R.id.habit_reset_streak_buttons)
-    private val taskSchedulingTitleView: TextView by bindView(R.id.scheduling_title)
-    private val taskSchedulingControls: TaskSchedulingControls by bindView(R.id.scheduling_controls)
-    private val adjustStreakWrapper: ViewGroup by bindView(R.id.adjust_streak_wrapper)
-    private val adjustStreakTitleView: TextView by bindView(R.id.adjust_streak_title)
-    private val habitAdjustPositiveStreakView: EditText by bindView(R.id.habit_adjust_positive_streak)
-    private val habitAdjustNegativeStreakView: EditText by bindView(R.id.habit_adjust_negative_streak)
-    private val remindersTitleView: TextView by bindView(R.id.reminders_title)
-    private val remindersContainer: ReminderContainer by bindView(R.id.reminders_container)
-
-    private val taskDifficultyTitleView: TextView by bindView(R.id.task_difficulty_title)
-    private val taskDifficultyButtons: TaskDifficultyButtons by bindView(R.id.task_difficulty_buttons)
-
-    private val statWrapper: ViewGroup by bindView(R.id.stat_wrapper)
-    private val statStrengthButton: TextView by bindView(R.id.stat_strength_button)
-    private val statIntelligenceButton: TextView by bindView(R.id.stat_intelligence_button)
-    private val statConstitutionButton: TextView by bindView(R.id.stat_constitution_button)
-    private val statPerceptionButton: TextView by bindView(R.id.stat_perception_button)
-
-    private val rewardValueTitleView: TextView by bindView(R.id.reward_value_title)
-    private val stepperValueFormView: StepperValueFormView by bindView(R.id.reward_value)
-
-    private val tagsTitleView: TextView by bindView(R.id.tags_title)
-    private val tagsWrapper: LinearLayout by bindView(R.id.tags_wrapper)
-
-    override var overrideModernHeader: Boolean? = false
-
-    private val challengeNameView: TextView by bindView(R.id.challenge_name_view)
     private var challenge: Challenge? = null
 
     private var isCreating = true
@@ -120,10 +80,10 @@ class TaskFormActivity : BaseActivity() {
     private var tintColor: Int = 0
     set(value) {
         field = value
-        taskDifficultyButtons.tintColor = value
-        habitScoringButtons.tintColor = value
-        habitResetStreakButtons.tintColor = value
-        taskSchedulingControls.tintColor = value
+        binding.taskDifficultyButtons.tintColor = value
+        binding.habitScoringButtons.tintColor = value
+        binding.habitResetStreakButtons.tintColor = value
+        binding.taskSchedulingControls.tintColor = value
         updateTagViewsColors()
     }
 
@@ -131,14 +91,21 @@ class TaskFormActivity : BaseActivity() {
         return R.layout.activity_task_form
     }
 
+    override fun getContentView(): View {
+        binding = ActivityTaskFormBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun injectActivity(component: UserComponent?) {
         component?.inject(this)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        overrideModernHeader = false
         val bundle = intent.extras ?: return
 
         val taskId = bundle.getString(TASK_ID_KEY)
+        forcedIsNight = false
         forcedTheme = if (taskId != null) {
             val taskValue = bundle.getDouble(TASK_VALUE_KEY)
             when {
@@ -151,23 +118,25 @@ class TaskFormActivity : BaseActivity() {
                 else -> "blue"
             }
         } else {
-            "purple"
+            "taskform"
         }
         super.onCreate(savedInstanceState)
 
         if (forcedTheme == "yellow") {
-            taskDifficultyButtons.textTintColor = ContextCompat.getColor(this, R.color.yellow_5)
-            habitScoringButtons.textTintColor = ContextCompat.getColor(this, R.color.yellow_5)
+            binding.taskDifficultyButtons.textTintColor = ContextCompat.getColor(this, R.color.text_yellow)
+            binding.habitScoringButtons.textTintColor = ContextCompat.getColor(this, R.color.text_yellow)
+        } else if (forcedTheme == "taskform") {
+            binding.taskDifficultyButtons.textTintColor = ContextCompat.getColor(this, R.color.text_brand_neon)
+            binding.habitScoringButtons.textTintColor = ContextCompat.getColor(this, R.color.text_brand_neon)
         }
 
-
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
         tintColor = getThemeColor(R.attr.taskFormTint)
-        val upperTintColor = if (forcedTheme == "purple") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
+        val upperTintColor = if (forcedTheme == "taskform") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
         supportActionBar?.setBackgroundDrawable(ColorDrawable(upperTintColor))
-        upperTextWrapper.setBackgroundColor(upperTintColor)
+        binding.upperTextWrapper.setBackgroundColor(upperTintColor)
 
 
         isChallengeTask = bundle.getBoolean(IS_CHALLENGE_TASK, false)
@@ -177,35 +146,35 @@ 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()))
 
 
-        textEditText.addTextChangedListener(OnChangeTextWatcher { _, _, _, _ ->
+        binding.textEditText.addTextChangedListener(OnChangeTextWatcher { _, _, _, _ ->
             checkCanSave()
         })
-        textEditText.onFocusChangeListener = View.OnFocusChangeListener { _, isFocused ->
-            textInputLayout.alpha = if (isFocused) 1.0f else 0.75f
+        binding.textEditText.onFocusChangeListener = View.OnFocusChangeListener { _, isFocused ->
+            binding.textInputLayout.alpha = if (isFocused) 0.8f else 0.6f
             window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
         }
-        notesEditText.onFocusChangeListener = View.OnFocusChangeListener { _, isFocused ->
-            notesInputLayout.alpha = if (isFocused) 1.0f else 0.75f
+        binding.notesEditText.onFocusChangeListener = View.OnFocusChangeListener { _, isFocused ->
+            binding.notesInputLayout.alpha = if (isFocused) 0.8f else 0.6f
         }
-        statStrengthButton.setOnClickListener { selectedStat = Stats.STRENGTH }
-        statIntelligenceButton.setOnClickListener { selectedStat = Stats.INTELLIGENCE }
-        statConstitutionButton.setOnClickListener { selectedStat = Stats.CONSTITUTION }
-        statPerceptionButton.setOnClickListener { selectedStat = Stats.PERCEPTION }
-        scrollView.setOnTouchListener { view, event ->
-            userScrolled = view == scrollView && (event.action == MotionEvent.ACTION_SCROLL || event.action == MotionEvent.ACTION_MOVE)
+        binding.statStrengthButton.setOnClickListener { selectedStat = Stats.STRENGTH }
+        binding.statIntelligenceButton.setOnClickListener { selectedStat = Stats.INTELLIGENCE }
+        binding.statConstitutionButton.setOnClickListener { selectedStat = Stats.CONSTITUTION }
+        binding.statPerceptionButton.setOnClickListener { selectedStat = Stats.PERCEPTION }
+        binding.scrollView.setOnTouchListener { view, event ->
+            userScrolled = view == binding.scrollView && (event.action == MotionEvent.ACTION_SCROLL || event.action == MotionEvent.ACTION_MOVE)
             return@setOnTouchListener false
         }
-        scrollView.setOnScrollChangeListener { _: NestedScrollView?, _: Int, _: Int, _: Int, _: Int ->
+        binding.scrollView.setOnScrollChangeListener { _: NestedScrollView?, _: Int, _: Int, _: Int, _: Int ->
             if (userScrolled) {
                 dismissKeyboard()
             }
@@ -215,16 +184,16 @@ 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 ->
+                    it.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
+                                    binding.challengeNameView.text = getString(R.string.challenge_task_name, challenge.name)
+                                    binding.challengeNameView.visibility = View.VISIBLE
                         }, RxErrorHandler.handleEmptyError()))
                     }
                 }, RxErrorHandler.handleEmptyError()))
@@ -244,9 +213,17 @@ class TaskFormActivity : BaseActivity() {
         configureForm()
     }
 
+    override fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean) {
+        super.loadTheme(sharedPreferences, forced)
+        val upperTintColor = if (forcedTheme == "taskform") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
+        window.statusBarColor = upperTintColor
+    }
+
     override fun onStart() {
         super.onStart()
-        textEditText.requestFocus()
+        if (isCreating) {
+            binding.textEditText.requestFocus()
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -263,16 +240,12 @@ class TaskFormActivity : BaseActivity() {
         when (item.itemId) {
             R.id.action_save -> saveTask()
             R.id.action_delete -> deleteTask()
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
         }
         return super.onOptionsItemSelected(item)
     }
 
     private fun checkCanSave() {
-        val newCanSave = textEditText.text.isNotBlank()
+        val newCanSave = binding.textEditText.text?.isNotBlank() == true
         if (newCanSave != canSave) {
             invalidateOptionsMenu()
         }
@@ -280,54 +253,61 @@ class TaskFormActivity : BaseActivity() {
     }
 
     private fun configureForm() {
+        val firstDayOfWeek = sharedPreferences.getString("FirstDayOfTheWeek", "-1")?.toInt() ?: -1
         val habitViewsVisibility = if (taskType == Task.TYPE_HABIT) View.VISIBLE else View.GONE
-        habitScoringButtons.visibility = habitViewsVisibility
-        habitResetStreakTitleView.visibility = habitViewsVisibility
-        habitResetStreakButtons.visibility = habitViewsVisibility
-        habitAdjustNegativeStreakView.visibility = habitViewsVisibility
+        binding.habitScoringButtons.visibility = habitViewsVisibility
+        binding.habitResetStreakTitleView.visibility = habitViewsVisibility
+        binding.habitResetStreakButtons.visibility = habitViewsVisibility
+        binding.habitAdjustNegativeStreakView.visibility = habitViewsVisibility
+        if (taskType == Task.TYPE_HABIT) {
+            binding.habitScoringButtons.isPositive = true
+            binding.habitScoringButtons.isNegative = false
+        }
 
         val habitDailyVisibility = if (taskType == Task.TYPE_DAILY || taskType == Task.TYPE_HABIT) View.VISIBLE else View.GONE
-        adjustStreakTitleView.visibility = habitDailyVisibility
-        adjustStreakWrapper.visibility = habitDailyVisibility
+        binding.adjustStreakTitleView.visibility = habitDailyVisibility
+        binding.adjustStreakWrapper.visibility = habitDailyVisibility
         if (taskType == Task.TYPE_HABIT) {
-            habitAdjustPositiveStreakView.hint = getString(R.string.positive_habit_form)
+            binding.habitAdjustPositiveStreakView.hint = getString(R.string.positive_habit_form)
         } else {
-            habitAdjustPositiveStreakView.hint = getString(R.string.streak)
+            binding.habitAdjustPositiveStreakView.hint = getString(R.string.streak)
         }
 
         val todoDailyViewsVisibility = if (taskType == Task.TYPE_DAILY || taskType == Task.TYPE_TODO) View.VISIBLE else View.GONE
 
-        checklistTitleView.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
-        checklistContainer.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
+        binding.checklistTitleView.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
+        binding.checklistContainer.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
 
-        remindersTitleView.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
-        remindersContainer.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
-        remindersContainer.taskType = taskType
+        binding.remindersTitleView.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
+        binding.remindersContainer.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
+        binding.remindersContainer.taskType = taskType
+        binding.remindersContainer.firstDayOfWeek = firstDayOfWeek
 
-        taskSchedulingTitleView.visibility = todoDailyViewsVisibility
-        taskSchedulingControls.visibility = todoDailyViewsVisibility
-        taskSchedulingControls.taskType = taskType
+        binding.schedulingTitleView.visibility = todoDailyViewsVisibility
+        binding.taskSchedulingControls.visibility = todoDailyViewsVisibility
+        binding.taskSchedulingControls.taskType = taskType
+        binding.taskSchedulingControls.firstDayOfWeek = firstDayOfWeek
 
         val rewardHideViews = if (taskType == Task.TYPE_REWARD) View.GONE else View.VISIBLE
-        taskDifficultyTitleView.visibility = rewardHideViews
-        taskDifficultyButtons.visibility = rewardHideViews
+        binding.taskDifficultyTitleView.visibility = rewardHideViews
+        binding.taskDifficultyButtons.visibility = rewardHideViews
 
         val rewardViewsVisibility = if (taskType == Task.TYPE_REWARD) View.VISIBLE else View.GONE
-        rewardValueTitleView.visibility = rewardViewsVisibility
-        stepperValueFormView.visibility = rewardViewsVisibility
+        binding.rewardValueTitleView.visibility = rewardViewsVisibility
+        binding.rewardValue.visibility = rewardViewsVisibility
 
-        tagsTitleView.visibility = if (isChallengeTask) View.GONE else View.VISIBLE
-        tagsWrapper.visibility = if (isChallengeTask) View.GONE else View.VISIBLE
+        binding.tagsTitleView.visibility = if (isChallengeTask) View.GONE else View.VISIBLE
+        binding.tagsWrapper.visibility = if (isChallengeTask) View.GONE else View.VISIBLE
 
-        statWrapper.visibility = if (usesTaskAttributeStats) View.VISIBLE else View.GONE
+        binding.statWrapper.visibility = if (usesTaskAttributeStats) View.VISIBLE else View.GONE
         if (isCreating) {
-            adjustStreakTitleView.visibility = View.GONE
-            adjustStreakWrapper.visibility = View.GONE
+            binding.adjustStreakTitleView.visibility = View.GONE
+            binding.adjustStreakWrapper.visibility = View.GONE
         }
     }
 
     private fun setTagViews() {
-        tagsWrapper.removeAllViews()
+        binding.tagsWrapper.removeAllViews()
         val padding = 20.dpToPx(this)
         for (tag in tags) {
             val view = CheckBox(this)
@@ -336,7 +316,7 @@ class TaskFormActivity : BaseActivity() {
             if (preselectedTags?.contains(tag.id) == true) {
                 view.isChecked = true
             }
-            tagsWrapper.addView(view)
+            binding.tagsWrapper.addView(view)
         }
         setAllTagSelections()
         updateTagViewsColors()
@@ -345,7 +325,7 @@ class TaskFormActivity : BaseActivity() {
     private fun setAllTagSelections() {
         if (hasPreselectedTags) {
             tags.forEachIndexed { index, tag ->
-                val view = tagsWrapper.getChildAt(index) as? CheckBox
+                val view = binding.tagsWrapper.getChildAt(index) as? CheckBox
                 view?.isChecked = task?.tags?.find { it.id == tag.id } != null
             }
         } else {
@@ -358,43 +338,43 @@ class TaskFormActivity : BaseActivity() {
             return
         }
         canSave = true
-        textEditText.setText(task.text)
-        notesEditText.setText(task.notes)
-        taskDifficultyButtons.selectedDifficulty = task.priority
+        binding.textEditText.setText(task.text)
+        binding.notesEditText.setText(task.notes)
+        binding.taskDifficultyButtons.selectedDifficulty = task.priority
         when (taskType) {
             Task.TYPE_HABIT -> {
-                habitScoringButtons.isPositive = task.up ?: false
-                habitScoringButtons.isNegative = task.down ?: false
+                binding.habitScoringButtons.isPositive = task.up ?: false
+                binding.habitScoringButtons.isNegative = task.down ?: false
                 task.frequency?.let {
                     if (it.isNotBlank()) {
-                        habitResetStreakButtons.selectedResetOption = HabitResetOption.valueOf(it.toUpperCase(Locale.US))
+                        binding.habitResetStreakButtons.selectedResetOption = HabitResetOption.valueOf(it.toUpperCase(Locale.US))
                     }
                 }
-                habitAdjustPositiveStreakView.setText((task.counterUp ?: 0).toString())
-                habitAdjustNegativeStreakView.setText((task.counterDown ?: 0).toString())
-                habitAdjustPositiveStreakView.visibility = if (task.up == true) View.VISIBLE else View.GONE
-                habitAdjustNegativeStreakView.visibility = if (task.down == true) View.VISIBLE else View.GONE
+                binding.habitAdjustPositiveStreakView.setText((task.counterUp ?: 0).toString())
+                binding.habitAdjustNegativeStreakView.setText((task.counterDown ?: 0).toString())
+                binding.habitAdjustPositiveStreakView.visibility = if (task.up == true) View.VISIBLE else View.GONE
+                binding.habitAdjustNegativeStreakView.visibility = if (task.down == true) View.VISIBLE else View.GONE
                 if (task.up != true && task.down != true) {
-                    adjustStreakTitleView.visibility = View.GONE
-                    adjustStreakWrapper.visibility = View.GONE
+                    binding.adjustStreakTitleView.visibility = View.GONE
+                    binding.adjustStreakWrapper.visibility = View.GONE
                 }
             }
             Task.TYPE_DAILY -> {
-                taskSchedulingControls.startDate = task.startDate ?: Date()
-                taskSchedulingControls.everyX = task.everyX ?: 1
-                task.repeat?.let { taskSchedulingControls.weeklyRepeat = it }
-                taskSchedulingControls.daysOfMonth = task.getDaysOfMonth()
-                taskSchedulingControls.weeksOfMonth = task.getWeeksOfMonth()
-                habitAdjustPositiveStreakView.setText((task.streak ?: 0).toString())
-                taskSchedulingControls.frequency = task.frequency ?: Task.FREQUENCY_DAILY
+                binding.taskSchedulingControls.startDate = task.startDate ?: Date()
+                binding.taskSchedulingControls.everyX = task.everyX ?: 1
+                task.repeat?.let { binding.taskSchedulingControls.weeklyRepeat = it }
+                binding.taskSchedulingControls.daysOfMonth = task.getDaysOfMonth()
+                binding.taskSchedulingControls.weeksOfMonth = task.getWeeksOfMonth()
+                binding.habitAdjustPositiveStreakView.setText((task.streak ?: 0).toString())
+                binding.taskSchedulingControls.frequency = task.frequency ?: Task.FREQUENCY_DAILY
             }
-            Task.TYPE_TODO -> taskSchedulingControls.dueDate = task.dueDate
-            Task.TYPE_REWARD -> stepperValueFormView.value = task.value
+            Task.TYPE_TODO -> binding.taskSchedulingControls.dueDate = task.dueDate
+            Task.TYPE_REWARD -> binding.rewardValue.value = task.value
         }
         if (taskType == Task.TYPE_DAILY || taskType == Task.TYPE_TODO) {
-            task.checklist?.let { checklistContainer.checklistItems = it }
-            remindersContainer.taskType = taskType
-            task.reminders?.let { remindersContainer.reminders = it }
+            task.checklist?.let { binding.checklistContainer.checklistItems = it }
+            binding.remindersContainer.taskType = taskType
+            task.reminders?.let { binding.remindersContainer.reminders = it }
         }
         task.attribute?.let { selectedStat = it }
         setAllTagSelections()
@@ -402,15 +382,15 @@ class TaskFormActivity : BaseActivity() {
 
     private fun setSelectedAttribute(attributeName: String) {
         if (!usesTaskAttributeStats) return
-        configureStatsButton(statStrengthButton, attributeName == Stats.STRENGTH )
-        configureStatsButton(statIntelligenceButton, attributeName == Stats.INTELLIGENCE )
-        configureStatsButton(statConstitutionButton, attributeName == Stats.CONSTITUTION )
-        configureStatsButton(statPerceptionButton, attributeName == Stats.PERCEPTION )
+        configureStatsButton(binding.statStrengthButton, attributeName == Stats.STRENGTH )
+        configureStatsButton(binding.statIntelligenceButton, attributeName == Stats.INTELLIGENCE )
+        configureStatsButton(binding.statConstitutionButton, attributeName == Stats.CONSTITUTION )
+        configureStatsButton(binding.statPerceptionButton, attributeName == Stats.PERCEPTION )
     }
 
     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)
@@ -420,13 +400,13 @@ class TaskFormActivity : BaseActivity() {
     }
 
     private fun updateTagViewsColors() {
-        tagsWrapper.children.forEach { view ->
+        binding.tagsWrapper.children.forEach { view ->
             val tagView = view as? AppCompatCheckBox
             val colorStateList = ColorStateList(
                     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
         }
@@ -445,41 +425,41 @@ class TaskFormActivity : BaseActivity() {
         } else {
             if (!thisTask.isValid) return
         }
-        thisTask.text = textEditText.text.toString()
-        thisTask.notes = notesEditText.text.toString()
-        thisTask.priority = taskDifficultyButtons.selectedDifficulty
+        thisTask.text = binding.textEditText.text.toString()
+        thisTask.notes = binding.notesEditText.text.toString()
+        thisTask.priority = binding.taskDifficultyButtons.selectedDifficulty
         if (usesTaskAttributeStats) {
             thisTask.attribute = selectedStat
         }
         if (taskType == Task.TYPE_HABIT) {
-            thisTask.up = habitScoringButtons.isPositive
-            thisTask.down = habitScoringButtons.isNegative
-            thisTask.frequency = habitResetStreakButtons.selectedResetOption.value
-            if (habitAdjustPositiveStreakView.text.isNotEmpty()) thisTask.counterUp = habitAdjustPositiveStreakView.text.toString().toIntCatchOverflow()
-            if (habitAdjustNegativeStreakView.text.isNotEmpty()) thisTask.counterDown = habitAdjustNegativeStreakView.text.toString().toIntCatchOverflow()
+            thisTask.up = binding.habitScoringButtons.isPositive
+            thisTask.down = binding.habitScoringButtons.isNegative
+            thisTask.frequency = binding.habitResetStreakButtons.selectedResetOption.value
+            if (binding.habitAdjustPositiveStreakView.text?.isNotEmpty() == true) thisTask.counterUp = binding.habitAdjustPositiveStreakView.text.toString().toIntCatchOverflow()
+            if (binding.habitAdjustNegativeStreakView.text?.isNotEmpty() == true) thisTask.counterDown = binding.habitAdjustNegativeStreakView.text.toString().toIntCatchOverflow()
         } else if (taskType == Task.TYPE_DAILY) {
-            thisTask.startDate = taskSchedulingControls.startDate
-            thisTask.everyX = taskSchedulingControls.everyX
-            thisTask.frequency = taskSchedulingControls.frequency
-            thisTask.repeat = taskSchedulingControls.weeklyRepeat
-            thisTask.setDaysOfMonth(taskSchedulingControls.daysOfMonth)
-            thisTask.setWeeksOfMonth(taskSchedulingControls.weeksOfMonth)
-            if (habitAdjustPositiveStreakView.text.isNotEmpty()) thisTask.streak = habitAdjustPositiveStreakView.text.toString().toIntCatchOverflow()
+            thisTask.startDate = binding.taskSchedulingControls.startDate
+            thisTask.everyX = binding.taskSchedulingControls.everyX
+            thisTask.frequency = binding.taskSchedulingControls.frequency
+            thisTask.repeat = binding.taskSchedulingControls.weeklyRepeat
+            thisTask.setDaysOfMonth(binding.taskSchedulingControls.daysOfMonth)
+            thisTask.setWeeksOfMonth(binding.taskSchedulingControls.weeksOfMonth)
+            if (binding.habitAdjustPositiveStreakView.text?.isNotEmpty() == true) thisTask.streak = binding.habitAdjustPositiveStreakView.text.toString().toIntCatchOverflow()
         } else if (taskType == Task.TYPE_TODO) {
-            thisTask.dueDate = taskSchedulingControls.dueDate
+            thisTask.dueDate = binding.taskSchedulingControls.dueDate
         } else if (taskType == Task.TYPE_REWARD) {
-            thisTask.value = stepperValueFormView.value
+            thisTask.value = binding.rewardValue.value
         }
 
         val resultIntent = Intent()
         resultIntent.putExtra(TASK_TYPE_KEY, taskType)
         if (!isChallengeTask) {
             if (taskType == Task.TYPE_DAILY || taskType == Task.TYPE_TODO) {
-                thisTask.checklist = checklistContainer.checklistItems
-                thisTask.reminders = remindersContainer.reminders
+                thisTask.checklist = binding.checklistContainer.checklistItems
+                thisTask.reminders = binding.remindersContainer.reminders
             }
             thisTask.tags = RealmList()
-            tagsWrapper.forEachIndexed { index, view ->
+            binding.tagsWrapper.forEachIndexed { index, view ->
                 val tagView = view as? CheckBox
                 if (tagView?.isChecked == true) {
                     thisTask.tags?.add(tags[index])
@@ -507,7 +487,10 @@ class TaskFormActivity : BaseActivity() {
     }
 
     private fun deleteTask() {
-        if (task?.challengeID?.isNotBlank() == true && task?.challengeBroken?.isNotBlank() != true) {
+        if (task?.challengeBroken?.isNotBlank() == true) {
+            showBrokenChallengeDialog()
+            return
+        } else if (task?.challengeID?.isNotBlank() == true) {
             showChallengeDeleteTask()
             return
         }
@@ -515,7 +498,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 +506,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 +516,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 +525,7 @@ class TaskFormActivity : BaseActivity() {
                 challenge?.let {
                     compositeSubscription.add(challengeRepository.leaveChallenge(it, "remove-all")
                             .flatMap { userRepository.retrieveUser(true) }
-                            .subscribe(Consumer {
+                            .subscribe({
                         finish()
                     }, RxErrorHandler.handleEmptyError()))
                 }
@@ -552,6 +535,31 @@ class TaskFormActivity : BaseActivity() {
         }, RxErrorHandler.handleEmptyError()))
     }
 
+    private fun showBrokenChallengeDialog() {
+        val task = task ?: return
+        if (!task.isValid) {
+            return
+        }
+        compositeSubscription.add(taskRepository.getTasksForChallenge(task.challengeID).subscribe({ tasks ->
+            val taskCount = tasks.size
+            val dialog = HabiticaAlertDialog(this)
+            dialog.setTitle(R.string.broken_challenge)
+            dialog.setMessage(this.getString(R.string.broken_challenge_description, taskCount))
+            dialog.addButton(this.getString(R.string.keep_x_tasks, taskCount), true) { _, _ ->
+                taskRepository.unlinkAllTasks(task.challengeID, "keep-all").subscribe({
+                    finish()
+                }, RxErrorHandler.handleEmptyError())
+            }
+            dialog.addButton(this.getString(R.string.delete_x_tasks, taskCount), false, true) { _, _ ->
+                taskRepository.unlinkAllTasks(task.challengeID, "remove-all").subscribe({
+                    finish()
+                }, RxErrorHandler.handleEmptyError())
+            }
+            dialog.setExtraCloseButtonVisibility(View.VISIBLE)
+            dialog.show()
+        }, RxErrorHandler.handleEmptyError()))
+    }
+
 
     override fun finish() {
         dismissKeyboard()
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..327bf8478 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
@@ -5,46 +5,33 @@ import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.ActivityVerifyUsernameBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.runDelayed
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class VerifyUsernameActivity: BaseActivity() {
+    private lateinit var binding: ActivityVerifyUsernameBinding
+
     @Inject
     lateinit var userRepository: UserRepository
 
-    private val displayNameEditText: EditText by bindView(R.id.display_name_edit_text)
-    private val usernameEditText: EditText by bindView(R.id.username_edit_text)
-    private val confirmUsernameButton: Button by bindView(R.id.confirm_username_button)
-    private val issuesTextView: TextView by bindView(R.id.issues_text_view)
-    private val snackbarView: ViewGroup by bindView(R.id.snackbar_view)
-    private val wikiTextView: TextView by bindView(R.id.wiki_text_view)
-    private val footerTextView: TextView by bindView(R.id.footer_text_view)
-
     private val displayNameVerificationEvents = PublishSubject.create<String>()
     private val usernameVerificationEvents = PublishSubject.create<String>()
 
     private val checkmarkIcon: Drawable by lazy {
-        BitmapDrawable(resources, HabiticaIconsHelper.imageOfCheckmark(ContextCompat.getColor(this, R.color.green_50), 1f))
+        BitmapDrawable(resources, HabiticaIconsHelper.imageOfCheckmark(ContextCompat.getColor(this, R.color.text_green), 1f))
     }
     private val alertIcon: Drawable by lazy {
         BitmapDrawable(resources, HabiticaIconsHelper.imageOfAlertIcon())
@@ -54,6 +41,11 @@ class VerifyUsernameActivity: BaseActivity() {
         return R.layout.activity_verify_username
     }
 
+    override fun getContentView(): View {
+        binding = ActivityVerifyUsernameBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
     override fun injectActivity(component: UserComponent?) {
         component?.inject(this)
     }
@@ -61,15 +53,15 @@ class VerifyUsernameActivity: BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        wikiTextView.movementMethod = LinkMovementMethod.getInstance()
-        footerTextView.movementMethod = LinkMovementMethod.getInstance()
+        binding.wikiTextView.movementMethod = LinkMovementMethod.getInstance()
+        binding.footerTextView.movementMethod = LinkMovementMethod.getInstance()
 
-        confirmUsernameButton.setOnClickListener { confirmNames() }
+        binding.confirmUsernameButton.setOnClickListener { confirmNames() }
 
-        displayNameEditText.addTextChangedListener(OnChangeTextWatcher { p0, _, _, _ ->
+        binding.displayNameEditText.addTextChangedListener(OnChangeTextWatcher { p0, _, _, _ ->
             displayNameVerificationEvents.onNext(p0.toString())
         })
-        usernameEditText.addTextChangedListener(OnChangeTextWatcher { p0, _, _, _ ->
+        binding.usernameEditText.addTextChangedListener(OnChangeTextWatcher { p0, _, _, _ ->
             usernameVerificationEvents.onNext(p0.toString())
         })
 
@@ -78,50 +70,50 @@ class VerifyUsernameActivity: BaseActivity() {
                 .map { it.length in 1..30 }
                 .doOnNext {
                     if (it) {
-                        displayNameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
-                        issuesTextView.visibility = View.GONE
+                        binding.displayNameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
+                        binding.issuesTextView.visibility = View.GONE
                     } else {
-                        displayNameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
-                        issuesTextView.visibility = View.VISIBLE
-                        issuesTextView.text = getString(R.string.display_name_length_error)
+                        binding.displayNameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
+                        binding.issuesTextView.visibility = View.VISIBLE
+                        binding.issuesTextView.text = getString(R.string.display_name_length_error)
                     }
                 },
                 usernameVerificationEvents.toFlowable(BackpressureStrategy.DROP)
                 .throttleLast(1, TimeUnit.SECONDS)
-                .flatMap { userRepository.verifyUsername(usernameEditText.text.toString()) }
+                .flatMap { userRepository.verifyUsername(binding.usernameEditText.text.toString()) }
                 .doOnNext {
                     if (it.isUsable) {
-                        usernameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
-                        issuesTextView.visibility = View.GONE
+                        binding.usernameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
+                        binding.issuesTextView.visibility = View.GONE
                     } else {
-                        usernameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
-                        issuesTextView.visibility = View.VISIBLE
-                        issuesTextView.text = it.issues.joinToString("\n")
+                        binding.usernameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
+                        binding.issuesTextView.visibility = View.VISIBLE
+                        binding.issuesTextView.text = it.issues.joinToString("\n")
                     }
-                }, BiFunction<Boolean, VerifyUsernameResponse, Boolean> { displayNameUsable, usernameUsable -> displayNameUsable && usernameUsable.isUsable})
-                .subscribe(Consumer {
-                    confirmUsernameButton.isEnabled = it
+                }, { displayNameUsable, usernameUsable -> displayNameUsable && usernameUsable.isUsable})
+                .subscribe({
+                    binding.confirmUsernameButton.isEnabled = it
                 }, RxErrorHandler.handleEmptyError()))
 
         compositeSubscription.add(userRepository.getUser().firstElement().subscribe {
-            displayNameEditText.setText(it.profile?.name)
+            binding.displayNameEditText.setText(it.profile?.name)
             displayNameVerificationEvents.onNext(it.profile?.name ?: "")
-            usernameEditText.setText(it.authentication?.localAuthentication?.username)
+            binding.usernameEditText.setText(it.authentication?.localAuthentication?.username)
             usernameVerificationEvents.onNext(it.username ?: "")
         })
     }
 
     private fun confirmNames() {
-        confirmUsernameButton.isClickable = false
-        compositeSubscription.add(userRepository.updateUser(null, "profile.name", displayNameEditText.text.toString())
-                .flatMap { userRepository.updateLoginName(usernameEditText.text.toString()).toFlowable() }
+        binding.confirmUsernameButton.isClickable = false
+        compositeSubscription.add(userRepository.updateUser("profile.name", binding.displayNameEditText.text.toString())
+                .flatMap { userRepository.updateLoginName(binding.usernameEditText.text.toString()).toFlowable() }
                 .doOnComplete { showConfirmationAndFinish() }
-                .doOnEach { confirmUsernameButton.isClickable = true }
-                .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+                .doOnEach { binding.confirmUsernameButton.isClickable = true }
+                .subscribe({  }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun showConfirmationAndFinish() {
-        HabiticaSnackbar.showSnackbar(snackbarView, getString(R.string.username_confirmed), HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
+        HabiticaSnackbar.showSnackbar(binding.snackbarView, getString(R.string.username_confirmed), HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
         runDelayed(3, TimeUnit.SECONDS) {
             finish()
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
index f8ec1ebfe..35d228912 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
@@ -6,24 +6,25 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.AchievementChallengeItemBinding
+import com.habitrpg.android.habitica.databinding.AchievementQuestItemBinding
+import com.habitrpg.android.habitica.databinding.AchievementSectionHeaderBinding
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.QuestAchievement
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog
 
 class AchievementsAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     var useGridLayout: Boolean = false
     var entries = listOf<Any>()
-    var questAchievements = listOf<QuestAchievement>()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return when (viewType) {
             0 -> SectionViewHolder(parent.inflate(R.layout.achievement_section_header))
             3 -> QuestAchievementViewHolder(parent.inflate(R.layout.achievement_quest_item))
+            4 -> ChallengeAchievementViewHolder(parent.inflate(R.layout.achievement_challenge_item))
             else -> AchievementViewHolder(if (useGridLayout) {
                 parent.inflate(R.layout.achievement_grid_item)
             } else {
@@ -33,56 +34,56 @@ class AchievementsAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when {
-            entries.size > position -> when (val entry = entries[position]) {
-                is Achievement -> (holder as? AchievementViewHolder)?.bind(entry)
-                is Pair<*, *> -> (holder as? SectionViewHolder)?.bind(entry)
-            }
-            entries.size == position -> (holder as? SectionViewHolder)?.bind(Pair("Quests completed", questAchievements.size))
-            else -> (holder as? QuestAchievementViewHolder)?.bind(questAchievements[position - 1 - entries.size])
+        when (val entry = entries[position]) {
+            is Achievement -> (holder as? AchievementViewHolder)?.bind(entry)
+            is QuestAchievement -> (holder as? QuestAchievementViewHolder)?.bind(entry)
+            is String -> (holder as? ChallengeAchievementViewHolder)?.bind(entry)
+            is Pair<*, *> -> (holder as? SectionViewHolder)?.bind(entry)
         }
     }
 
     override fun getItemCount(): Int {
-        return entries.size + questAchievements.size + 1
+        return entries.size
     }
 
     override fun getItemViewType(position: Int): Int {
-        return when {
-            entries.size > position -> {
-                val entry = entries[position]
-                if (entry is Pair<*, *>) {
-                    0
-                } else {
-                    if (useGridLayout) 1 else 2
-                }
-            }
-            entries.size == position -> 0
-            else -> 3
+        val entry = entries[position]
+        return if (entry is Pair<*, *>) {
+            0
+        } else if (entry is QuestAchievement) {
+            3
+        } else if (entry is String) {
+            4
+        } else {
+            if (useGridLayout) 1 else 2
         }
     }
 
     class SectionViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
-        private val titleView: TextView by bindView(R.id.title)
-        private val countView: TextView by bindView(R.id.count_label)
+        private var binding = AchievementSectionHeaderBinding.bind(itemView)
 
         fun bind(category: Pair<*, *>) {
-            titleView.text = category.first as? String
-            countView.text = category.second.toString()
+            binding.title.text = category.first as? String
+            binding.countLabel.text = category.second.toString()
         }
     }
 
     class AchievementViewHolder(itemView: View): RecyclerView.ViewHolder(itemView), View.OnClickListener {
         private var achievement: Achievement? = null
 
-        private val achievementContainer: ViewGroup? by bindOptionalView(R.id.achievement_container)
-        private val achievementIconView: SimpleDraweeView by bindView(R.id.achievement_icon)
-        private val achievementCountView: TextView by bindView(R.id.achievement_count_label)
-        private val achievementTitleView: TextView by bindView(R.id.achievement_title)
-        private val achievementDescriptionView: TextView? by bindOptionalView(R.id.achievement_description)
+        private val achievementContainer: ViewGroup?
+        private val achievementIconView: SimpleDraweeView
+        private val achievementCountView: TextView
+        private val achievementTitleView: TextView
+        private val achievementDescriptionView: TextView?
 
         init {
             itemView.setOnClickListener(this)
+            achievementContainer = itemView.findViewById(R.id.achievement_container)
+            achievementIconView = itemView.findViewById(R.id.achievement_icon)
+            achievementCountView = itemView.findViewById(R.id.achievement_count_label)
+            achievementTitleView = itemView.findViewById(R.id.achievement_title)
+            achievementDescriptionView = itemView.findViewById(R.id.achievement_description)
         }
 
         fun bind(achievement: Achievement) {
@@ -112,15 +113,21 @@ class AchievementsAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     }
 
     class QuestAchievementViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+        private var binding = AchievementQuestItemBinding.bind(itemView)
         private var achievement: QuestAchievement? = null
 
-        private val achievementCountView: TextView by bindView(R.id.achievement_count_label)
-        private val achievementTitleView: TextView by bindView(R.id.achievement_title)
-
         fun bind(achievement: QuestAchievement) {
             this.achievement = achievement
-            achievementTitleView.text = achievement.title
-            achievementCountView.text = achievement.count.toString()
+            binding.achievementTitle.text = achievement.title
+            binding.achievementCountLabel.text = achievement.count.toString()
+        }
+    }
+
+    class ChallengeAchievementViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+        private var binding = AchievementChallengeItemBinding.bind(itemView)
+
+        fun bind(challengeName: String) {
+            binding.achievementTitle.text = challengeName
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/BaseRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/BaseRecyclerViewAdapter.kt
new file mode 100644
index 000000000..4fe60e7ad
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/BaseRecyclerViewAdapter.kt
@@ -0,0 +1,28 @@
+package com.habitrpg.android.habitica.ui.adapter
+
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
+import io.realm.OrderedRealmCollection
+import io.realm.RealmModel
+
+abstract class BaseRecyclerViewAdapter<T, VH: RecyclerView.ViewHolder>: RecyclerView.Adapter<VH>() {
+
+    var data: List<T> = emptyList()
+    set(value) {
+        field = value
+        notifyDataSetChanged()
+    }
+
+    override fun getItemCount(): Int {
+        return data.size
+    }
+
+    open fun getItem(position: Int): T? {
+        return if (position >= 0 && data.size > position) {
+            data[position]
+        } else {
+            null
+        }
+    }
+}
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..77f0bb048 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
@@ -16,9 +17,9 @@ import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.*
 
 class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
@@ -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..66e340acb 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
@@ -17,18 +18,18 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.inventory.Customization
 import com.habitrpg.android.habitica.models.inventory.CustomizationSet
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.*
 
-class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
+class CustomizationRecyclerViewAdapter() : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
 
     var userSize: String? = null
     var hairColor: String? = null
+    var customizationType: String? = null
     var gemBalance: Int = 0
     var unsortedCustomizations: List<Customization> = ArrayList()
     var customizationList: MutableList<Any> = ArrayList()
@@ -61,7 +62,11 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                     .inflate(R.layout.customization_section_header, parent, false)
             SectionViewHolder(view)
         } else {
-            val viewID: Int = R.layout.customization_grid_item
+            val viewID: Int = if (customizationType == "background") {
+                R.layout.customization_grid_background_item
+            } else {
+                R.layout.customization_grid_item
+            }
 
             val view = LayoutInflater.from(parent.context).inflate(viewID, parent, false)
             CustomizationViewHolder(view)
@@ -106,7 +111,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                 val set = CustomizationSet()
                 set.identifier = customization.customizationSet
                 set.text = customization.customizationSetName
-                set.price = customization.setPrice
+                set.price = customization.setPrice ?: 0
                 set.hasPurchasable = !customization.isUsable(ownedCustomiztations.contains(customization.identifier))
                 lastSet = set
                 customizationList.add(set)
@@ -143,7 +148,11 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
         fun bind(customization: Customization) {
             this.customization = customization
 
-            DataBindingUtils.loadImage(binding.imageView, customization.getIconName(userSize, hairColor))
+            if (customization.type == "background" && customization.identifier == "") {
+                binding.imageView.setActualImageResource(R.drawable.no_background)
+            } else {
+                DataBindingUtils.loadImage(binding.imageView, customization.getIconName(userSize, hairColor))
+            }
 
             if (customization.type == "background") {
                 val params = (binding.imageView.layoutParams as? LinearLayout.LayoutParams)?.apply {
@@ -165,9 +174,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)
             }
         }
 
@@ -177,7 +186,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                     val dialog = HabiticaAlertDialog(itemView.context)
                     dialog.setMessage(R.string.purchase_from_timetravel_shop)
                     dialog.addButton(R.string.go_shopping, true) { _, _ ->
-                        MainNavigationController.navigate(R.id.shopsFragment, bundleOf(Pair("selectedTab", 3)))
+                        MainNavigationController.navigate(R.id.timeTravelersShopFragment)
                     }
                     dialog.addButton(R.string.reward_dialog_dismiss, false)
                     dialog.show()
@@ -211,7 +220,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                 return
             }
 
-            if (customization?.identifier == activeCustomization) {
+            if (customization?.type != "background" && customization?.identifier == activeCustomization) {
                 return
             }
 
@@ -224,7 +233,6 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
     internal inner class SectionViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
         private val binding = CustomizationSectionHeaderBinding.bind(itemView)
-        private val label: TextView by bindView(itemView, R.id.label)
         var context: Context = itemView.context
         private var set: CustomizationSet? = null
 
@@ -234,8 +242,8 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
 
         fun bind(set: CustomizationSet) {
             this.set = set
-            this.label.text = set.text
-            if (set.hasPurchasable && !set.identifier.contains("timeTravel")) {
+            binding.label.text = set.text
+            if (set.hasPurchasable && set.identifier?.contains("timeTravel") != true) {
                 binding.purchaseSetButton.visibility = View.VISIBLE
                 binding.setPriceLabel.value = set.price.toDouble()
                 binding.setPriceLabel.currency = "gems"
@@ -260,7 +268,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                         customizationList
                                 .filter { Customization::class.java.isAssignableFrom(it.javaClass) }
                                 .map { it as Customization }
-                                .filter { !it.isUsable(ownedCustomiztations.contains(it.identifier)) && it.customizationSet != null && it.customizationSet == set?.identifier }
+                                .filter { it.customizationSet != null && it.customizationSet == set?.identifier }
                                 .forEach { set?.customizations?.add(it) }
                         if (additionalSetItems.isNotEmpty()) {
                             additionalSetItems
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..716d0099f 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
@@ -4,22 +4,23 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
+import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment
 import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem
-import com.habitrpg.android.habitica.ui.viewHolders.GiftOneGetOnePromoMenuView
 import com.habitrpg.android.habitica.ui.views.adventureGuide.AdventureGuideMenuBanner
 import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
 import com.habitrpg.android.habitica.ui.views.promo.PromoMenuViewHolder
 import com.habitrpg.android.habitica.ui.views.promo.SubscriptionBuyGemsPromoView
 import com.habitrpg.android.habitica.ui.views.promo.SubscriptionBuyGemsPromoViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 
 class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
@@ -50,13 +51,9 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
 
     fun getItemSelectionEvents(): Flowable<HabiticaDrawerItem> = itemSelectedEvents.toFlowable(BackpressureStrategy.DROP)
 
-    fun getItemWithTransitionId(transitionId: Int): HabiticaDrawerItem? =
-            items.find { it.transitionId == transitionId }
     fun getItemWithIdentifier(identifier: String): HabiticaDrawerItem? =
             items.find { it.identifier == identifier }
 
-    private fun getItemPosition(transitionId: Int): Int =
-            items.indexOfFirst { it.transitionId == transitionId }
     private fun getItemPosition(identifier: String): Int =
             items.indexOfFirst { it.identifier == identifier }
 
@@ -72,6 +69,30 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
         notifyDataSetChanged()
     }
 
+    fun setTeams(teams: List<TeamPlan>) {
+        var teamHeaderIndex = -1
+        var nextHeaderIndex = -1
+        for ((index, item) in items.withIndex()) {
+            if (teamHeaderIndex != -1 && item.isHeader) {
+                nextHeaderIndex = index
+                break
+            } else if (item.identifier == NavigationDrawerFragment.SIDEBAR_TEAMS) {
+                teamHeaderIndex = index
+            }
+        }
+        if (teamHeaderIndex != -1 && nextHeaderIndex != -1) {
+            for (x in nextHeaderIndex-1 downTo teamHeaderIndex+1) {
+                items.removeAt(x)
+            }
+            for ((index, team) in teams.withIndex()) {
+                val item = HabiticaDrawerItem(R.id.teamBoardFragment, team.id, team.summary)
+                item.bundle = bundleOf(Pair("teamID", team.id))
+                items.add(teamHeaderIndex + index + 1, item)
+            }
+        }
+        notifyDataSetChanged()
+    }
+
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val drawerItem = getItem(position)
         when {
@@ -120,14 +141,6 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
                 )
                 SubscriptionBuyGemsPromoViewHolder(itemView)
             }
-            3 -> {
-                val itemView = GiftOneGetOnePromoMenuView(parent.context)
-                itemView.layoutParams = ViewGroup.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        148.dpToPx(parent.context)
-                )
-                SubscriptionBuyGemsPromoViewHolder(itemView)
-            }
             4 -> {
                 val itemView = AdventureGuideMenuBanner(parent.context)
                 itemView.layoutParams = ViewGroup.LayoutParams(
@@ -154,20 +167,21 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
         var tintColor: Int = 0
         var backgroundTintColor: Int = 0
 
-        private val titleTextView: TextView? by bindOptionalView(itemView, R.id.titleTextView)
-        private val pillView: TextView? by bindOptionalView(itemView, R.id.pillView)
-        private val bubbleView: View? by bindOptionalView(itemView, R.id.bubble_view)
-        private val additionalInfoView: TextView? by bindOptionalView(itemView, R.id.additionalInfoView)
+        private val titleTextView: TextView? = itemView.findViewById(R.id.titleTextView)
+        private val pillView: TextView? = itemView.findViewById(R.id.pillView)
+        private val bubbleView: View? = itemView.findViewById(R.id.bubble_view)
+        private val additionalInfoView: TextView? = itemView.findViewById(R.id.additionalInfoView)
 
         fun bind(drawerItem: HabiticaDrawerItem, isSelected: Boolean) {
             titleTextView?.text = drawerItem.text
 
             if (isSelected) {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.gray_600))
+                itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.content_background_offset))
+                itemView.background.alpha = 69
                 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/SkillTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
index 92d73224c..29f6c7963 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
@@ -5,27 +5,22 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
-import io.realm.OrderedRealmCollection
-import io.realm.RealmRecyclerViewAdapter
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.*
 
 
-class SkillTasksRecyclerViewAdapter(data: OrderedRealmCollection<Task>?, autoUpdate: Boolean) : RealmRecyclerViewAdapter<Task, SkillTasksRecyclerViewAdapter.TaskViewHolder>(data, autoUpdate) {
+class SkillTasksRecyclerViewAdapter : BaseRecyclerViewAdapter<Task, SkillTasksRecyclerViewAdapter.TaskViewHolder>() {
 
     private val taskSelectionEvents = PublishSubject.create<Task>()
 
     override fun getItemId(position: Int): Long {
-        if (data != null) {
-            val task = data?.get(position)
-            if (task?.id?.length == 36) {
-                return UUID.fromString(task.id).mostSignificantBits
-            }
+        val task = getItem(position)
+        if (task?.id?.length == 36) {
+            return UUID.fromString(task.id).mostSignificantBits
         }
         return UUID.randomUUID().mostSignificantBits
     }
@@ -47,13 +42,9 @@ class SkillTasksRecyclerViewAdapter(data: OrderedRealmCollection<Task>?, autoUpd
     }
 
     inner class TaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
+        private val binding = SkillTaskItemCardBinding.bind(itemView)
         var task: Task? = null
 
-        private val titleTextView: HabiticaEmojiTextView by bindView(R.id.titleTextView)
-        private val notesTextView: HabiticaEmojiTextView by bindView(R.id.notesTextView)
-        private val rightBorderView: View by bindView(R.id.rightBorderView)
-
         init {
             itemView.setOnClickListener(this)
             itemView.isClickable = true
@@ -61,14 +52,14 @@ class SkillTasksRecyclerViewAdapter(data: OrderedRealmCollection<Task>?, autoUpd
 
         internal fun bindHolder(task: Task) {
             this.task = task
-            titleTextView.text = task.markdownText { titleTextView.text = it }
+            binding.titleTextView.text = task.markdownText { binding.titleTextView.text = it }
             if (task.notes?.isEmpty() == true) {
-                notesTextView.visibility = View.GONE
+                binding.notesTextView.visibility = View.GONE
             } else {
-                notesTextView.visibility = View.VISIBLE
-                notesTextView.text = task.markdownNotes { notesTextView.text = it }
+                binding.notesTextView.visibility = View.VISIBLE
+                binding.notesTextView.text = task.markdownNotes { binding.notesTextView.text = it }
             }
-            rightBorderView.setBackgroundResource(task.lightTaskColor)
+            binding.rightBorderView.setBackgroundResource(task.lightTaskColor)
         }
 
         override fun onClick(v: View) {
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..689f4b79c 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
@@ -5,25 +5,24 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.SkillListItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.user.SpecialItems
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.BackpressureStrategy
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter.SkillViewHolder>() {
 
     private val useSkillSubject = PublishSubject.create<Skill>()
-    val useSkillEvents = useSkillSubject.toFlowable(BackpressureStrategy.DROP)
+    val useSkillEvents: Flowable<Skill> = useSkillSubject.toFlowable(BackpressureStrategy.DROP)
 
     var mana: Double = 0.0
         set(value) {
@@ -60,71 +59,72 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
     }
 
     inner class SkillViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
+        private val binding = SkillListItemBinding.bind(itemView)
         private val magicDrawable: Drawable
         private val lockDrawable: Drawable
-        private val skillImageView: SimpleDraweeView by bindView(R.id.skill_image)
-        private val skillNameTextView: TextView by bindView(R.id.skill_text)
-        private val skillNotesTextView: TextView by bindView(R.id.skill_notes)
-        private val buttonWrapper: ViewGroup by bindView(itemView, R.id.button_wrapper)
-        private val priceLabel: TextView by bindView(itemView, R.id.price_label)
-        private val buttonIconView: ImageView by bindView(itemView, R.id.button_icon_view)
-        private val countLabel: TextView by bindView(itemView, R.id.count_label)
 
         var skill: Skill? = null
 
         var context: Context = itemView.context
 
         init {
-            buttonWrapper.setOnClickListener(this)
+            binding.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) {
             this.skill = skill
-            skillNameTextView.text = skill.text
-            skillNotesTextView.text = skill.notes
+            binding.skillText.text = skill.text
+            binding.skillNotes.text = skill.notes
 
-            skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_50))
-            skillNotesTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_200))
-            skillNotesTextView.visibility = View.VISIBLE
-            priceLabel.visibility = View.VISIBLE
+            binding.skillText.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+            binding.skillNotes.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
+            binding.skillNotes.visibility = View.VISIBLE
+            binding.priceLabel.visibility = View.VISIBLE
 
             if ("special" == skill.habitClass) {
-                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))
-                buttonIconView.setImageDrawable(null)
-                buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600))
-                buttonIconView.alpha = 1.0f
-                priceLabel.alpha = 1.0f
+                binding.countLabel.visibility = View.VISIBLE
+                binding.countLabel.text = getOwnedCount(skill.key).toString()
+                binding.priceLabel.setText(R.string.skill_transformation_use)
+                if (context.isUsingNightModeResources()) {
+                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.brand_500))
+                } else {
+                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.color_accent))
+                }
+                binding.buttonIconView.setImageDrawable(null)
+                binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
+                binding.buttonIconView.alpha = 1.0f
+                binding.priceLabel.alpha = 1.0f
             } else {
-                countLabel.visibility = View.GONE
-                priceLabel.text = skill.mana?.toString()
-                priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_10))
-                buttonIconView.setImageDrawable(magicDrawable)
+                binding.countLabel.visibility = View.GONE
+                binding.priceLabel.text = skill.mana?.toString()
+                if (context.isUsingNightModeResources()) {
+                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_500))
+                } else {
+                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_10))
+                }
+                binding.buttonIconView.setImageDrawable(magicDrawable)
 
                 if (skill.mana ?: 0 > mana) {
-                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600))
-                    buttonIconView.alpha = 0.3f
-                    priceLabel.alpha = 0.3f
+                    binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
+                    binding.buttonIconView.alpha = 0.3f
+                    binding.priceLabel.alpha = 0.3f
                 } else {
-                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.blue_500_24))
-                    buttonIconView.alpha = 1.0f
-                    priceLabel.alpha = 1.0f
+                    binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.blue_500_24))
+                    binding.buttonIconView.alpha = 1.0f
+                    binding.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))
-                    skillNameTextView.text = context.getString(R.string.skill_unlocks_at, skill.lvl)
-                    skillNotesTextView.visibility = View.GONE
-                    buttonIconView.setImageDrawable(lockDrawable)
-                    priceLabel.visibility = View.GONE
+                    binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
+                    binding.skillText.setTextColor(ContextCompat.getColor(context, R.color.text_dimmed))
+                    binding.skillText.text = context.getString(R.string.skill_unlocks_at, skill.lvl)
+                    binding.skillNotes.visibility = View.GONE
+                    binding.buttonIconView.setImageDrawable(lockDrawable)
+                    binding.priceLabel.visibility = View.GONE
                 }
             }
-            DataBindingUtils.loadImage(skillImageView, "shop_" + skill.key)
+            DataBindingUtils.loadImage(binding.skillImage, "shop_" + skill.key)
 
         }
 
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..6a08e79e4 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
@@ -3,29 +3,26 @@ package com.habitrpg.android.habitica.ui.adapter.inventory
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.BitmapDrawable
-import androidx.core.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import android.widget.TextView
-import com.facebook.drawee.view.SimpleDraweeView
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.databinding.GearListItemBinding
 import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.subjects.PublishSubject
-import io.realm.OrderedRealmCollection
-import io.realm.RealmRecyclerViewAdapter
+import io.reactivex.rxjava3.subjects.PublishSubject
 
-class EquipmentRecyclerViewAdapter(data: OrderedRealmCollection<Equipment>?, autoUpdate: Boolean) : RealmRecyclerViewAdapter<Equipment, EquipmentRecyclerViewAdapter.GearViewHolder>(data, autoUpdate) {
+class EquipmentRecyclerViewAdapter : BaseRecyclerViewAdapter<Equipment, EquipmentRecyclerViewAdapter.GearViewHolder>() {
 
     var equippedGear: String? = null
     var isCostume: Boolean? = null
     var type: String? = null
 
-    val equipEvents: PublishSubject<String> = PublishSubject.create<String>()
+    val equipEvents: PublishSubject<String> = PublishSubject.create()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GearViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(R.layout.gear_list_item, parent, false)
@@ -33,35 +30,18 @@ class EquipmentRecyclerViewAdapter(data: OrderedRealmCollection<Equipment>?, aut
     }
 
     override fun onBindViewHolder(holder: GearViewHolder, position: Int) {
-        data?.let {
-            holder.bind(it[position])
-        }
+        holder.bind(data[position])
     }
 
     inner class GearViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
-
-        private val gearContainer: View by bindView(itemView, R.id.gear_container)
-        private val gearNameTextView: TextView by bindView(itemView, R.id.gear_text)
-        private val gearNotesTextView: TextView by bindView(itemView, R.id.gear_notes)
-        private val imageView: SimpleDraweeView by bindView(itemView, R.id.gear_image)
-        private val imageViewWrapper: FrameLayout by bindView(itemView, R.id.gear_icon_background_view)
-        private val equippedIndicator: View by bindView(itemView, R.id.equippedIndicator)
-        private val twoHandedView: TextView by bindView(R.id.two_handed_view)
-        private val strLabel: TextView by bindView(R.id.str_label)
-        private val strValue: TextView by bindView(R.id.str_value)
-        private val conLabel: TextView by bindView(R.id.con_label)
-        private val conValue: TextView by bindView(R.id.con_value)
-        private val intLabel: TextView by bindView(R.id.int_label)
-        private val intValue: TextView by bindView(R.id.int_value)
-        private val perLabel: TextView by bindView(R.id.per_label)
-        private val perValue: TextView by bindView(R.id.per_value)
+        private val binding = GearListItemBinding.bind(itemView)
 
         var gear: Equipment? = null
         var context: Context = itemView.context
 
         init {
             context = itemView.context
-            twoHandedView.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfTwoHandedIcon()), null, null, null)
+            binding.twoHandedView.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfTwoHandedIcon()), null, null, null)
             itemView.setOnClickListener {
                 val key = gear?.key
                 if (key != null) {
@@ -78,25 +58,25 @@ class EquipmentRecyclerViewAdapter(data: OrderedRealmCollection<Equipment>?, aut
 
         fun bind(gear: Equipment) {
             this.gear = gear
-            this.gearNameTextView.text = this.gear?.text
-            this.gearNotesTextView.text = this.gear?.notes
+            binding.gearText.text = this.gear?.text
+            binding.gearNotes.text = this.gear?.notes
 
             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)
+                binding.equippedIndicator.visibility = View.VISIBLE
+                binding.gearContainer.setBackgroundColor(ContextCompat.getColor(context, R.color.lightly_tinted_background))
+                binding.gearIconBackgroundView .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)
+                binding.equippedIndicator.visibility = View.GONE
+                binding.gearContainer.setBackgroundResource(R.drawable.selection_highlight)
+                binding.gearIconBackgroundView.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)
+            binding.twoHandedView.visibility = if (gear.twoHanded) View.VISIBLE else View.GONE
+            DataBindingUtils.loadImage(binding.gearImage, "shop_"+gear.key)
 
-            set(strLabel, strValue, gear.str)
-            set(conLabel, conValue, gear.con)
-            set(intLabel, intValue, gear._int)
-            set(perLabel, perValue, gear.per)
+            set(binding.strLabel, binding.strValue, gear.str)
+            set(binding.conLabel, binding.conValue, gear.con)
+            set(binding.intLabel, binding.intValue, gear._int)
+            set(binding.perLabel, binding.perValue, gear.per)
         }
 
         private fun set(label: TextView, valueTextView: TextView, value: Int) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
index ecebf6cf8..e27c225fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
@@ -28,27 +28,27 @@ class HabiticaClassArrayAdapter(context: Context, resource: Int, objects: List<C
         when (getItem(position)) {
             Stats.WARRIOR -> {
                 textView?.text = context.getString(R.string.warrior)
-                textView?.setTextColor(ContextCompat.getColor(context, R.color.red_10))
+                textView?.setTextColor(ContextCompat.getColor(context, R.color.text_red))
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
             }
             Stats.MAGE -> {
                 textView?.text = context.getString(R.string.mage)
-                textView?.setTextColor(ContextCompat.getColor(context, R.color.blue_10))
+                textView?.setTextColor(ContextCompat.getColor(context, R.color.text_blue))
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
             }
             Stats.HEALER -> {
                 textView?.text = context.getString(R.string.healer)
-                textView?.setTextColor(ContextCompat.getColor(context, R.color.yellow_10))
+                textView?.setTextColor(ContextCompat.getColor(context, R.color.text_yellow))
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
             }
             Stats.ROGUE -> {
                 textView?.text = context.getString(R.string.rogue)
-                textView?.setTextColor(ContextCompat.getColor(context, R.color.brand_300))
+                textView?.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
             }
             else -> {
                 textView?.text = context.getString(R.string.classless)
-                textView?.setTextColor(ContextCompat.getColor(context, R.color.textColorLight))
+                textView?.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
                 imageView?.setImageBitmap(null)
             }
         }
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..caacacbbd 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
@@ -12,22 +12,22 @@ import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.*
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
 import com.habitrpg.android.habitica.ui.views.dialogs.DetailDialog
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
-import io.realm.RealmRecyclerViewAdapter
 import io.realm.RealmResults
 import org.greenrobot.eventbus.EventBus
 import java.text.SimpleDateFormat
 import java.util.*
 
-class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate: Boolean, val context: Context) : RealmRecyclerViewAdapter<OwnedItem, ItemRecyclerAdapter.ItemViewHolder>(data, autoUpdate) {
+class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter<OwnedItem, ItemRecyclerAdapter.ItemViewHolder>() {
 
     var isHatching: Boolean = false
     var isFeeding: Boolean = false
@@ -59,18 +59,16 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
         return openMysteryItemEvents.toFlowable(BackpressureStrategy.DROP)
     }
 
-    val startHatchingEvents = startHatchingSubject.toFlowable(BackpressureStrategy.DROP)
-    val hatchPetEvents = hatchPetSubject.toFlowable(BackpressureStrategy.DROP)
+    val startHatchingEvents: Flowable<Item> = startHatchingSubject.toFlowable(BackpressureStrategy.DROP)
+    val hatchPetEvents: Flowable<Pair<HatchingPotion, Egg>> = 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) {
-        data?.let {
-            val ownedItem = it[position]
-            holder.bind(ownedItem, items?.get(ownedItem.key))
-        }
+        val ownedItem = data[position]
+        holder.bind(ownedItem, items?.get(ownedItem.key))
     }
 
     fun setExistingPets(pets: RealmResults<Pet>) {
@@ -84,7 +82,7 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
     }
 
     inner class ItemViewHolder(val binding: ItemItemBinding) : RecyclerView.ViewHolder(binding.root), View.OnClickListener {
-        var ownedItem: OwnedItem? = null
+        private var ownedItem: OwnedItem? = null
         var item: Item? = null
 
         var resources: Resources = itemView.resources
@@ -107,25 +105,25 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
         fun bind(ownedItem: OwnedItem, item: Item?) {
             this.ownedItem = ownedItem
             this.item = item
-            binding.titleTextView.text = item?.text
+            binding.titleTextView.text = item?.text ?: ownedItem.key
             binding.ownedTextView.text = ownedItem.numberOwned.toString()
 
             var disabled = false
             val imageName: String?
             if (item is QuestContent) {
-                imageName = "inventory_quest_scroll_" + item.getKey()
+                imageName = "inventory_quest_scroll_" + ownedItem.key
             } else if (item is SpecialItem) {
                 val sdf = SimpleDateFormat("MM", Locale.getDefault())
                 val month = sdf.format(Date())
                 imageName = "inventory_present_$month"
             } else {
-                val type = when (item) {
-                    is Egg -> "Egg"
-                    is Food -> "Food"
-                    is HatchingPotion -> "HatchingPotion"
+                val type = when (ownedItem.itemType) {
+                    "eggs" -> "Egg"
+                    "food" -> "Food"
+                    "hatchingPotions" -> "HatchingPotion"
                     else -> ""
                 }
-                imageName = "Pet_" + type + "_" + item?.key
+                imageName = "Pet_" + type + "_" + ownedItem.key
 
                 if (isHatching) {
                     disabled = !this.canHatch
@@ -143,7 +141,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/MountDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
index 259eec1a0..61824d3c0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
@@ -1,16 +1,14 @@
 package com.habitrpg.android.habitica.ui.adapter.inventory
 
 import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.inventory.Mount
 import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.ui.viewHolders.MountViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 class MountDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
     private var ownedMounts: Map<String, OwnedMount>? = null
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..b7d76edba 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
@@ -1,17 +1,15 @@
 package com.habitrpg.android.habitica.ui.adapter.inventory
 
 import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.inventory.*
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.RealmResults
 
 class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
@@ -33,7 +31,7 @@ class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapt
         return equipEvents.toFlowable(BackpressureStrategy.DROP)
     }
 
-    var animalIngredientsRetriever: ((Animal) -> Pair<Egg?, HatchingPotion?>)? = null
+    var animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)? = null
 
     private fun canRaiseToMount(pet: Pet): Boolean {
         for (mount in existingMounts ?: emptyList<Mount>()) {
@@ -98,12 +96,7 @@ class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapt
 
     fun setOwnedItems(ownedItems: Map<String, OwnedItem>) {
         this.ownedItems = ownedItems
-        ownsSaddles = ownedItems.containsKey("Saddle-food")
-        notifyDataSetChanged()
-    }
-
-    fun setOwnsSaddles(ownsSaddles: Boolean) {
-        this.ownsSaddles = ownsSaddles
+        ownsSaddles = if (ownedItems.containsKey("Saddle-food")) (ownedItems["Saddle-food"]?.numberOwned ?: 0)> 0 else false
         notifyDataSetChanged()
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index 01c7e6054..ad501ae34 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -1,28 +1,26 @@
 package com.habitrpg.android.habitica.ui.adapter.inventory
 
 import android.content.Context
-import android.text.Html
 import android.text.method.LinkMovementMethod
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ShopHeaderBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopCategory
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder
-import com.habitrpg.android.habitica.ui.views.NPCBannerView
 
 
-class ShopRecyclerAdapter(private val configManager: AppConfigManager) : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
+class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
 
     private val items: MutableList<Any> = ArrayList()
     private var shopIdentifier: String? = null
@@ -213,29 +211,26 @@ class ShopRecyclerAdapter(private val configManager: AppConfigManager) : android
     }
 
     internal class ShopHeaderViewHolder(parent: ViewGroup) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.shop_header)) {
-
-        private val descriptionView: TextView by bindView(itemView, R.id.descriptionView)
-        private val npcBannerView: NPCBannerView by bindView(itemView, R.id.npcBannerView)
-        private val namePlate: TextView by bindView(itemView, R.id.namePlate)
+        private val binding = ShopHeaderBinding.bind(itemView)
 
         init {
-            descriptionView.movementMethod = LinkMovementMethod.getInstance()
+            binding.descriptionView.movementMethod = LinkMovementMethod.getInstance()
         }
 
         fun bind(shop: Shop, shopSpriteSuffix: String) {
-            npcBannerView.shopSpriteSuffix = shopSpriteSuffix
-            npcBannerView.identifier = shop.identifier
+            binding.npcBannerView.shopSpriteSuffix = shopSpriteSuffix
+            binding.npcBannerView.identifier = shop.identifier
 
-            @Suppress("DEPRECATION")
-            descriptionView.text = Html.fromHtml(shop.notes)
-            namePlate.setText(shop.npcNameResource)
+            binding.descriptionView.text = shop.notes.fromHtml()
+            binding.namePlate.setText(shop.npcNameResource)
         }
 
     }
 
     class EmptyStateViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
-        private val subscribeButton: Button? by bindView(itemView, R.id.subscribeButton)
-        private val textView: TextView? by bindView(itemView, R.id.textView)
+        private val subscribeButton: Button? = itemView.findViewById(R.id.subscribeButton)
+        private val textView: TextView? = itemView.findViewById(R.id.textView)
+
         init {
             subscribeButton?.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
         }
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..e2c59aaf6 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
@@ -14,22 +14,20 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.inventory.*
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragmentDirections
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.loadImage
 import com.habitrpg.android.habitica.ui.viewHolders.MountViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
-import io.realm.RealmResults
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 
-class StableRecyclerAdapter() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     var shopSpriteSuffix: String? = null
     private var eggs: Map<String, Egg> = mapOf()
-    var animalIngredientsRetriever: ((Animal) -> Pair<Egg?, HatchingPotion?>)? = null
+    var animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)? = null
     var itemType: String? = null
     private val equipEvents = PublishSubject.create<String>()
     var ownedEggs: Map<String, OwnedItem>? = null
@@ -136,9 +134,9 @@ class StableRecyclerAdapter() : RecyclerView.Adapter<RecyclerView.ViewHolder>()
     internal inner class StableViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
         private var animal: Animal? = null
 
-        private val imageView: SimpleDraweeView by bindView(itemView, R.id.imageView)
-        private val titleView: TextView by bindView(itemView, R.id.titleTextView)
-        private val ownedTextView: TextView by bindView(itemView, R.id.ownedTextView)
+        private val imageView: SimpleDraweeView = itemView.findViewById(R.id.imageView)
+        private val titleView: TextView = itemView.findViewById(R.id.titleTextView)
+        private val ownedTextView: TextView = itemView.findViewById(R.id.ownedTextView)
 
         init {
             itemView.setOnClickListener(this)
@@ -160,20 +158,20 @@ 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)
 
-            val alpha = if (item.numberOwned <= 0 && ownedEggs?.containsKey(item.animal ?: "") != true) 0.2f else 1.0f
+            val alpha = if (item.numberOwned <= 0 && ownedEggs?.containsKey(item.animal) != true) 0.2f else 1.0f
             this.imageView.alpha = alpha
             this.titleView.alpha = alpha
             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))
             }
         }
@@ -182,12 +180,10 @@ class StableRecyclerAdapter() : RecyclerView.Adapter<RecyclerView.ViewHolder>()
             val animal = this.animal
             if (animal != null) {
                 val color = if (animal.type == "special") animal.color else null
-                if (animal.numberOwned > 0 || ownedEggs?.containsKey(animal.animal ?: "") == true) {
-                    if (itemType == "pets") {
-                        MainNavigationController.navigate(StableFragmentDirections.openPetDetail(animal.animal, animal.type, color))
-                    } else {
-                        MainNavigationController.navigate(StableFragmentDirections.openMountDetail(animal.animal, animal.type, color))
-                    }
+                if (itemType == "pets") {
+                    MainNavigationController.navigate(StableFragmentDirections.openPetDetail(animal.animal, animal.type ?: "", color))
+                } else {
+                    MainNavigationController.navigate(StableFragmentDirections.openMountDetail(animal.animal, animal.type ?: "", color))
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt
index 95b3ff30a..0e9301c54 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt
@@ -1,21 +1,20 @@
 package com.habitrpg.android.habitica.ui.adapter.setup
 
-import android.content.Context
 import android.graphics.PorterDuff
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository
+import com.habitrpg.android.habitica.databinding.SetupCustomizationItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.models.SetupCustomization
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import io.reactivex.BackpressureStrategy
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 internal class CustomizationSetupAdapter : RecyclerView.Adapter<CustomizationSetupAdapter.CustomizationViewHolder>() {
 
@@ -24,9 +23,9 @@ internal class CustomizationSetupAdapter : RecyclerView.Adapter<CustomizationSet
     private var customizationList: List<SetupCustomization> = emptyList()
 
     private val equipGearEventSubject = PublishSubject.create<String>()
-    val equipGearEvents = equipGearEventSubject.toFlowable(BackpressureStrategy.DROP)
-    private val updateUserEventsSubject = PublishSubject.create<HashMap<String, Any>>()
-    val updateUserEvents = updateUserEventsSubject.toFlowable(BackpressureStrategy.DROP)
+    val equipGearEvents: Flowable<String> = equipGearEventSubject.toFlowable(BackpressureStrategy.DROP)
+    private val updateUserEventsSubject = PublishSubject.create<Map<String, Any>>()
+    val updateUserEvents: Flowable<Map<String, Any>> = updateUserEventsSubject.toFlowable(BackpressureStrategy.DROP)
 
     fun setCustomizationList(newCustomizationList: List<SetupCustomization>) {
         this.customizationList = newCustomizationList
@@ -78,46 +77,40 @@ internal class CustomizationSetupAdapter : RecyclerView.Adapter<CustomizationSet
     }
 
     internal inner class CustomizationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
-        private val imageView: ImageView by bindView(R.id.imageView)
-        private val textView: TextView by bindView(R.id.textView)
+        private val binding = SetupCustomizationItemBinding.bind(itemView)
 
         var customization: SetupCustomization? = null
 
-        var context: Context
-
         init {
             itemView.setOnClickListener(this)
-
-            context = itemView.context
         }
 
         fun bind(customization: SetupCustomization) {
             this.customization = customization
 
             when {
-                customization.drawableId != null -> imageView.setImageResource(customization.drawableId ?: 0)
+                customization.drawableId != null -> binding.imageView.setImageResource(customization.drawableId ?: 0)
                 customization.colorId != null -> {
-                    val drawable = ContextCompat.getDrawable(context, R.drawable.setup_customization_circle)
-                    drawable?.setColorFilter(ContextCompat.getColor(context, customization.colorId ?: 0), PorterDuff.Mode.MULTIPLY)
-                    imageView.setImageDrawable(drawable)
+                    val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.setup_customization_circle)
+                    drawable?.setTintWith(ContextCompat.getColor(itemView.context, customization.colorId ?: 0), PorterDuff.Mode.MULTIPLY)
+                    binding.imageView.setImageDrawable(drawable)
                 }
-                else -> imageView.setImageDrawable(null)
+                else -> binding.imageView.setImageDrawable(null)
             }
-            textView.text = customization.text
+            binding.textView.text = customization.text
             if ("0" != customization.key && "flower" == customization.subcategory) {
                 if (isCustomizationActive(customization)) {
-                    imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg_selected)
+                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg_selected)
                 } else {
-                    imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg)
+                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg)
                 }
             } else {
                 if (isCustomizationActive(customization)) {
-                    imageView.setBackgroundResource(R.drawable.setup_customization_bg_selected)
-                    textView.setTextColor(ContextCompat.getColor(context, R.color.white))
+                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_bg_selected)
+                    binding.textView.setTextColor(ContextCompat.getColor(itemView.context, R.color.white))
                 } else {
-                    imageView.setBackgroundResource(R.drawable.setup_customization_bg)
-                    textView.setTextColor(ContextCompat.getColor(context, R.color.white_50_alpha))
+                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_bg)
+                    binding.textView.setTextColor(ContextCompat.getColor(itemView.context, R.color.white_50_alpha))
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
index 64ecb6bbd..b05b5f07d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.extensions.setTintWith
 import java.util.*
 
 class TaskSetupAdapter : RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder>() {
@@ -42,7 +42,7 @@ class TaskSetupAdapter : RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder>()
     inner class TaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
         private val icon: Drawable?
-        private val textView: TextView by bindView(R.id.textView)
+        private val textView: TextView = itemView.findViewById(R.id.textView)
 
         private var taskGroup: List<String>? = null
         private var isChecked: Boolean? = null
@@ -53,7 +53,7 @@ class TaskSetupAdapter : RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder>()
             itemView.setOnClickListener(this)
 
             icon = VectorDrawableCompat.create(context.resources, R.drawable.ic_check_white_18dp, null)
-            icon?.setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY)
+            icon?.setTintWith(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY)
         }
 
         fun bind(taskGroup: List<String>, isChecked: Boolean?) {
@@ -65,11 +65,11 @@ class TaskSetupAdapter : RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder>()
             }
             if (this.isChecked == true) {
                 this.textView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null)
-                textView.background.setColorFilter(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.MULTIPLY)
+                textView.background.setTintWith(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.MULTIPLY)
                 textView.setTextColor(ContextCompat.getColor(context, R.color.brand_100))
             } else {
                 this.textView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null)
-                textView.background.setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY)
+                textView.background.setTintWith(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY)
                 textView.setTextColor(ContextCompat.getColor(context, R.color.white))
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
index bd09623fa..08aa92844 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
@@ -8,16 +8,17 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.controller.BaseControllerListener
-import com.facebook.drawee.view.SimpleDraweeView
 import com.facebook.imagepipeline.image.ImageInfo
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ProfileAchievementItemBinding
 import com.habitrpg.android.habitica.extensions.addOkButton
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
+import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 
 class AchievementProfileAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
@@ -61,12 +62,9 @@ class AchievementProfileAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(
     }
 
     internal class AchievementViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+        private val binding = ProfileAchievementItemBinding.bind(itemView)
         private var achievement: Achievement? = null
 
-        private val draweeView: SimpleDraweeView by bindView(R.id.achievement_drawee)
-        private val titleView: TextView by bindView(R.id.achievement_text)
-        private val countText: TextView by bindView(R.id.achievement_count_label)
-
         init {
             itemView.isClickable = true
             itemView.setOnClickListener(this)
@@ -75,7 +73,7 @@ class AchievementProfileAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(
         fun bind(item: Achievement) {
             val iconUrl = AvatarView.IMAGE_URI_ROOT + (if (!item.earned) "achievement-unearned" else item.icon) + "2x.png"
 
-            draweeView.controller = Fresco.newDraweeControllerBuilder()
+            binding.achievementDrawee.controller = Fresco.newDraweeControllerBuilder()
                     .setUri(iconUrl)
                     .setControllerListener(object : BaseControllerListener<ImageInfo>() {
                         override fun onFailure(id: String?, throwable: Throwable?) { /* no-on */ }
@@ -83,34 +81,20 @@ class AchievementProfileAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(
                     .build()
 
             this.achievement = item
-            titleView.text = item.title
+            binding.achievementText.text = item.title
 
             if (item.optionalCount == null || item.optionalCount == 0) {
-                countText.visibility = View.GONE
+                binding.achievementCountLabel.visibility = View.GONE
             } else {
-                countText.visibility = View.VISIBLE
-                countText.text = item.optionalCount.toString()
+                binding.achievementCountLabel.visibility = View.VISIBLE
+                binding.achievementCountLabel.text = item.optionalCount.toString()
             }
         }
 
         override fun onClick(view: View) {
-            val context = itemView.context
-            val alert = HabiticaAlertDialog(context)
-
-            val customView = LayoutInflater.from(context).inflate(R.layout.dialog_achievement_details, null)
-            val achievementImage = customView.findViewById<View>(R.id.achievement_image) as? ImageView
-            achievementImage?.setImageDrawable(draweeView.drawable)
-
-            val titleView = customView.findViewById<View>(R.id.achievement_title) as? TextView
-            titleView?.text = achievement?.title
-
-            val textView = customView.findViewById<View>(R.id.achievement_text) as? TextView
-            textView?.text = achievement?.text
-
-            alert.setAdditionalContentView(customView)
-            alert.addOkButton()
-
-            alert.show()
+            achievement?.let {
+                AchievementDetailDialog(it, itemView.context).show()
+            }
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
index c0300c3e0..ac3bac6fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
@@ -2,28 +2,24 @@ package com.habitrpg.android.habitica.ui.adapter.social
 
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ChallengeItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.android.habitica.ui.helpers.EmojiParser
 import io.realm.OrderedRealmCollection
-import io.realm.RealmRecyclerViewAdapter
-import net.pherth.android.emoji_library.EmojiParser
 
-class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUpdate: Boolean, private val viewUserChallengesOnly: Boolean, private val userId: String) : RealmRecyclerViewAdapter<Challenge, ChallengesListViewAdapter.ChallengeViewHolder>(data, autoUpdate) {
+class ChallengesListViewAdapter(private val viewUserChallengesOnly: Boolean, private val userId: String) : BaseRecyclerViewAdapter<Challenge, ChallengesListViewAdapter.ChallengeViewHolder>() {
     private var unfilteredData: OrderedRealmCollection<Challenge>? = null
-    var challengeMemberships: OrderedRealmCollection<ChallengeMembership>? = null
+    private var challengeMemberships: OrderedRealmCollection<ChallengeMembership>? = null
 
     private val openChallengeFragmentEvents = PublishSubject.create<String>()
 
@@ -45,7 +41,7 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
     }
 
     fun updateUnfilteredData(data: OrderedRealmCollection<Challenge>?) {
-        super.updateData(data)
+        this.data = data ?: emptyList()
         unfilteredData = data
     }
 
@@ -75,7 +71,7 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
         }
 
         query?.let {
-            this.updateData(it.findAll())
+            data = it.findAll()
         }
     }
 
@@ -84,41 +80,30 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
     }
 
     class ChallengeViewHolder internal constructor(itemView: View, private val viewUserChallengesOnly: Boolean) : RecyclerView.ViewHolder(itemView) {
-
-        private val challengeName: HabiticaEmojiTextView by bindView(R.id.challenge_name)
-        private val challengeDescription: TextView by bindView(R.id.challenge_shorttext)
-        private val participantCount: TextView by bindView(R.id.participantCount)
-        private val officialChallengeLayout: TextView by bindView(R.id.official_challenge_view)
-        private val challengeParticipatingTextView: View by bindView(R.id.is_joined_label)
-        private val gemPrizeTextView: TextView by bindView(R.id.gemPrizeTextView)
-        private val gemIconView: ImageView by bindView(R.id.gem_icon)
+        private val binding = ChallengeItemBinding.bind(itemView)
 
         private var challenge: Challenge? = null
 
         init {
-            gemIconView.setImageBitmap(HabiticaIconsHelper.imageOfGem())
-
-            if (!viewUserChallengesOnly) {
-                challengeName.setTextColor(ContextCompat.getColor(itemView.context, R.color.brand_200))
-            }
+            binding.gemIcon.setImageBitmap(HabiticaIconsHelper.imageOfGem())
         }
 
         fun bind(challenge: Challenge, isParticipating: Boolean) {
             this.challenge = challenge
 
-            challengeName.text = EmojiParser.parseEmojis(challenge.name?.trim { it <= ' ' })
-            challengeDescription.text = challenge.summary
+            binding.challengeName.text = EmojiParser.parseEmojis(challenge.name?.trim { it <= ' ' })
+            binding.challengeShorttext.text = challenge.summary
 
-            officialChallengeLayout.visibility = if (challenge.official) View.VISIBLE else View.GONE
+            binding.officialChallengeView.visibility = if (challenge.official) View.VISIBLE else View.GONE
 
             if (viewUserChallengesOnly) {
-                challengeParticipatingTextView.visibility = View.GONE
+                binding.isJoinedLabel.visibility = View.GONE
             } else {
-                challengeParticipatingTextView.visibility = if (isParticipating) View.VISIBLE else View.GONE
+                binding.isJoinedLabel.visibility = if (isParticipating) View.VISIBLE else View.GONE
             }
-            participantCount.text = challenge.memberCount.toString()
+            binding.participantCount.text = challenge.memberCount.toString()
 
-            gemPrizeTextView.text = challenge.prize.toString()
+            binding.gemPrizeTextView.text = challenge.prize.toString()
         }
     }
 }
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..011a033c5 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
@@ -8,15 +8,14 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
-import io.realm.OrderedRealmCollection
-import io.realm.RealmRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
-class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUpdate: Boolean, user: User?, private val isTavern: Boolean) : RealmRecyclerViewAdapter<ChatMessage, RecyclerView.ViewHolder>(data, autoUpdate) {
+class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) : BaseRecyclerViewAdapter<ChatMessage, RecyclerView.ViewHolder>() {
     internal var user = user
     set(value) {
         field = value
@@ -40,34 +39,32 @@ 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)
+            ChatRecyclerMessageViewHolder(parent.inflate(R.layout.chat_item), uuid, isTavern)
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        data?.let { data ->
-            if (data[position].isSystemMessage) {
-                (holder as? SystemChatMessageViewHolder)?.bind(data[position])
-            } else {
-                val chatHolder = holder as? ChatRecyclerViewHolder ?: return
-                val message = data[position]
-                chatHolder.bind(message,
-                        uuid,
-                        user,
-                        expandedMessageId == message.id)
-                chatHolder.onShouldExpand = { expandMessage(message.id, position) }
-                chatHolder.onLikeMessage = { likeMessageEvents.onNext(it) }
-                chatHolder.onOpenProfile = { userLabelClickEvents.onNext(it) }
-                chatHolder.onReply = { replyMessageEvents.onNext(it) }
-                chatHolder.onCopyMessage = { copyMessageEvents.onNext(it) }
-                chatHolder.onFlagMessage = { flagMessageEvents.onNext(it) }
-                chatHolder.onDeleteMessage = { deleteMessageEvents.onNext(it) }
-            }
+        if (data[position].isSystemMessage) {
+            (holder as? SystemChatMessageViewHolder)?.bind(data[position])
+        } else {
+            val chatHolder = holder as? ChatRecyclerMessageViewHolder ?: return
+            val message = data[position]
+            chatHolder.bind(message,
+                    uuid,
+                    user,
+                    expandedMessageId == message.id)
+            chatHolder.onShouldExpand = { expandMessage(message.id, position) }
+            chatHolder.onLikeMessage = { likeMessageEvents.onNext(it) }
+            chatHolder.onOpenProfile = { userLabelClickEvents.onNext(it) }
+            chatHolder.onReply = { replyMessageEvents.onNext(it) }
+            chatHolder.onCopyMessage = { copyMessageEvents.onNext(it) }
+            chatHolder.onFlagMessage = { flagMessageEvents.onNext(it) }
+            chatHolder.onDeleteMessage = { deleteMessageEvents.onNext(it) }
         }
     }
 
     override fun getItemViewType(position: Int): Int {
-        return if (data?.get(position)?.isSystemMessage == true) 0 else 1
+        return if (data[position].isSystemMessage) 0 else 1
     }
 
     fun getLikeMessageFlowable(): Flowable<ChatMessage> {
@@ -105,7 +102,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
 }
 
 class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    private val textView: TextView by bindView(R.id.text_view)
+    private val textView: TextView = itemView.findViewById(R.id.text_view)
 
     fun bind(chatMessage: ChatMessage?) {
         textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
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..3571e3953 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
@@ -8,13 +8,18 @@ import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerIntroViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.android.habitica.models.members.Member
+
+class InboxAdapter(private var user: User?, private var replyToUser : Member) : PagedListAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
+    private val FIRST_MESSAGE = 0
+    private val NORMAL_MESSAGE = 1
 
-class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
     private var expandedMessageId: String? = null
-
     private val likeMessageEvents = PublishSubject.create<ChatMessage>()
     private val userLabelClickEvents = PublishSubject.create<String>()
     private val deleteMessageEvents = PublishSubject.create<ChatMessage>()
@@ -22,28 +27,49 @@ class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, Chat
     private val replyMessageEvents = PublishSubject.create<String>()
     private val copyMessageEvents = PublishSubject.create<ChatMessage>()
 
+    private fun isPositionIntroMessage(position: Int) : Boolean {
+        return (position == super.getItemCount() - 1)
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (isPositionIntroMessage(position)) FIRST_MESSAGE else NORMAL_MESSAGE
+    }
+
+    override fun getItemId(position: Int): Long {
+        return if (isPositionIntroMessage(position)) -1 else super.getItemId(position)
+    }
+
+    override fun getItem(position: Int) : ChatMessage? {
+        return if (isPositionIntroMessage(position)) ChatMessage() else super.getItem(position)
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatRecyclerViewHolder {
-        return ChatRecyclerViewHolder(parent.inflate(R.layout.tavern_chat_item), user?.id ?: "", false)
+        return if (viewType == FIRST_MESSAGE) ChatRecyclerIntroViewHolder(parent.inflate(R.layout.tavern_chat_intro_item), replyToUser.id!!)
+        else ChatRecyclerMessageViewHolder(parent.inflate(R.layout.chat_item), user?.id ?: "", false)
     }
 
     override fun onBindViewHolder(holder: ChatRecyclerViewHolder, position: Int) {
-        val message = getItem(position) ?: return
-
-        holder.bind(message,
+        val firstMessage : Boolean = getItemViewType(position) == FIRST_MESSAGE
+        if (firstMessage) {
+            val introHolder = holder as ChatRecyclerIntroViewHolder
+            introHolder.bind(replyToUser)
+            introHolder.onOpenProfile = { userLabelClickEvents.onNext(it) }
+        }
+        else {
+            val message : ChatMessage = getItem(position) ?: return
+            val messageHolder = holder as ChatRecyclerMessageViewHolder
+            messageHolder.bind(message,
                 user?.id ?: "",
                 user,
                 expandedMessageId == message.id)
-        holder.onShouldExpand = { expandMessage(message.id, position) }
-        holder.onLikeMessage = { likeMessageEvents.onNext(it) }
-        holder.onOpenProfile = { userLabelClickEvents.onNext(it) }
-        holder.onReply = { replyMessageEvents.onNext(it) }
-        holder.onCopyMessage = { copyMessageEvents.onNext(it) }
-        holder.onFlagMessage = { flagMessageEvents.onNext(it) }
-        holder.onDeleteMessage = { deleteMessageEvents.onNext(it) }
-    }
-
-    fun getLikeMessageFlowable(): Flowable<ChatMessage> {
-        return likeMessageEvents.toFlowable(BackpressureStrategy.DROP)
+            messageHolder.onShouldExpand = { expandMessage(message.id, position) }
+            messageHolder.onLikeMessage = { likeMessageEvents.onNext(it) }
+            messageHolder.onOpenProfile = { userLabelClickEvents.onNext(it) }
+            messageHolder.onReply = { replyMessageEvents.onNext(it) }
+            messageHolder.onCopyMessage = { copyMessageEvents.onNext(it) }
+            messageHolder.onFlagMessage = { flagMessageEvents.onNext(it) }
+            messageHolder.onDeleteMessage = { deleteMessageEvents.onNext(it) }
+        }
     }
 
     fun getUserLabelClickFlowable(): Flowable<String> {
@@ -58,15 +84,13 @@ class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, Chat
         return deleteMessageEvents.toFlowable(BackpressureStrategy.DROP)
     }
 
-    fun getReplyMessageEvents(): Flowable<String> {
-        return replyMessageEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
     fun getCopyMessageFlowable(): Flowable<ChatMessage> {
         return copyMessageEvents.toFlowable(BackpressureStrategy.DROP)
     }
 
     private fun expandMessage(id: String, position: Int) {
+        if (isPositionIntroMessage(position))
+            return
         expandedMessageId = if (expandedMessageId == id) {
             null
         } else {
@@ -84,7 +108,7 @@ class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, Chat
                                          newConcert: ChatMessage) = oldConcert.id == newConcert.id
 
             override fun areContentsTheSame(oldConcert: ChatMessage,
-                                            newConcert: ChatMessage) = oldConcert == newConcert
+                                            newConcert: ChatMessage) = oldConcert.text == newConcert.text
         }
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
index 8135ac277..b1127ecc7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
@@ -4,14 +4,13 @@ import android.view.ViewGroup
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder.GroupMemberViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
-import io.realm.OrderedRealmCollection
-import io.realm.RealmRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
-class PartyMemberRecyclerViewAdapter(data: OrderedRealmCollection<Member>?, autoUpdate: Boolean) : RealmRecyclerViewAdapter<Member, GroupMemberViewHolder>(data, autoUpdate) {
+class PartyMemberRecyclerViewAdapter : BaseRecyclerViewAdapter<Member, GroupMemberViewHolder>() {
 
     var leaderID: String? = null
 
@@ -22,11 +21,9 @@ class PartyMemberRecyclerViewAdapter(data: OrderedRealmCollection<Member>?, auto
     }
 
     override fun onBindViewHolder(holder: GroupMemberViewHolder, position: Int) {
-        data?.let {
-            holder.bind(it[position], leaderID, null)
-            holder.onClickEvent = {
-                userClickedEvents.onNext(it[position].id ?: "")
-            }
+        holder.bind(data[position], leaderID, null)
+        holder.onClickEvent = {
+            userClickedEvents.onNext(data[position].id ?: "")
         }
     }
 
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..fd7453ace 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
@@ -2,26 +2,23 @@ package com.habitrpg.android.habitica.ui.adapter.social
 
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.Filter
 import android.widget.Filterable
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.ItemPublicGuildBinding
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.social.PublicGuildsFragmentDirections
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
-import io.reactivex.functions.Consumer
 import io.realm.Case
 import io.realm.OrderedRealmCollection
-import io.realm.RealmRecyclerViewAdapter
 
-class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, autoUpdate: Boolean) : RealmRecyclerViewAdapter<Group, PublicGuildsRecyclerViewAdapter.GuildViewHolder>(data, autoUpdate), Filterable {
+class PublicGuildsRecyclerViewAdapter : BaseRecyclerViewAdapter<Group, PublicGuildsRecyclerViewAdapter.GuildViewHolder>(), Filterable {
 
     var socialRepository: SocialRepository? = null
     private var memberGuildIDs: List<String> = listOf()
@@ -38,24 +35,20 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
             directions.isMember = isInGroup(guild)
             MainNavigationController.navigate(directions)
         }
-        guildViewHolder.joinLeaveButton.setOnClickListener { v ->
+        guildViewHolder.binding.joinleaveButton.setOnClickListener { v ->
             val guild = v.tag as? Group ?: return@setOnClickListener
             val isMember = this.memberGuildIDs.contains(guild.id)
             if (isMember) {
                 this@PublicGuildsRecyclerViewAdapter.socialRepository?.leaveGroup(guild.id, true)
-                        ?.subscribe(Consumer {
-                            if (data != null) {
-                                val indexOfGroup = data?.indexOf(guild)
-                                notifyItemChanged(indexOfGroup ?: 0)
-                            }
+                        ?.subscribe({
+                            val indexOfGroup = data.indexOf(guild)
+                            notifyItemChanged(indexOfGroup)
                         }, RxErrorHandler.handleEmptyError())
             } else {
                 this@PublicGuildsRecyclerViewAdapter.socialRepository?.joinGroup(guild.id)
-                        ?.subscribe(Consumer { group ->
-                            if (data != null) {
-                                val indexOfGroup = data?.indexOf(group)
-                                notifyItemChanged(indexOfGroup ?: 0)
-                            }
+                        ?.subscribe({ group ->
+                            val indexOfGroup = data.indexOf(group)
+                            notifyItemChanged(indexOfGroup)
                         }, RxErrorHandler.handleEmptyError())
             }
 
@@ -64,13 +57,11 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
     }
 
     override fun onBindViewHolder(holder: GuildViewHolder, position: Int) {
-        data?.let {
-            val guild = it[position]
-            val isInGroup = isInGroup(guild)
-            holder.bind(guild, isInGroup)
-            holder.itemView.tag = guild
-            holder.joinLeaveButton.tag = guild
-        }
+        val guild = data[position]
+        val isInGroup = isInGroup(guild)
+        holder.bind(guild, isInGroup)
+        holder.itemView.tag = guild
+        holder.binding.joinleaveButton.tag = guild
     }
 
     private fun isInGroup(guild: Group): Boolean {
@@ -80,7 +71,7 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
     private var unfilteredData: OrderedRealmCollection<Group>? = null
 
     fun setUnfilteredData(data: OrderedRealmCollection<Group>?) {
-        updateData(data)
+        this.data = data ?: emptyList()
         unfilteredData = data
     }
 
@@ -95,13 +86,13 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
             override fun publishResults(constraint: CharSequence, results: FilterResults) {
                 unfilteredData?.let {
                     if (constraint.isNotEmpty()) {
-                        updateData(it.where()
+                        data = it.where()
                                 .beginGroup()
                                 .contains("name", constraint.toString(), Case.INSENSITIVE)
                                 .or()
                                 .contains("summary", constraint.toString(), Case.INSENSITIVE)
                                 .endGroup()
-                                .findAll())
+                                .findAll()
                     }
                 }
             }
@@ -109,21 +100,16 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
     }
 
     class GuildViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-        private val nameTextView: TextView by bindView(R.id.nameTextView)
-        private val memberCountTextView: TextView by bindView(R.id.memberCountTextView)
-        private val descriptionTextView: TextView by bindView(R.id.descriptionTextView)
-        internal val joinLeaveButton: Button by bindView(R.id.joinleaveButton)
-
+        val binding = ItemPublicGuildBinding.bind(itemView)
 
         fun bind(guild: Group, isInGroup: Boolean) {
-            this.nameTextView.text = guild.name
-            this.memberCountTextView.text = guild.memberCount.toString()
-            this.descriptionTextView.setMarkdown(guild.summary)
+            binding.nameTextView.text = guild.name
+            binding.memberCountTextView.text = guild.memberCount.toString()
+            binding.descriptionTextView.setMarkdown(guild.summary)
             if (isInGroup) {
-                this.joinLeaveButton.setText(R.string.leave)
+                binding.joinleaveButton.setText(R.string.leave)
             } else {
-                this.joinLeaveButton.setText(R.string.join)
+                binding.joinleaveButton.setText(R.string.join)
             }
         }
     }
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..2cb86dd6d 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
@@ -9,16 +9,16 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.*
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, layoutResource: Int,
-                                        newContext: Context, userID: String, sortCallback: SortTasksCallback?,
-                                        private val openTaskDisabled: Boolean, private val taskActionsDisabled: Boolean) : SortableTasksRecyclerViewAdapter<BindableViewHolder<Task>>("", taskFilterHelper, layoutResource, newContext, userID, sortCallback) {
+                                        newContext: Context, userID: String,
+                                        private val openTaskDisabled: Boolean, private val taskActionsDisabled: Boolean) :  BaseTasksRecyclerViewAdapter<BindableViewHolder<Task>>("", taskFilterHelper, layoutResource, newContext, userID) {
 
     private val addItemSubject = PublishSubject.create<Task>()
 
@@ -122,7 +122,7 @@ class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, lay
         }
     }
 
-    private inner class DividerViewHolder internal constructor(itemView: View) : BindableViewHolder<Task>(itemView) {
+    private 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/social/challenges/ChallengesFilterRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt
index 413415158..0b3f291e1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt
@@ -7,7 +7,6 @@ import android.widget.CheckBox
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import java.util.*
 
 class ChallengesFilterRecyclerViewAdapter(entries: List<Group>) : RecyclerView.Adapter<ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder>() {
@@ -71,7 +70,7 @@ class ChallengesFilterRecyclerViewAdapter(entries: List<Group>) : RecyclerView.A
     }
 
     class ChallengeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        internal val checkbox: CheckBox by bindView(itemView, R.id.challenge_filter_group_checkbox)
+        internal val checkbox: CheckBox = itemView.findViewById(R.id.challenge_filter_group_checkbox)
 
         var group: Group? = null
 
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..8105163c2 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
@@ -12,27 +12,25 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import java.util.*
 import javax.inject.Inject
 
 abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(var taskType: String, private val taskFilterHelper: TaskFilterHelper?, private val layoutResource: Int,
-                                                                     newContext: Context, private val userID: String?) : RecyclerView.Adapter<VH>() {
+                                                                     newContext: Context, private val userID: String?) : BaseRecyclerViewAdapter<Task, VH>() {
     @Inject
     lateinit var crashlyticsProxy: CrashlyticsProxy
     @Inject
     lateinit var taskRepository: TaskRepository
     protected var content: MutableList<Task>? = null
     protected var filteredContent: MutableList<Task>? = null
-    internal var context: Context
+    internal var context: Context = newContext.applicationContext
 
     init {
-        this.setHasStableIds(true)
-        this.context = newContext.applicationContext
         this.filteredContent = ArrayList()
         HabiticaBaseApplication.userComponent?.let { injectThis(it) }
 
@@ -48,10 +46,6 @@ abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(var t
         if (item != null) {
             holder.bind(item, position, "normal")
         }
-        /*if (this.displayedChecklist != null && ChecklistedViewHolder.class.isAssignableFrom(holder.getClass())) {
-            ChecklistedViewHolder checklistedHolder = (ChecklistedViewHolder) holder;
-            checklistedHolder.setDisplayChecklist(this.displayedChecklist == position);
-        }*/
     }
 
     override fun getItemId(position: Int): Long {
@@ -59,7 +53,7 @@ abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(var t
         return task?.id?.hashCode()?.toLong() ?: 0
     }
 
-    override fun getItemCount(): Int =filteredContent?.size ?: 0
+    override fun getItemCount(): Int = filteredContent?.size ?: 0
 
     internal fun getContentView(parent: ViewGroup): View = getContentView(parent, layoutResource)
 
@@ -98,7 +92,7 @@ abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(var t
     private fun loadContent(forced: Boolean) {
         if (this.content == null || forced) {
             taskRepository.getTasks(this.taskType, this.userID ?: "")
-                    .flatMap<Task> { Flowable.fromIterable(it) }
+                    .flatMap { Flowable.fromIterable(it) }
                     .map { task ->
                         task.parseMarkdown()
                         task
@@ -106,7 +100,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/adapter/tasks/HabitsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.kt
index 715e42566..8a3714f80 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.kt
@@ -8,7 +8,6 @@ import io.realm.OrderedRealmCollection
 
 class HabitsRecyclerViewAdapter(data: OrderedRealmCollection<Task>?, autoUpdate: Boolean, layoutResource: Int, taskFilterHelper: TaskFilterHelper) : RealmBaseTasksRecyclerViewAdapter<HabitViewHolder>(data, autoUpdate, layoutResource, taskFilterHelper) {
 
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HabitViewHolder =
             HabitViewHolder(getContentView(parent), { task, direction -> taskScoreEventsSubject.onNext(Pair(task, direction)) }, {
                 task -> taskOpenEventsSubject.onNext(task)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
index 92e8926ae..311658247 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
@@ -3,24 +3,27 @@ package com.habitrpg.android.habitica.ui.adapter.tasks
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.functions.Action
-import io.reactivex.subjects.PublishSubject
-import io.realm.*
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.functions.Action
+import io.reactivex.rxjava3.subjects.PublishSubject
+import io.realm.OrderedRealmCollection
 
 abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
         private var unfilteredData: OrderedRealmCollection<Task>?,
         private val hasAutoUpdates: Boolean,
         private val layoutResource: Int,
         private val taskFilterHelper: TaskFilterHelper?
-) : RealmRecyclerViewAdapter<Task, VH>(null, false), TaskRecyclerViewAdapter {
+) : BaseRecyclerViewAdapter<Task, VH>(), TaskRecyclerViewAdapter {
+    override var canScoreTasks = true
+
     private var updateOnModification: Boolean = false
     override var ignoreUpdates: Boolean = false
 
@@ -32,78 +35,6 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
         }
     }
 
-    private val resultsListener: OrderedRealmCollectionChangeListener<RealmResults<Task>> by lazy {
-        OrderedRealmCollectionChangeListener<RealmResults<Task>> { _, changeSet ->
-            buildChangeSet(changeSet)
-        }
-    }
-
-    private val listListener: OrderedRealmCollectionChangeListener<RealmList<Task>> by lazy {
-        OrderedRealmCollectionChangeListener<RealmList<Task>> { _, changeSet ->
-            buildChangeSet(changeSet)
-        }
-    }
-
-    private fun buildChangeSet(changeSet: OrderedCollectionChangeSet) {
-        if (ignoreUpdates) return
-        if (changeSet.state == OrderedCollectionChangeSet.State.INITIAL) {
-            notifyDataSetChanged()
-            return
-        }
-        // For deletions, the adapter has to be notified in reverse order.
-        val deletions = changeSet.deletionRanges
-        for (i in deletions.indices.reversed()) {
-            val range = deletions[i]
-            notifyItemRangeRemoved(range.startIndex + dataOffset(), range.length)
-        }
-
-        val insertions = changeSet.insertionRanges
-        for (range in insertions) {
-            notifyItemRangeInserted(range.startIndex + dataOffset(), range.length)
-        }
-
-        if (!updateOnModification) {
-            return
-        }
-
-        val modifications = changeSet.changeRanges
-        for (range in modifications) {
-            notifyItemRangeChanged(range.startIndex + dataOffset(), range.length)
-        }
-    }
-
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-        super.onAttachedToRecyclerView(recyclerView)
-        data?.takeIf { it.isValid }?.addListener()
-    }
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView)
-        data?.takeIf { it.isValid }?.removeListener()
-    }
-
-    override fun updateData(tasks: OrderedRealmCollection<Task>?) {
-        data?.takeIf { it.isValid }?.removeListener()
-        tasks?.takeIf { it.isValid }?.addListener()
-        super.updateData(tasks)
-    }
-
-    private fun OrderedRealmCollection<Task>.addListener() {
-        when (this) {
-            is RealmResults<Task> -> addChangeListener(resultsListener)
-            is RealmList<Task> -> addChangeListener(listListener)
-            else -> throw IllegalArgumentException("RealmCollection not supported: $javaClass")
-        }
-    }
-
-    private fun OrderedRealmCollection<Task>.removeListener() {
-        when (this) {
-            is RealmResults<Task> -> removeChangeListener(resultsListener)
-            is RealmList<Task> -> removeChangeListener(listListener)
-            else -> throw IllegalArgumentException("RealmCollection not supported: $javaClass")
-        }
-    }
-
     private var errorButtonEventsSubject = PublishSubject.create<String>()
     override val errorButtonEvents: Flowable<String> = errorButtonEventsSubject.toFlowable(BackpressureStrategy.DROP)
     protected var taskScoreEventsSubject = PublishSubject.create<Pair<Task, TaskDirection>>()
@@ -115,9 +46,6 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
     protected var brokenTaskEventsSubject = PublishSubject.create<Task>()
     override val brokenTaskEvents: Flowable<Task> = brokenTaskEventsSubject.toFlowable(BackpressureStrategy.DROP)
 
-    private val isDataValid: Boolean
-        get() = data?.isValid ?: false
-
     init {
         check(!(unfilteredData != null && unfilteredData?.isManaged == false)) { "Only use this adapter with managed RealmCollection, " + "for un-managed lists you can just use the BaseRecyclerViewAdapter" }
         this.updateOnModification = true
@@ -126,18 +54,15 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
 
     override fun getItemId(index: Int): Long = index.toLong()
 
-    override fun getItemCount(): Int = if (isDataValid) data?.size ?: 0 else 0
-
-    override fun getItem(index: Int): Task? = if (isDataValid) data?.get(index) else null
-
     override fun updateUnfilteredData(data: OrderedRealmCollection<Task>?) {
         unfilteredData = data
-        updateData(data)
+        this.data = data ?: emptyList()
     }
 
     override fun onBindViewHolder(holder: VH, position: Int) {
         val item = getItem(position)
         if (item != null) {
+            holder.isLocked = !canScoreTasks
             holder.bind(item, position, taskDisplayMode)
             holder.errorButtonClicked = Action {
                 errorButtonEventsSubject.onNext("")
@@ -156,12 +81,12 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
         if (taskFilterHelper != null) {
             val query = taskFilterHelper.createQuery(unfilteredData)
             if (query != null) {
-                updateData(query.findAll())
+                data = query.findAll()
             }
         }
     }
 
     override fun getTaskIDAt(position: Int): String {
-        return data?.get(position)?.id ?: ""
+        return data[position].id ?: ""
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
index 9a277a900..7ab0ca57b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
@@ -12,18 +12,25 @@ import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 
-class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollection<Task>?, private val layoutResource: Int, private val user: User?, private val configManager: AppConfigManager) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
+class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollection<Task>?, private val layoutResource: Int) : BaseRecyclerViewAdapter<Task, RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
+    var user: User? = null
+    set(value) {
+        field = value
+        notifyDataSetChanged()
+    }
+    override var canScoreTasks = true
     private var inAppRewards: OrderedRealmCollection<ShopItem>? = null
 
-    val errorButtonEventsSubject = PublishSubject.create<String>()
-    override val errorButtonEvents = errorButtonEventsSubject.toFlowable(BackpressureStrategy.DROP)
+    private val errorButtonEventsSubject = PublishSubject.create<String>()
+    override val errorButtonEvents: Flowable<String> = errorButtonEventsSubject.toFlowable(BackpressureStrategy.DROP)
     private var taskScoreEventsSubject = PublishSubject.create<Pair<Task, TaskDirection>>()
     override val taskScoreEvents: Flowable<Pair<Task, TaskDirection>> = taskScoreEventsSubject.toFlowable(BackpressureStrategy.LATEST)
     private var checklistItemScoreSubject = PublishSubject.create<Pair<Task, ChecklistItem>>()
@@ -84,6 +91,7 @@ class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollecti
         if (customRewards != null && position < customRewardCount) {
             val reward = customRewards?.get(position) ?: return
             val gold = user?.stats?.gp ?: 0.0
+            (holder as? RewardViewHolder)?.isLocked = canScoreTasks
             (holder as? RewardViewHolder)?.bind(reward, position, reward.value <= gold, taskDisplayMode)
         } else if (inAppRewards != null) {
             val item = inAppRewards?.get(position - customRewardCount) ?: return
@@ -113,7 +121,7 @@ class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollecti
         return rewardCount
     }
 
-    override fun updateData(tasks: OrderedRealmCollection<Task>?) {
+    fun updateData(tasks: OrderedRealmCollection<Task>?) {
         this.customRewards = tasks
         notifyDataSetChanged()
     }
@@ -137,7 +145,6 @@ class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollecti
 
     companion object {
         private const val VIEWTYPE_CUSTOM_REWARD = 0
-        private const val VIEWTYPE_HEADER = 1
         private const val VIEWTYPE_IN_APP_REWARD = 2
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/SortableTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/SortableTasksRecyclerViewAdapter.java
deleted file mode 100644
index 65572dea3..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/SortableTasksRecyclerViewAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks;
-
-import android.content.Context;
-
-import androidx.annotation.Nullable;
-
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
-import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperDropCallback;
-import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder;
-
-import java.util.Collections;
-
-/**
- * Created by ell on 7/21/16.
- */
-public abstract class SortableTasksRecyclerViewAdapter<VH extends BindableViewHolder<Task>>
-        extends BaseTasksRecyclerViewAdapter<VH> implements ItemTouchHelperAdapter, ItemTouchHelperDropCallback {
-
-    private SortTasksCallback sortCallback;
-
-    public SortableTasksRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
-                                            Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
-        super(taskType, taskFilterHelper, layoutResource, newContext, userID);
-        this.sortCallback = sortCallback;
-    }
-
-    @Override
-    public void onItemMove(int fromPosition, int toPosition) {
-        if (getFilteredContent().size() <= fromPosition || getFilteredContent().size() <= toPosition) {
-            return;
-        }
-        Collections.swap(getFilteredContent(), fromPosition, toPosition);
-        notifyItemMoved(fromPosition, toPosition);
-    }
-
-    @Override
-    public void onItemDismiss(int position) {
-        //NO OP
-    }
-
-    @Override
-    public void onDrop(int from, int to) {
-        if (this.sortCallback != null && from != to) {
-            this.sortCallback.onMove(getFilteredContent().get(to), from, to);
-        }
-    }
-
-    public interface SortTasksCallback {
-        void onMove(Task task, int from, int to);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
index 1c2a0707e..a056b35d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
@@ -3,18 +3,19 @@ package com.habitrpg.android.habitica.ui.adapter.tasks
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.OrderedRealmCollection
+import io.realm.RealmResults
 
 interface TaskRecyclerViewAdapter {
+    var canScoreTasks: Boolean
+    var data: List<Task>
     var ignoreUpdates: Boolean
 
     val errorButtonEvents: Flowable<String>
 
     var taskDisplayMode: String
 
-    fun updateData(tasks: OrderedRealmCollection<Task>?)
-
     fun filter()
 
     fun notifyItemMoved(adapterPosition: Int, adapterPosition1: Int)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
index 7eb5ba152..adb237f21 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
@@ -8,37 +8,29 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.net.toUri
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentAboutBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.DeviceName
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.plattysoft.leonids.ParticleSystem
-import io.reactivex.Completable
-import kotlinx.android.synthetic.main.fragment_about.*
 import javax.inject.Inject
 import javax.inject.Named
 
 
-class AboutFragment : BaseMainFragment() {
+class AboutFragment : BaseMainFragment<FragmentAboutBinding>() {
 
-    private var deviceInfo: DeviceName.DeviceInfo? = null
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
 
     @Inject
     lateinit var appConfigManager: AppConfigManager
 
-    private val updateAvailableWrapper: ViewGroup by bindView(R.id.update_available_wrapper)
-    private val updateAvailableTextView: TextView by bindView(R.id.update_available_textview)
-
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
@@ -54,21 +46,19 @@ class AboutFragment : BaseMainFragment() {
         startActivity(intent)
     }
 
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentAboutBinding {
+        return FragmentAboutBinding.inflate(layoutInflater, container, false)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        compositeSubscription.add(Completable.fromAction {
-            deviceInfo = DeviceName.getDeviceInfo(context)
-        }.subscribe())
-
-        return inflater.inflate(R.layout.fragment_about, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        versionInfo.setOnClickListener {
+        binding?.versionInfo?.setOnClickListener {
             versionNumberTappedCount += 1
             when (versionNumberTappedCount) {
                 1 -> context?.let { context ->
@@ -108,21 +98,21 @@ class AboutFragment : BaseMainFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        versionInfo.text = getString(R.string.version_info, versionName, versionCode)
+        binding?.versionInfo?.text = getString(R.string.version_info, versionName, versionCode)
 
         if (appConfigManager.lastVersionCode() > versionCode) {
-            updateAvailableWrapper.visibility = View.VISIBLE
-            updateAvailableTextView.text = getString(R.string.update_available, appConfigManager.lastVersionNumber(), appConfigManager.lastVersionCode())
+            binding?.updateAvailableWrapper?.visibility = View.VISIBLE
+            binding?.updateAvailableTextview?.text = getString(R.string.update_available, appConfigManager.lastVersionNumber(), appConfigManager.lastVersionCode())
         } else {
-            updateAvailableWrapper.visibility = View.GONE
+            binding?.updateAvailableWrapper?.visibility = View.GONE
         }
 
-        sourceCodeLink.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
-        twitter.setOnClickListener { openBrowserLink(twitterLink) }
-        sourceCodeButton.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
-        reportBug.setOnClickListener { MainNavigationController.navigate(R.id.bugFixFragment) }
-        googlePlayStoreButton.setOnClickListener { openGooglePlay() }
-        updateAvailableWrapper.setOnClickListener { openGooglePlay() }
+        binding?.sourceCodeLink?.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
+        binding?.twitter?.setOnClickListener { openBrowserLink(twitterLink) }
+        binding?.sourceCodeButton?.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
+        binding?.reportBug?.setOnClickListener { MainNavigationController.navigate(R.id.bugFixFragment) }
+        binding?.googlePlayStoreButton?.setOnClickListener { openGooglePlay() }
+        binding?.updateAvailableWrapper?.setOnClickListener { openGooglePlay() }
     }
 
     private fun openBrowserLink(url: String) {
@@ -141,7 +131,7 @@ class AboutFragment : BaseMainFragment() {
                             .setSpeedByComponentsRange(-0.08f, 0.08f, 0.05f, 0.1f)
                             .setFadeOut(200, AccelerateInterpolator())
                             .setRotationSpeed(100f)
-                            .emitWithGravity(anchor, Gravity.BOTTOM, 20, 10000)
+                            .emitWithGravity(binding?.anchor, Gravity.BOTTOM, 20, 10000)
                 }
             }
         }
@@ -153,7 +143,7 @@ class AboutFragment : BaseMainFragment() {
                             .setSpeedByComponentsRange(-0.08f, 0.08f, 0.05f, 0.1f)
                             .setFadeOut(200, AccelerateInterpolator())
                             .setRotationSpeed(100f)
-                            .emitWithGravity(anchor, Gravity.BOTTOM, 20, 10000)
+                            .emitWithGravity(binding?.anchor, Gravity.BOTTOM, 20, 10000)
                 }
             }
         }
@@ -165,9 +155,11 @@ class AboutFragment : BaseMainFragment() {
                             .setSpeedByComponentsRange(-0.08f, 0.08f, 0.05f, 0.1f)
                             .setFadeOut(200, AccelerateInterpolator())
                             .setRotationSpeed(100f)
-                            .emitWithGravity(anchor, Gravity.BOTTOM, 20, 10000)
+                            .emitWithGravity(binding?.anchor, Gravity.BOTTOM, 20, 10000)
                 }
             }
         }
     }
+
+    override var binding: FragmentAboutBinding? = null
 }
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..41215ddbe 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
@@ -6,29 +6,29 @@ import android.view.*
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.ui.adapter.AchievementsAdapter
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
-import io.reactivex.rxkotlin.combineLatest
-import io.realm.RealmResults
+import io.reactivex.rxjava3.kotlin.Flowables
+import io.reactivex.rxjava3.kotlin.combineLatest
 import javax.inject.Inject
 
-class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshListener {
+class AchievementsFragment: BaseMainFragment<FragmentRefreshRecyclerviewBinding>(), SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
     private var menuID: Int = 0
     private lateinit var adapter: AchievementsAdapter
     private var useGridLayout = false
@@ -38,8 +38,6 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
         adapter.notifyDataSetChanged()
     }
 
-    private val recyclerView: RecyclerView by bindView(R.id.recyclerView)
-    private val refreshLayout: SwipeRefreshLayout by bindView(R.id.refreshLayout)
 
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
@@ -47,12 +45,9 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
         adapter = AchievementsAdapter()
-
         onRefresh()
-
-        return inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewStateRestored(savedInstanceState: Bundle?) {
@@ -68,13 +63,11 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         val layoutManager = GridLayoutManager(activity, 2)
-        recyclerView.layoutManager = layoutManager
-        recyclerView.adapter = adapter
+        binding?.recyclerView?.layoutManager = layoutManager
+        binding?.recyclerView?.adapter = adapter
         adapter.useGridLayout = useGridLayout
-        context?.let { recyclerView.background = ColorDrawable(ContextCompat.getColor(it, R.color.white)) }
+        context?.let { binding?.recyclerView?.background = ColorDrawable(ContextCompat.getColor(it, R.color.content_background)) }
 
         layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
@@ -86,7 +79,7 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
             }
         }
 
-        refreshLayout.setOnRefreshListener(this)
+        binding?.refreshLayout?.setOnRefreshListener(this)
 
         compositeSubscription.add(userRepository.getAchievements().map { achievements ->
             achievements.sortedBy {
@@ -96,13 +89,16 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
                     (it.category?.first()?.toInt() ?: 2) * it.index
                 }
             }
-        }.subscribe(Consumer {
+        }.combineLatest(Flowables.combineLatest(userRepository.getQuestAchievements(), userRepository.getQuestAchievements()
+                .map { it.mapNotNull { achievement -> achievement.questKey } }
+                .flatMap { inventoryRepository.getQuestContent(it) })).subscribe({
+            val achievements = it.first
             val entries = mutableListOf<Any>()
             var lastCategory = ""
-            it.forEach { achievement ->
+            achievements.forEach { achievement ->
                 val categoryIdentifier = achievement.category ?: ""
                 if (categoryIdentifier != lastCategory) {
-                    val category = Pair(categoryIdentifier, it.count { check ->
+                    val category = Pair(categoryIdentifier, achievements.count { check ->
                         check.category == categoryIdentifier && check.earned
                     })
                     entries.add(category)
@@ -110,22 +106,23 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
                 }
                 entries.add(achievement)
             }
+            val questAchievements = it.second
+            entries.add(Pair("Quests completed", questAchievements.first.size))
+            entries.addAll(questAchievements.first.map { achievement ->
+                val questContent = questAchievements.second.firstOrNull { achievement.questKey == it.key }
+                achievement.title = questContent?.text
+                achievement
+            })
+
+            val challengeAchievementCount = user?.challengeAchievements?.size ?: 0
+            if (challengeAchievementCount > 0) {
+                entries.add(Pair("Challenges won", challengeAchievementCount))
+                user?.challengeAchievements?.let { it1 -> entries.addAll(it1) }
+            }
+
             adapter.entries = entries
             adapter.notifyDataSetChanged()
         }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(userRepository.getQuestAchievements()
-                .combineLatest(userRepository.getQuestAchievements()
-                        .map { it.mapNotNull { achievement -> achievement.questKey } }
-                        .flatMap { inventoryRepository.getQuestContent(it) })
-                .subscribeWithErrorHandler(Consumer { result ->
-                    val achievements = result.first.map {achievement ->
-                        val questContent = result.second.firstOrNull { achievement.questKey == it.key }
-                        achievement.title = questContent?.text
-                        achievement
-                    }
-                    adapter.questAchievements = achievements
-                    adapter.notifyDataSetChanged()
-                }))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -158,7 +155,8 @@ 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(), { binding?.refreshLayout?.isRefreshing = false }))
     }
+
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
index 3376396e6..bc17cc890 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
@@ -5,22 +5,26 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import androidx.viewbinding.ViewBinding
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TutorialRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.functions.Consumer
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.EventBusException
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-abstract class BaseFragment : DialogFragment() {
+abstract class BaseFragment<VB: ViewBinding> : DialogFragment() {
+
+    var isModal: Boolean = false
+    abstract var binding: VB?
 
     @Inject
     lateinit var tutorialRepository: TutorialRepository
@@ -35,11 +39,6 @@ abstract class BaseFragment : DialogFragment() {
     open val displayedClassName: String?
         get() = this.javaClass.simpleName
 
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        showTutorialIfNeeded()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         HabiticaBaseApplication.userComponent?.let {
             injectFragment(it)
@@ -48,6 +47,8 @@ abstract class BaseFragment : DialogFragment() {
         super.onCreate(savedInstanceState)
     }
 
+    abstract fun createBinding(inflater: LayoutInflater, container: ViewGroup?): VB
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         compositeSubscription = CompositeDisposable()
 
@@ -62,7 +63,8 @@ abstract class BaseFragment : DialogFragment() {
         additionalData["page"] = this.javaClass.simpleName
         AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData)
 
-        return null
+        binding = createBinding(inflater, container)
+        return binding?.root
     }
 
     abstract fun injectFragment(component: UserComponent)
@@ -101,10 +103,6 @@ abstract class BaseFragment : DialogFragment() {
         }
 
         super.onDestroyView()
-        context?.let {
-            val refWatcher = HabiticaBaseApplication.getInstance(it)?.refWatcher
-            refWatcher?.watch(this)
-        }
     }
 
     override fun onDestroy() {
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..6885a5cdd 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
@@ -2,13 +2,9 @@ package com.habitrpg.android.habitica.ui.fragments
 
 import android.content.Context
 import android.graphics.PorterDuff
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
+import android.view.*
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.tabs.TabLayout
 import com.habitrpg.android.habitica.R
@@ -19,10 +15,10 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import io.reactivex.functions.Consumer
+import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import javax.inject.Inject
 
-abstract class BaseMainFragment : BaseFragment() {
+abstract class BaseMainFragment<VB: ViewBinding> : BaseFragment<VB>() {
 
     @Inject
     lateinit var apiClient: ApiClient
@@ -53,8 +49,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
@@ -74,7 +69,12 @@ abstract class BaseMainFragment : BaseFragment() {
             enableToolbarScrolling()
         }
 
-        return null
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
     }
 
     override fun onResume() {
@@ -83,6 +83,11 @@ abstract class BaseMainFragment : BaseFragment() {
         activity?.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        activity?.toolbar?.let { ToolbarColorHelper.colorizeToolbar(it, activity, null) }
+    }
+
     private fun updateTabLayoutVisibility() {
         if (this.usesTabLayout) {
             tabLayout?.removeAllTabs()
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..b7b2b768c 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
@@ -17,16 +17,18 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.DrawerMainBinding
 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
@@ -37,22 +39,17 @@ import com.habitrpg.android.habitica.ui.fragments.social.TavernDetailFragment
 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 io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.*
 import java.util.concurrent.TimeUnit
 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() {
 
+    private var binding: DrawerMainBinding? = null
+
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
@@ -62,7 +59,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
@@ -92,28 +89,32 @@ class NavigationDrawerFragment : DialogFragment() {
         val quest = this.quest
         val questContent = this.questContent
         if (quest == null || questContent == null || !quest.active) {
-            questMenuView.visibility = View.GONE
+            binding?.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
             }
             return
         }
-        questMenuView.visibility = View.VISIBLE
+        binding?.questMenuView?.visibility = View.VISIBLE
 
-        menuHeaderView.setBackgroundColor(questContent.colors?.darkColor ?: 0)
-        questMenuView.configure(quest)
-        questMenuView.configure(questContent)
+        binding?.menuHeaderView?.setBackgroundColor(questContent.colors?.darkColor ?: 0)
+        binding?.questMenuView?.configure(quest)
+        binding?.questMenuView?.configure(questContent)
         adapter.tintColor = questContent.colors?.extraLightColor ?: 0
         adapter.backgroundTintColor = questContent.colors?.darkColor ?: 0
 
 
-        messagesBadge.visibility = View.GONE
-        settingsBadge.visibility = View.GONE
-        notificationsBadge.visibility = View.GONE
+        binding?.messagesBadge?.visibility = View.GONE
+        binding?.settingsBadge?.visibility = View.GONE
+        binding?.notificationsBadge?.visibility = View.GONE
 
         /* Reenable this once the boss art can be displayed correctly.
 
@@ -123,14 +124,14 @@ class NavigationDrawerFragment : DialogFragment() {
         } else {
             questMenuView.showBossArt()
         }*/
-        questMenuView.hideBossArt()
+        binding?.questMenuView?.hideBossArt()
 
         adapter.items.filter { it.identifier == SIDEBAR_TAVERN }.forEach {
             it.subtitle = context?.getString(R.string.active_world_boss)
         }
         adapter.notifyDataSetChanged()
 
-        questMenuView.setOnClickListener {
+        binding?.questMenuView?.setOnClickListener {
             val context = this.context
             if (context != null) {
                 TavernDetailFragment.showWorldBossInfoDialog(context, questContent)
@@ -166,12 +167,13 @@ class NavigationDrawerFragment : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding = DrawerMainBinding.bind(view)
 
-        recyclerView.adapter = adapter
-        recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
+        binding?.recyclerView?.adapter = adapter
+        binding?.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,26 +181,33 @@ 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.getTeamPlans()
+                .distinctUntilChanged { firstTeams, secondTeams -> firstTeams == secondTeams }
+                .subscribe( {
+                    getItemWithIdentifier(SIDEBAR_TEAMS)?.isVisible = it.size != 0
+                    adapter.setTeams(it)
+                }, RxErrorHandler.handleEmptyError()))
+
+        subscriptions?.add(userRepository.getUser().subscribe({
             updateUser(it)
         }, RxErrorHandler.handleEmptyError()))
 
-        messagesButtonWrapper.setOnClickListener { setSelection(R.id.inboxFragment) }
-        settingsButtonWrapper.setOnClickListener { setSelection(R.id.prefsActivity) }
-        notificationsButtonWrapper.setOnClickListener { startNotificationsActivity() }
+        binding?.messagesButtonWrapper?.setOnClickListener { setSelection(R.id.inboxFragment, null, true, preventReselection = false) }
+        binding?.settingsButtonWrapper?.setOnClickListener { setSelection(R.id.prefsActivity, null, true, preventReselection = false) }
+        binding?.notificationsButtonWrapper?.setOnClickListener { startNotificationsActivity() }
     }
 
     private fun updateUser(user: User) {
         setMessagesCount(user.inbox?.newMessages ?: 0)
-        setSettingsCount(if (user.flags?.isVerifiedUsername != true) 1 else 0 )
+        setSettingsCount(if (user.flags?.verifiedUsername != true) 1 else 0 )
         setDisplayName(user.profile?.name)
         setUsername(user.formattedUsername)
-        avatarView.setAvatar(user)
-        questMenuView.configure(user)
+        binding?.avatarView?.setAvatar(user)
+        binding?.questMenuView?.configure(user)
 
         val tavernItem = getItemWithIdentifier(SIDEBAR_TAVERN)
         if (user.preferences?.sleep == true) {
@@ -263,21 +272,6 @@ class NavigationDrawerFragment : DialogFragment() {
             subscriptionItem?.subtitle = context?.getString(R.string.more_out_of_habitica)
         }
 
-        if (configManager.enableGiftOneGetOne()) {
-            subscriptionItem?.pillText = context?.getString(R.string.sale)
-            context?.let { subscriptionItem?.pillBackground = ContextCompat.getDrawable(it, R.drawable.pill_bg_teal) }
-        }
-        if (activePromo != null) {
-            var item: HabiticaDrawerItem? = null
-            if (activePromo?.promoType == PromoType.GEMS_AMOUNT || activePromo?.promoType == PromoType.GEMS_PRICE) {
-                item = getItemWithIdentifier(SIDEBAR_GEMS)
-            }
-            if (activePromo?.promoType == PromoType.SUBSCRIPTION) {
-                item = getItemWithIdentifier(SIDEBAR_GEMS)
-            }
-            item?.pillText = context?.getString(R.string.sale)
-            item?.pillBackground = context?.let { activePromo?.pillBackgroundDrawable(it) }
-        }
         subscriptionItem?.let { updateItem(it) }
 
         val promoItem = getItemWithIdentifier(SIDEBAR_SUBSCRIPTION_PROMO)
@@ -307,19 +301,6 @@ class NavigationDrawerFragment : DialogFragment() {
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-
-        activePromo = configManager.activePromo()
-        val promoItem = getItemWithIdentifier(SIDEBAR_PROMO) ?: return
-        if (activePromo != null) {
-            promoItem.isVisible = true
-            adapter.activePromo = activePromo
-        } else {
-            promoItem.isVisible = false
-        }
-    }
-
     override fun onDestroy() {
         subscriptions?.dispose()
         socialRepository.close()
@@ -339,6 +320,8 @@ class NavigationDrawerFragment : DialogFragment() {
             items.add(HabiticaDrawerItem(R.id.statsFragment, SIDEBAR_STATS, context.getString(R.string.sidebar_stats)))
             items.add(HabiticaDrawerItem(R.id.achievementsFragment, SIDEBAR_ACHIEVEMENTS, context.getString(R.string.sidebar_achievements)))
 
+            items.add(HabiticaDrawerItem(0, SIDEBAR_TEAMS, context.getString(R.string.sidebar_teams), true))
+
             items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_shops), true))
             items.add(HabiticaDrawerItem(R.id.marketFragment, SIDEBAR_SHOPS_MARKET, context.getString(R.string.market)))
             items.add(HabiticaDrawerItem(R.id.questShopFragment, SIDEBAR_SHOPS_QUEST, context.getString(R.string.questShop)))
@@ -351,11 +334,11 @@ class NavigationDrawerFragment : DialogFragment() {
             items.add(HabiticaDrawerItem(R.id.stableFragment, SIDEBAR_STABLE, context.getString(R.string.sidebar_stable)))
             items.add(HabiticaDrawerItem(R.id.avatarOverviewFragment, SIDEBAR_AVATAR, context.getString(R.string.sidebar_avatar)))
             items.add(HabiticaDrawerItem(R.id.gemPurchaseActivity, SIDEBAR_GEMS, context.getString(R.string.sidebar_gems)))
-            items.add(HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION, context.getString(R.string.sidebar_subscription), isHeader = false))
+            items.add(HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION, context.getString(R.string.sidebar_subscription)))
 
             items.add(HabiticaDrawerItem(0, SIDEBAR_SOCIAL, context.getString(R.string.sidebar_section_social), true))
-            items.add(HabiticaDrawerItem(R.id.tavernFragment, SIDEBAR_TAVERN, context.getString(R.string.sidebar_tavern), isHeader = false))
             items.add(HabiticaDrawerItem(R.id.partyFragment, SIDEBAR_PARTY, context.getString(R.string.sidebar_party)))
+            items.add(HabiticaDrawerItem(R.id.tavernFragment, SIDEBAR_TAVERN, context.getString(R.string.sidebar_tavern)))
             items.add(HabiticaDrawerItem(R.id.guildsOverviewFragment, SIDEBAR_GUILDS, context.getString(R.string.sidebar_guilds)))
             items.add(HabiticaDrawerItem(R.id.challengesOverviewFragment, SIDEBAR_CHALLENGES, context.getString(R.string.sidebar_challenges)))
 
@@ -371,11 +354,7 @@ class NavigationDrawerFragment : DialogFragment() {
         promoItem.isVisible = false
         items.add(promoItem)
 
-        if (configManager.enableGiftOneGetOne()) {
-            val item = HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_G1G1_PROMO)
-            item.itemViewType = 3
-            items.add(item)
-        } else if (configManager.showSubscriptionBanner()) {
+        if (configManager.showSubscriptionBanner()) {
             val item = HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION_PROMO)
             item.itemViewType = 2
             items.add(item)
@@ -383,9 +362,10 @@ class NavigationDrawerFragment : DialogFragment() {
         adapter.updateItems(items)
     }
 
-    fun setSelection(transitionId: Int?, bundle: Bundle? = null, openSelection: Boolean = true) {
-        adapter.selectedItem = transitionId
+    fun setSelection(transitionId: Int?, bundle: Bundle? = null, openSelection: Boolean = true, preventReselection: Boolean = true) {
         closeDrawer()
+        if (adapter.selectedItem != null && adapter.selectedItem == transitionId && bundle == null && preventReselection) return
+        adapter.selectedItem = transitionId
 
         if (!openSelection) {
             return
@@ -426,16 +406,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() {
@@ -460,17 +440,15 @@ class NavigationDrawerFragment : DialogFragment() {
     }
 
     private fun setDisplayName(name: String?) {
-        if (toolbarTitle != null) {
-            if (name != null && name.isNotEmpty()) {
-                toolbarTitle.text = name
-            } else {
-                toolbarTitle.text = context?.getString(R.string.app_name)
-            }
+        if (name != null && name.isNotEmpty()) {
+            binding?.toolbarTitle?.text = name
+        } else {
+            binding?.toolbarTitle?.text = context?.getString(R.string.app_name)
         }
     }
 
     private fun setUsername(name: String?) {
-        usernameTextView.text = name
+        binding?.usernameTextView?.text = name
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -480,10 +458,10 @@ class NavigationDrawerFragment : DialogFragment() {
 
     private fun setNotificationsCount(unreadNotifications: Int) {
         if (unreadNotifications == 0) {
-            notificationsBadge.visibility = View.GONE
+            binding?.notificationsBadge?.visibility = View.GONE
         } else {
-            notificationsBadge.visibility = View.VISIBLE
-            notificationsBadge.text = unreadNotifications.toString()
+            binding?.notificationsBadge?.visibility = View.VISIBLE
+            binding?.notificationsBadge?.text = unreadNotifications.toString()
         }
     }
 
@@ -495,35 +473,60 @@ class NavigationDrawerFragment : DialogFragment() {
                 it.getThemeColor(R.attr.colorAccent)
             }
 
-            val bg = notificationsBadge.background as? GradientDrawable
+            val bg = binding?.notificationsBadge?.background as? GradientDrawable
             bg?.color = ColorStateList.valueOf(color)
+            binding?.notificationsBadge?.setTextColor(ContextCompat.getColor(it, R.color.white))
         }
     }
 
     private fun setMessagesCount(unreadMessages: Int) {
         if (unreadMessages == 0) {
-            messagesBadge.visibility = View.GONE
+            binding?.messagesBadge?.visibility = View.GONE
         } else {
-            messagesBadge.visibility = View.VISIBLE
-            messagesBadge.text = unreadMessages.toString()
+            binding?.messagesBadge?.visibility = View.VISIBLE
+            binding?.messagesBadge?.text = unreadMessages.toString()
         }
     }
 
     private fun setSettingsCount(count: Int) {
         if (count == 0) {
-            settingsBadge.visibility = View.GONE
+            binding?.settingsBadge?.visibility = View.GONE
         } else {
-            settingsBadge.visibility = View.VISIBLE
-            settingsBadge.text = count.toString()
+            binding?.settingsBadge?.visibility = View.VISIBLE
+            binding?.settingsBadge?.text = count.toString()
         }
     }
 
+    fun updatePromo() {
+        activePromo = context?.let { configManager.activePromo(it) }
+        val promoItem = getItemWithIdentifier(SIDEBAR_PROMO) ?: return
+        if (activePromo != null) {
+            promoItem.isVisible = true
+            adapter.activePromo = activePromo
+
+            var promotedItem: HabiticaDrawerItem? = null
+            if (activePromo?.promoType == PromoType.GEMS_AMOUNT || activePromo?.promoType == PromoType.GEMS_PRICE) {
+                promotedItem = getItemWithIdentifier(SIDEBAR_GEMS)
+            }
+            if (activePromo?.promoType == PromoType.SUBSCRIPTION) {
+                promotedItem = getItemWithIdentifier(SIDEBAR_SUBSCRIPTION)
+            }
+            promotedItem?.pillText = context?.getString(R.string.sale)
+            promotedItem?.pillBackground = context?.let { activePromo?.pillBackgroundDrawable(it) }
+            promotedItem?.let { updateItem(it) }
+        } else {
+            promoItem.isVisible = false
+        }
+        updateItem(promoItem)
+    }
+
     companion object {
 
         const val SIDEBAR_TASKS = "tasks"
         const val SIDEBAR_SKILLS = "skills"
         const val SIDEBAR_STATS = "stats"
         const val SIDEBAR_ACHIEVEMENTS = "achievements"
+        const val SIDEBAR_TEAMS = "teams"
         const val SIDEBAR_SOCIAL = "social"
         const val SIDEBAR_TAVERN = "tavern"
         const val SIDEBAR_PARTY = "party"
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..55e58fec6 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
@@ -9,30 +9,33 @@ import android.webkit.WebChromeClient
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentNewsBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_news.*
 
 
-class NewsFragment : BaseMainFragment() {
+class NewsFragment : BaseMainFragment<FragmentNewsBinding>() {
+
+    override var binding: FragmentNewsBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentNewsBinding {
+        return FragmentNewsBinding.inflate(inflater, container, false)
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_news)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     @SuppressLint("SetJavaScriptEnabled")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val address = if (BuildConfig.DEBUG) BuildConfig.BASE_URL else context?.getString(R.string.base_url)
-        val webSettings = newsWebview.settings
-        webSettings.javaScriptEnabled = true
-        webSettings.domStorageEnabled = true
-        newsWebview.webChromeClient = object : WebChromeClient() {
+        val webSettings = binding?.newsWebview?.settings
+        webSettings?.javaScriptEnabled = true
+        webSettings?.domStorageEnabled = true
+        binding?.newsWebview?.webChromeClient = object : WebChromeClient() {
         }
-        newsWebview.loadUrl("$address/static/new-stuff")
+        binding?.newsWebview?.loadUrl("$address/static/new-stuff")
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -41,6 +44,6 @@ class NewsFragment : BaseMainFragment() {
 
     override fun onResume() {
         super.onResume()
-        compositeSubscription.add(userRepository.updateUser(user, "flags.newStuff", false).subscribeWithErrorHandler(Consumer {}))
+        compositeSubscription.add(userRepository.updateUser("flags.newStuff", false).subscribeWithErrorHandler({}))
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
index 1786f7e3d..b3524874e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
@@ -4,15 +4,18 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentPromoInfoBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import javax.inject.Inject
 
-class PromoInfoFragment : BaseMainFragment() {
+class PromoInfoFragment : BaseMainFragment<FragmentPromoInfoBinding>() {
 
-    internal lateinit var binding: FragmentPromoInfoBinding
+    override var binding: FragmentPromoInfoBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentPromoInfoBinding {
+        return FragmentPromoInfoBinding.inflate(inflater, container, false)
+    }
 
     @Inject
     lateinit var configManager: AppConfigManager
@@ -23,14 +26,17 @@ class PromoInfoFragment : BaseMainFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentPromoInfoBinding.inflate(inflater, container, false)
-        return binding.root
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val promo = configManager.activePromo()
+        val promo = context?.let { configManager.activePromo(it) }
         promo?.configureInfoFragment(this)
     }
+
+    override fun onResume() {
+        super.onResume()
+        activity?.title = ""
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index 130b7debf..b5e55a0fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentStatsBinding
+
 import com.habitrpg.android.habitica.extensions.addOkButton
 import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.setScaledPadding
@@ -21,16 +22,21 @@ import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.stats.BulkAllocateStatsDialog
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Named
 import kotlin.math.min
 
 
-class StatsFragment: BaseMainFragment() {
+class StatsFragment: BaseMainFragment<FragmentStatsBinding>() {
+
+    override var binding: FragmentStatsBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentStatsBinding {
+        return FragmentStatsBinding.inflate(inflater, container, false)
+    }
 
-    private lateinit var binding: FragmentStatsBinding
     private var canAllocatePoints: Boolean = false
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
@@ -41,31 +47,29 @@ class StatsFragment: BaseMainFragment() {
     private var totalStrength = 0
         set(value) {
             field = value
-            binding.strengthStatsView.totalValue = value
+            binding?.strengthStatsView?.totalValue = value
         }
     private var totalIntelligence = 0
         set(value) {
             field = value
-            binding.intelligenceStatsView.totalValue = value
+            binding?.intelligenceStatsView?.totalValue = value
         }
     private var totalConstitution = 0
         set(value) {
             field = value
-            binding.constitutionStatsView.totalValue = value
+            binding?.constitutionStatsView?.totalValue = value
         }
     private var totalPerception = 0
         set(value) {
             field = value
-            binding.perceptionStatsView.totalValue = value
+            binding?.perceptionStatsView?.totalValue = value
         }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         tutorialStepIdentifier = "stats"
         tutorialText = getString(R.string.tutorial_stats)
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentStatsBinding.inflate(inflater, container, false)
-        return binding.root
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onDestroy() {
@@ -76,52 +80,52 @@ class StatsFragment: BaseMainFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.leftSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesLeft())
-        binding.rightSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesRight())
+        binding?.leftSparklesView?.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesLeft())
+        binding?.rightSparklesView?.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesRight())
         context?.let {
             val color = it.getThemeColor(R.attr.colorPrimaryOffset)
-            binding.distributeEvenlyHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
-            binding. distributeClassHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
-            binding.distributeTaskHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
+            binding?.distributeEvenlyHelpButton?.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
+            binding?. distributeClassHelpButton?.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
+            binding?.distributeTaskHelpButton?.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
         }
 
-        compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribe({ user ->
             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)
-            updateAttributePoints(it)
+            binding?.unlockAtLevel?.visibility = if (user.stats?.lvl ?: 0 < 10) View.VISIBLE else View.GONE
+            updateStats(user)
+            updateAttributePoints(user)
         }, RxErrorHandler.handleEmptyError()))
 
-        binding.distributeEvenlyButton.setOnCheckedChangeListener { _, isChecked ->
+        binding?.distributeEvenlyButton?.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 changeAutoAllocationMode(Stats.AUTO_ALLOCATE_FLAT)
             }
         }
-        binding.distributeClassButton.setOnCheckedChangeListener { _, isChecked ->
+        binding?.distributeClassButton?.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 changeAutoAllocationMode(Stats.AUTO_ALLOCATE_CLASSBASED)
             }
         }
-        binding.distributeTaskButton.setOnCheckedChangeListener { _, isChecked ->
+        binding?.distributeTaskButton?.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 changeAutoAllocationMode(Stats.AUTO_ALLOCATE_TASKBASED)
             }
         }
 
-        binding.automaticAllocationSwitch.setOnCheckedChangeListener{ _, isChecked ->
-            userRepository.updateUser(user, "preferences.automaticAllocation", isChecked).subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+        binding?.automaticAllocationSwitch?.setOnCheckedChangeListener{ _, isChecked ->
+            userRepository.updateUser("preferences.automaticAllocation", isChecked).subscribe({}, RxErrorHandler.handleEmptyError())
         }
 
-        binding.strengthStatsView.allocateAction = { allocatePoint(Stats.STRENGTH) }
-        binding.intelligenceStatsView.allocateAction = { allocatePoint(Stats.INTELLIGENCE) }
-        binding.constitutionStatsView.allocateAction = { allocatePoint(Stats.CONSTITUTION) }
-        binding.perceptionStatsView.allocateAction = { allocatePoint(Stats.PERCEPTION) }
+        binding?.strengthStatsView?.allocateAction = { allocatePoint(Stats.STRENGTH) }
+        binding?.intelligenceStatsView?.allocateAction = { allocatePoint(Stats.INTELLIGENCE) }
+        binding?.constitutionStatsView?.allocateAction = { allocatePoint(Stats.CONSTITUTION) }
+        binding?.perceptionStatsView?.allocateAction = { allocatePoint(Stats.PERCEPTION) }
 
-        binding.distributeEvenlyHelpButton.setOnClickListener { showHelpAlert(R.string.distribute_evenly_help) }
-        binding.distributeClassHelpButton.setOnClickListener { showHelpAlert(R.string.distribute_class_help) }
-        binding.distributeTaskHelpButton.setOnClickListener { showHelpAlert(R.string.distribute_task_help) }
+        binding?.distributeEvenlyHelpButton?.setOnClickListener { showHelpAlert(R.string.distribute_evenly_help) }
+        binding?.distributeClassHelpButton?.setOnClickListener { showHelpAlert(R.string.distribute_class_help) }
+        binding?.distributeTaskHelpButton?.setOnClickListener { showHelpAlert(R.string.distribute_task_help) }
 
-        binding.statsAllocationButton.setOnClickListener {
+        binding?.statsAllocationButton?.setOnClickListener {
             if (canAllocatePoints) {
                 showBulkAllocateDialog()
             }
@@ -136,10 +140,10 @@ class StatsFragment: BaseMainFragment() {
     }
 
     private fun changeAutoAllocationMode(allocationMode: String) {
-        compositeSubscription.add(userRepository.updateUser(user, "preferences.allocationMode", allocationMode).subscribe(Consumer {}, 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
+        compositeSubscription.add(userRepository.updateUser("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,86 +155,86 @@ class StatsFragment: BaseMainFragment() {
     }
 
     private fun allocatePoint(stat: String) {
-        compositeSubscription.add(userRepository.allocatePoint(user, stat).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.allocatePoint(stat).subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun updateAttributePoints(user: User) {
         val automaticAllocation = user.preferences?.automaticAllocation ?: false
-        binding.automaticAllocationSwitch.isChecked = automaticAllocation
-        binding.autoAllocationModeWrapper.visibility = if (automaticAllocation) View.VISIBLE else View.GONE
+        binding?.automaticAllocationSwitch?.isChecked = automaticAllocation
+        binding?.autoAllocationModeWrapper?.visibility = if (automaticAllocation) View.VISIBLE else View.GONE
 
         val allocationMode = user.preferences?.allocationMode ?: ""
-        binding.distributeEvenlyButton.isChecked = allocationMode == Stats.AUTO_ALLOCATE_FLAT
-        binding.distributeClassButton.isChecked = allocationMode == Stats.AUTO_ALLOCATE_CLASSBASED
-        binding.distributeTaskButton.isChecked = allocationMode == Stats.AUTO_ALLOCATE_TASKBASED
+        binding?.distributeEvenlyButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_FLAT
+        binding?.distributeClassButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_CLASSBASED
+        binding?.distributeTaskButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_TASKBASED
 
         val canDistributePoints = 0 < (user.stats?.points ?: 0) && 10 <= (user.stats?.lvl ?: 0)
         if (10 <= (user.stats?.lvl ?: 0)) {
-            binding.automaticAllocationSwitch.visibility = View.VISIBLE
-            binding.automaticAllocationSwitch.visibility = View.VISIBLE
+            binding?.automaticAllocationSwitch?.visibility = View.VISIBLE
+            binding?.automaticAllocationSwitch?.visibility = View.VISIBLE
         } else {
-            binding.automaticAllocationSwitch.visibility = View.GONE
-            binding.automaticAllocationSwitch.visibility = View.GONE
+            binding?.automaticAllocationSwitch?.visibility = View.GONE
+            binding?.automaticAllocationSwitch?.visibility = View.GONE
         }
-        binding.strengthStatsView.canDistributePoints = canDistributePoints
-        binding.intelligenceStatsView.canDistributePoints = canDistributePoints
-        binding.constitutionStatsView.canDistributePoints = canDistributePoints
-        binding.perceptionStatsView.canDistributePoints = canDistributePoints
+        binding?.strengthStatsView?.canDistributePoints = canDistributePoints
+        binding?.intelligenceStatsView?.canDistributePoints = canDistributePoints
+        binding?.constitutionStatsView?.canDistributePoints = canDistributePoints
+        binding?.perceptionStatsView?.canDistributePoints = canDistributePoints
         context?.let { context ->
             if (canDistributePoints) {
                 val points = user.stats?.points ?: 0
-                binding.numberOfPointsTextView.text = getString(R.string.points_to_allocate, points)
-                binding.numberOfPointsTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
-                binding.numberOfPointsTextView.background = ContextCompat.getDrawable(context, R.drawable.button_gray_100)
-                binding.leftSparklesView.visibility = View.VISIBLE
-                binding.rightSparklesView.visibility = View.VISIBLE
+                binding?.numberOfPointsTextView?.text = getString(R.string.points_to_allocate, points)
+                binding?.numberOfPointsTextView?.setTextColor(ContextCompat.getColor(context, R.color.white))
+                binding?.numberOfPointsTextView?.background = ContextCompat.getDrawable(context, R.drawable.button_gray_100)
+                binding?.leftSparklesView?.visibility = View.VISIBLE
+                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.setBackgroundColor(ContextCompat.getColor(context, R.color.transparent))
-                binding.leftSparklesView.visibility = View.GONE
-                binding.rightSparklesView.visibility = View.GONE
+                binding?.numberOfPointsTextView?.text = getString(R.string.no_points_to_allocate)
+                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
             }
         }
-        binding.numberOfPointsTextView.setScaledPadding(context, 18, 4, 18, 4)
+        binding?.numberOfPointsTextView?.setScaledPadding(context, 18, 4, 18, 4)
     }
 
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
 
-    private fun updateStats(currentUser: User) {
-        val levelStat = min((currentUser.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
+    private fun updateStats(user: User) {
+        val levelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
 
         totalStrength = levelStat
         totalIntelligence = levelStat
         totalConstitution = levelStat
         totalPerception = levelStat
 
-        binding.strengthStatsView.levelValue = levelStat
-        binding.intelligenceStatsView.levelValue = levelStat
-        binding.constitutionStatsView.levelValue = levelStat
-        binding.perceptionStatsView.levelValue = levelStat
+        binding?.strengthStatsView?.levelValue = levelStat
+        binding?.intelligenceStatsView?.levelValue = levelStat
+        binding?.constitutionStatsView?.levelValue = levelStat
+        binding?.perceptionStatsView?.levelValue = levelStat
 
-        totalStrength += currentUser.stats?.buffs?.getStr()?.toInt() ?: 0
-        totalIntelligence += currentUser.stats?.buffs?.get_int()?.toInt() ?: 0
-        totalConstitution += currentUser.stats?.buffs?.getCon()?.toInt() ?: 0
-        totalPerception += currentUser.stats?.buffs?.getPer()?.toInt() ?: 0
-        binding.strengthStatsView.buffValue = currentUser.stats?.buffs?.getStr()?.toInt() ?: 0
-        binding.intelligenceStatsView.buffValue = currentUser.stats?.buffs?.get_int()?.toInt() ?: 0
-        binding.constitutionStatsView.buffValue = currentUser.stats?.buffs?.getCon()?.toInt() ?: 0
-        binding.perceptionStatsView.buffValue = currentUser.stats?.buffs?.getPer()?.toInt() ?: 0
+        totalStrength += user.stats?.buffs?.str?.toInt() ?: 0
+        totalIntelligence += user.stats?.buffs?._int?.toInt() ?: 0
+        totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0
+        totalPerception += user.stats?.buffs?.per?.toInt() ?: 0
+        binding?.strengthStatsView?.buffValue = user.stats?.buffs?.str?.toInt() ?: 0
+        binding?.intelligenceStatsView?.buffValue = user.stats?.buffs?._int?.toInt() ?: 0
+        binding?.constitutionStatsView?.buffValue = user.stats?.buffs?.con?.toInt() ?: 0
+        binding?.perceptionStatsView?.buffValue = user.stats?.buffs?.per?.toInt() ?: 0
 
-        totalStrength += currentUser.stats?.strength ?: 0
-        totalIntelligence += currentUser.stats?.intelligence ?: 0
-        totalConstitution += currentUser.stats?.constitution ?: 0
-        totalPerception += currentUser.stats?.per ?: 0
-        binding.strengthStatsView.allocatedValue = currentUser.stats?.strength ?: 0
-        binding.intelligenceStatsView.allocatedValue = currentUser.stats?.intelligence ?: 0
-        binding.constitutionStatsView.allocatedValue = currentUser.stats?.constitution ?: 0
-        binding.perceptionStatsView.allocatedValue = currentUser.stats?.per ?: 0
+        totalStrength += user.stats?.strength ?: 0
+        totalIntelligence += user.stats?.intelligence ?: 0
+        totalConstitution += user.stats?.constitution ?: 0
+        totalPerception += user.stats?.per ?: 0
+        binding?.strengthStatsView?.allocatedValue = user.stats?.strength ?: 0
+        binding?.intelligenceStatsView?.allocatedValue = user.stats?.intelligence ?: 0
+        binding?.constitutionStatsView?.allocatedValue = user.stats?.constitution ?: 0
+        binding?.perceptionStatsView?.allocatedValue = user.stats?.per ?: 0
 
-        val outfit = currentUser.items?.gear?.equipped
+        val outfit = user.items?.gear?.equipped
         val outfitList = ArrayList<String>()
         outfit?.let { thisOutfit ->
             outfitList.add(thisOutfit.armor)
@@ -268,10 +272,10 @@ class StatsFragment: BaseMainFragment() {
             totalIntelligence += intelligence
             totalConstitution += constitution
             totalPerception += perception
-                    binding.strengthStatsView.equipmentValue = strength
-                    binding.intelligenceStatsView.equipmentValue = intelligence
-                    binding.constitutionStatsView.equipmentValue = constitution
-                    binding.perceptionStatsView.equipmentValue = perception
+                    binding?.strengthStatsView?.equipmentValue = strength
+                    binding?.intelligenceStatsView?.equipmentValue = intelligence
+                    binding?.constitutionStatsView?.equipmentValue = constitution
+                    binding?.perceptionStatsView?.equipmentValue = perception
 
         }, RxErrorHandler.handleEmptyError()))
     }
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..68170e97c 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
@@ -9,22 +9,24 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.CustomizationRepository
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.inventory.Customization
-import com.habitrpg.android.habitica.models.responses.UnlockResponse
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.CustomizationRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
-import io.realm.RealmResults
-import kotlinx.android.synthetic.main.fragment_recyclerview.*
+import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
 
-class AvatarCustomizationFragment : BaseMainFragment() {
+class AvatarCustomizationFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
+
+    override var binding: FragmentRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
 
     @Inject
     lateinit var customizationRepository: CustomizationRepository
@@ -40,41 +42,34 @@ class AvatarCustomizationFragment : BaseMainFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        val view = inflater.inflate(R.layout.fragment_recyclerview, container, false)
-
+        showsBackButton = true
         compositeSubscription.add(adapter.getSelectCustomizationEvents()
                 .flatMap { customization ->
-                    userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
+                    if (customization.type == "background") {
+                        userRepository.unlockPath(user, customization)
+                                .flatMap { userRepository.retrieveUser(false, true, true) }
+                    } else {
+                        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
-                    if (user != null) {
                     userRepository.unlockPath(user, customization)
-                    } else {
-                        Flowable.empty()
-                    }
                 }
                 .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
-                    if (user != null) {
-                        userRepository.unlockPath(user, set)
-                    } else {
-                        Flowable.empty()
-                    }
+                    userRepository.unlockPath(set)
                  }
                 .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
                 .flatMap { inventoryRepository.retrieveInAppRewards() }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
 
 
-        return view
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -86,6 +81,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
                 category = args.category
             }
         }
+        adapter.customizationType = type
 
         val layoutManager = GridLayoutManager(activity, 4)
         layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
@@ -98,17 +94,17 @@ class AvatarCustomizationFragment : BaseMainFragment() {
             }
         }
         setGridSpanCount(view.width)
-        recyclerView.layoutManager = layoutManager
+        binding?.recyclerView?.layoutManager = layoutManager
 
-        recyclerView.addItemDecoration(MarginDecoration(context))
+        binding?.recyclerView?.addItemDecoration(MarginDecoration(context))
 
-        recyclerView.adapter = adapter
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        binding?.recyclerView?.adapter = adapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
         this.loadCustomizations()
 
-        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler {
             updateUser(it)
-        }))
+        })
     }
 
     override fun onDestroy() {
@@ -122,10 +118,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()))
         }
     }
 
@@ -157,11 +153,12 @@ class AvatarCustomizationFragment : BaseMainFragment() {
         if (this.type == null || user.preferences == null) {
             return
         }
-        val prefs = this.user?.preferences
+        val prefs = user.preferences
         val activeCustomization = when (this.type) {
             "skin" -> prefs?.skin
             "shirt" -> prefs?.shirt
             "background" -> prefs?.background
+            "chair" -> prefs?.chair
             "hair" -> when (this.category) {
                 "bangs" -> prefs?.hair?.bangs.toString()
                 "base" -> prefs?.hair?.base.toString()
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..5d427ead7 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
@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.responses.UnlockResponse
@@ -16,16 +17,20 @@ import com.habitrpg.android.habitica.ui.adapter.CustomizationEquipmentRecyclerVi
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_recyclerview.*
+import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
 
-class AvatarEquipmentFragment : BaseMainFragment() {
+class AvatarEquipmentFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
 
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
+    override var binding: FragmentRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
     var type: String? = null
     var category: String? = null
     private var activeEquipment: String? = null
@@ -35,31 +40,24 @@ class AvatarEquipmentFragment : BaseMainFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        val view = inflater.inflate(R.layout.fragment_recyclerview, container, false)
-
+        showsBackButton = true
         compositeSubscription.add(adapter.getSelectCustomizationEvents()
                 .flatMap { equipment ->
                     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
-                    if (user != null) {
-                        userRepository.unlockPath(user, set)
-                    } else {
-                        Flowable.empty()
-                    }
+                .flatMap { set ->
+                    userRepository.unlockPath(set)
                 }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
-        return view
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -84,16 +82,16 @@ class AvatarEquipmentFragment : BaseMainFragment() {
                 }
             }
         }
-        recyclerView.layoutManager = layoutManager
-        recyclerView.addItemDecoration(MarginDecoration(context))
+        binding?.recyclerView?.layoutManager = layoutManager
+        binding?.recyclerView?.addItemDecoration(MarginDecoration(context))
 
-        recyclerView.adapter = adapter
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        binding?.recyclerView?.adapter = adapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
         this.loadEquipment()
 
-        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer {
+        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler {
             updateUser(it)
-        }))
+        })
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -102,9 +100,9 @@ class AvatarEquipmentFragment : BaseMainFragment() {
 
     private fun loadEquipment() {
         val type = this.type ?: return
-        inventoryRepository.getEquipmentType(type, category ?: "").subscribe(Consumer {
+        compositeSubscription.add(inventoryRepository.getEquipmentType(type, category ?: "").subscribe({
             adapter.setEquipment(it)
-        }, RxErrorHandler.handleEmptyError())
+        }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun setGridSpanCount(width: Int) {
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..dc100c63c 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
@@ -12,42 +12,37 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import io.reactivex.functions.Consumer
 
-class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedListener {
+class AvatarOverviewFragment : BaseMainFragment<FragmentAvatarOverviewBinding>(), AdapterView.OnItemSelectedListener {
 
-    private lateinit var binding: FragmentAvatarOverviewBinding
+    override var binding: FragmentAvatarOverviewBinding? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentAvatarOverviewBinding.inflate(inflater, container, false)
-        return binding.root
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentAvatarOverviewBinding {
+        return FragmentAvatarOverviewBinding.inflate(inflater, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        showsBackButton = true
         super.onViewCreated(view, savedInstanceState)
-        binding.avatarSizeSpinner.onItemSelectedListener = this
+        binding?.avatarSizeSpinner?.onItemSelectedListener = this
 
-        binding.avatarShirtView.setOnClickListener { displayCustomizationFragment("shirt", null) }
-        binding.avatarSkinView.setOnClickListener { displayCustomizationFragment("skin", null) }
-        binding.avatarChairView.setOnClickListener { displayCustomizationFragment("chair", null) }
-        binding.avatarGlassesView.setOnClickListener { displayEquipmentFragment("eyewear", "glasses") }
-        binding.avatarAnimalEarsView.setOnClickListener { displayEquipmentFragment("headAccessory", "animal") }
-        binding.avatarAnimalTailView.setOnClickListener { displayEquipmentFragment("back", "animal") }
-        binding.avatarHeadbandView.setOnClickListener { displayEquipmentFragment("headAccessory", "headband") }
-        binding.avatarHairColorView.setOnClickListener { displayCustomizationFragment("hair", "color") }
-        binding.avatarHairBangsView.setOnClickListener { displayCustomizationFragment("hair", "bangs") }
-        binding.avatarHairBaseView.setOnClickListener { displayCustomizationFragment("hair", "base") }
-        binding.avatarAccentView.setOnClickListener { displayCustomizationFragment("hair", "flower") }
-        binding.avatarHairBeardView.setOnClickListener { displayCustomizationFragment("hair", "beard") }
-        binding.avatarHairMustacheView.setOnClickListener { displayCustomizationFragment("hair", "mustache") }
-        binding.avatarBackgroundView.setOnClickListener { displayCustomizationFragment("background", null) }
+        binding?.avatarShirtView?.setOnClickListener { displayCustomizationFragment("shirt", null) }
+        binding?.avatarSkinView?.setOnClickListener { displayCustomizationFragment("skin", null) }
+        binding?.avatarChairView?.setOnClickListener { displayCustomizationFragment("chair", null) }
+        binding?.avatarGlassesView?.setOnClickListener { displayEquipmentFragment("eyewear", "glasses") }
+        binding?.avatarAnimalEarsView?.setOnClickListener { displayEquipmentFragment("headAccessory", "animal") }
+        binding?.avatarAnimalTailView?.setOnClickListener { displayEquipmentFragment("back", "animal") }
+        binding?.avatarHeadbandView?.setOnClickListener { displayEquipmentFragment("headAccessory", "headband") }
+        binding?.avatarHairColorView?.setOnClickListener { displayCustomizationFragment("hair", "color") }
+        binding?.avatarHairBangsView?.setOnClickListener { displayCustomizationFragment("hair", "bangs") }
+        binding?.avatarHairBaseView?.setOnClickListener { displayCustomizationFragment("hair", "base") }
+        binding?.avatarAccentView?.setOnClickListener { displayCustomizationFragment("hair", "flower") }
+        binding?.avatarHairBeardView?.setOnClickListener { displayCustomizationFragment("hair", "beard") }
+        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)
-        }))
+        })
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -68,21 +63,21 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
     }
 
     private fun setCustomizations(user: User) {
-        binding.avatarShirtView.customizationIdentifier = user.preferences?.size + "_shirt_" + user.preferences?.shirt
-        binding.avatarSkinView.customizationIdentifier = "skin_" + user.preferences?.skin
+        binding?.avatarShirtView?.customizationIdentifier = user.preferences?.size + "_shirt_" + user.preferences?.shirt
+        binding?.avatarSkinView?.customizationIdentifier = "skin_" + user.preferences?.skin
         val chair = user.preferences?.chair
-        binding.avatarChairView.customizationIdentifier = if (chair?.startsWith("handleless") == true) "chair_$chair" else chair
-        binding.avatarGlassesView.equipmentIdentifier = user.equipped?.eyeWear
-        binding.avatarAnimalEarsView.equipmentIdentifier = user.equipped?.headAccessory
-        binding.avatarHeadbandView.equipmentIdentifier = user.equipped?.headAccessory
-        binding.avatarAnimalTailView.equipmentIdentifier = user.equipped?.back
-        binding.avatarHairColorView.customizationIdentifier = if (user.preferences?.hair?.color != null && user.preferences?.hair?.color != "") "hair_bangs_1_" + user.preferences?.hair?.color else ""
-        binding.avatarHairBangsView.customizationIdentifier = if (user.preferences?.hair?.bangs != null && user.preferences?.hair?.bangs != 0) "hair_bangs_" + user.preferences?.hair?.bangs + "_" + user.preferences?.hair?.color else ""
-        binding.avatarHairBaseView.customizationIdentifier = if (user.preferences?.hair?.base != null && user.preferences?.hair?.base != 0) "hair_base_" + user.preferences?.hair?.base + "_" + user.preferences?.hair?.color else ""
-        binding.avatarAccentView.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
-        binding.avatarHairBeardView.customizationIdentifier = if (user.preferences?.hair?.beard != null && user.preferences?.hair?.beard != 0) "hair_beard_" + user.preferences?.hair?.beard + "_" + user.preferences?.hair?.color else ""
-        binding.avatarHairMustacheView.customizationIdentifier = if (user.preferences?.hair?.mustache != null && user.preferences?.hair?.mustache != 0) "hair_mustache_" + user.preferences?.hair?.mustache + "_" + user.preferences?.hair?.color else ""
-        binding.avatarBackgroundView.customizationIdentifier = "background_" + user.preferences?.background
+        binding?.avatarChairView?.customizationIdentifier = if (chair?.startsWith("handleless") == true) "chair_$chair" else chair
+        binding?.avatarGlassesView?.equipmentIdentifier = user.equipped?.eyeWear
+        binding?.avatarAnimalEarsView?.equipmentIdentifier = user.equipped?.headAccessory
+        binding?.avatarHeadbandView?.equipmentIdentifier = user.equipped?.headAccessory
+        binding?.avatarAnimalTailView?.equipmentIdentifier = user.equipped?.back
+        binding?.avatarHairColorView?.customizationIdentifier = if (user.preferences?.hair?.color != null && user.preferences?.hair?.color != "") "hair_bangs_1_" + user.preferences?.hair?.color else ""
+        binding?.avatarHairBangsView?.customizationIdentifier = if (user.preferences?.hair?.bangs != null && user.preferences?.hair?.bangs != 0) "hair_bangs_" + user.preferences?.hair?.bangs + "_" + user.preferences?.hair?.color else ""
+        binding?.avatarHairBaseView?.customizationIdentifier = if (user.preferences?.hair?.base != null && user.preferences?.hair?.base != 0) "hair_base_" + user.preferences?.hair?.base + "_" + user.preferences?.hair?.color else ""
+        binding?.avatarAccentView?.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
+        binding?.avatarHairBeardView?.customizationIdentifier = if (user.preferences?.hair?.beard != null && user.preferences?.hair?.beard != 0) "hair_beard_" + user.preferences?.hair?.beard + "_" + user.preferences?.hair?.color else ""
+        binding?.avatarHairMustacheView?.customizationIdentifier = if (user.preferences?.hair?.mustache != null && user.preferences?.hair?.mustache != 0) "hair_mustache_" + user.preferences?.hair?.mustache + "_" + user.preferences?.hair?.color else ""
+        binding?.avatarBackgroundView?.customizationIdentifier = "background_" + user.preferences?.background
     }
 
     private fun setSize(size: String?) {
@@ -90,19 +85,17 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
             return
         }
         if (size == "slim") {
-            binding.avatarSizeSpinner.setSelection(0, false)
+            binding?.avatarSizeSpinner?.setSelection(0, false)
         } else {
-            binding.avatarSizeSpinner.setSelection(1, false)
+            binding?.avatarSizeSpinner?.setSelection(1, false)
         }
     }
 
-    override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+    override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
         val newSize: String = if (position == 0) "slim" else "broad"
 
-        if (this.user?.isValid == true && this.user?.preferences?.size != newSize) {
-            compositeSubscription.add(userRepository.updateUser(user, "preferences.size", newSize)
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
-        }
+        compositeSubscription.add(userRepository.updateUser("preferences.size", newSize)
+                    .subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onNothingSelected(parent: AdapterView<*>) { /* no-on */ }
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..7fc8d1244 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
@@ -1,48 +1,42 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.equipment
 
 import android.os.Bundle
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragmentArgs
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import io.reactivex.functions.Consumer
-import io.realm.RealmResults
-import kotlinx.android.synthetic.main.fragment_recyclerview.*
 import javax.inject.Inject
 
-class EquipmentDetailFragment : BaseMainFragment() {
+class EquipmentDetailFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
 
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
+    override var binding: FragmentRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
     var type: String? = null
     var equippedGear: String? = null
     var isCostume: Boolean? = null
 
-    private var adapter: EquipmentRecyclerViewAdapter = EquipmentRecyclerViewAdapter(null, true)
+    private var adapter: EquipmentRecyclerViewAdapter = EquipmentRecyclerViewAdapter()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        val v = inflater.inflate(R.layout.fragment_recyclerview, container, false)
-
-        this.adapter.equippedGear = this.equippedGear
-        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()))
-        return v
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -56,12 +50,16 @@ class EquipmentDetailFragment : BaseMainFragment() {
             equippedGear = args.equippedGear
         }
 
-        recyclerView.adapter = this.adapter
-        recyclerView.layoutManager = LinearLayoutManager(activity)
-        recyclerView.addItemDecoration(DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL))
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        this.adapter.equippedGear = this.equippedGear
+        this.adapter.isCostume = this.isCostume
+        this.adapter.type = this.type
 
-        type?.let { type -> inventoryRepository.getOwnedEquipment(type).firstElement().subscribe(Consumer<RealmResults<Equipment>> { this.adapter.updateData(it) }, RxErrorHandler.handleEmptyError()) }
+        binding?.recyclerView?.adapter = this.adapter
+        binding?.recyclerView?.layoutManager = LinearLayoutManager(activity)
+        binding?.recyclerView?.addItemDecoration(DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL))
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+
+        type?.let { type -> inventoryRepository.getOwnedEquipment(type).subscribe({ this.adapter.data = 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..c9671b890 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
@@ -12,27 +12,24 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.Gear
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
-class EquipmentOverviewFragment : BaseMainFragment() {
+class EquipmentOverviewFragment : BaseMainFragment<FragmentEquipmentOverviewBinding>() {
+
+    override var binding: FragmentEquipmentOverviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentEquipmentOverviewBinding {
+        return FragmentEquipmentOverviewBinding.inflate(inflater, container, false)
+    }
 
-    private lateinit var binding: FragmentEquipmentOverviewBinding
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentEquipmentOverviewBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
     override var user: User?
         get() = super.user
         set(value) {
             super.user = value
-            if (this::binding.isInitialized) {
+            if (this::inventoryRepository.isInitialized) {
                 value?.items?.gear?.let {
                     updateGearData(it)
                 }
@@ -42,18 +39,18 @@ class EquipmentOverviewFragment : BaseMainFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.battlegearView.onNavigate = { type, equipped ->
+        binding?.battlegearView?.onNavigate = { type, equipped ->
             displayEquipmentDetailList(type, equipped, false)
         }
-        binding.costumeView.onNavigate = { type, equipped ->
+        binding?.costumeView?.onNavigate = { type, equipped ->
             displayEquipmentDetailList(type, equipped, true)
         }
 
-        binding.autoEquipSwitch.isChecked = user?.preferences?.autoEquip ?: false
-        binding.costumeSwitch.isChecked = user?.preferences?.costume ?: false
+        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("preferences.autoEquip", isChecked).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+        binding?.costumeSwitch?.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser("preferences.costume", isChecked).subscribe({ }, RxErrorHandler.handleEmptyError()) }
 
         user?.items?.gear?.let {
             updateGearData(it)
@@ -76,19 +73,19 @@ class EquipmentOverviewFragment : BaseMainFragment() {
     private fun updateGearData(gear: Gear) {
         if (gear.equipped?.weapon?.isNotEmpty() == true) {
             compositeSubscription.add(inventoryRepository.getEquipment(gear.equipped?.weapon ?: "").firstElement()
-                    .subscribe(Consumer {
-                        binding.battlegearView.updateData(gear.equipped, it.twoHanded)
+                    .subscribe({
+                        binding?.battlegearView?.updateData(gear.equipped, it.twoHanded)
                     }, RxErrorHandler.handleEmptyError()))
         } else {
-            binding.battlegearView.updateData(gear.equipped)
+            binding?.battlegearView?.updateData(gear.equipped)
         }
         if (gear.costume?.weapon?.isNotEmpty() == true) {
             compositeSubscription.add(inventoryRepository.getEquipment(gear.costume?.weapon ?: "").firstElement()
-                    .subscribe(Consumer {
-                        binding.costumeView.updateData(gear.costume, it.twoHanded)
+                    .subscribe({
+                        binding?.costumeView?.updateData(gear.costume, it.twoHanded)
                     }, RxErrorHandler.handleEmptyError()))
         } else {
-            binding.costumeView.updateData(gear.costume)
+            binding?.costumeView?.updateData(gear.costume)
         }
     }
 }
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..850f6d995 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
@@ -6,13 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
-import android.widget.Button
-import android.widget.TextView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentItemsBinding
+import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -22,26 +23,21 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.*
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import io.reactivex.functions.Consumer
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
 import javax.inject.Inject
 
-class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var inventoryRepository: InventoryRepository
     @Inject
+    lateinit var socialRepository: SocialRepository
+    @Inject
     lateinit var userRepository: UserRepository
-    val refreshLayout: SwipeRefreshLayout? by bindView(R.id.refreshLayout)
-    val recyclerView: RecyclerViewEmptySupport? by bindView(R.id.recyclerView)
-    val emptyView: View? by bindView(R.id.emptyView)
-    private val emptyTextView: TextView? by bindView(R.id.empty_text_view)
-    val titleView: TextView? by bindView(R.id.titleTextView)
-    private val footerView: TextView? by bindView(R.id.footerTextView)
-    private val openMarketButton: Button? by bindView(R.id.openMarketButton)
-    private val openEmptyMarketButton: Button? by bindView(R.id.openEmptyMarketButton)
     var adapter: ItemRecyclerAdapter? = null
     var itemType: String? = null
     var itemTypeText: String? = null
@@ -51,10 +47,11 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
     var feedingPet: Pet? = null
     var user: User? = null
     internal var layoutManager: androidx.recyclerview.widget.LinearLayoutManager? = null
-    
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_items, container, false)
+
+    override var binding: FragmentItemsBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentItemsBinding {
+        return FragmentItemsBinding.inflate(inflater, container, false)
     }
 
     override fun onDestroy() {
@@ -69,22 +66,19 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
-        recyclerView?.setEmptyView(emptyView)
-        refreshLayout?.setOnRefreshListener(this)
-        emptyTextView?.text = getString(R.string.empty_items, itemTypeText)
+        binding?.recyclerView?.setEmptyView(binding?.emptyView)
+        binding?.refreshLayout?.setOnRefreshListener(this)
+        binding?.emptyTextView?.text = getString(R.string.empty_items, itemTypeText)
 
         val context = activity
 
         layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
+        binding?.recyclerView?.layoutManager = layoutManager
 
-        recyclerView?.layoutManager = layoutManager
-
-        adapter = recyclerView?.adapter as? ItemRecyclerAdapter
+        adapter = binding?.recyclerView?.adapter as? ItemRecyclerAdapter
         if (adapter == null) {
             context?.let {
-                adapter = ItemRecyclerAdapter(null, true, context)
+                adapter = ItemRecyclerAdapter(context)
                 adapter?.isHatching = this.isHatching
                 adapter?.isFeeding = this.isFeeding
                 adapter?.fragment = this
@@ -95,36 +89,51 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
             if (this.feedingPet != null) {
                 adapter?.feedingPet = this.feedingPet
             }
-            recyclerView?.adapter = adapter
+            binding?.recyclerView?.adapter = adapter
 
             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()))
+                        .flatMap { socialRepository.retrieveGroup("party") }
+                        .subscribe({
+                            if (isModal) {
+                                dismiss()
+                            } else {
+                                MainNavigationController.navigate(R.id.partyFragment)
+                            }
+                        }, RxErrorHandler.handleEmptyError()))
                 compositeSubscription.add(adapter.getOpenMysteryItemFlowable()
                         .flatMap { inventoryRepository.openMysteryItem(user) }
                         .doOnNext {
                             val activity = activity as? MainActivity
                             if (activity != null) {
-                                DataBindingUtils.loadImage("shop_${it.key}") {image ->
-                                    showSnackbar(activity.snackbarContainer, BitmapDrawable(context?.resources, image), null, getString(R.string.mystery_item_received, it.text), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
+                                val dialog = OpenedMysteryitemDialog(activity)
+                                dialog.isCelebratory = true
+                                dialog.setTitle(R.string.mystery_item_title)
+                                dialog.binding.iconView.loadImage("shop_${it.key}")
+                                dialog.binding.titleView.text = it.text
+                                dialog.binding.descriptionView.text = it.notes
+                                dialog.addButton(R.string.equip, true) { _, _ ->
+                                    inventoryRepository.equip(user, "equipped", it.key ?: "").subscribe( {}, RxErrorHandler.handleEmptyError())
                                 }
+                                dialog.addCloseButton()
+                                dialog.enqueue()
                             }
                         }
                         .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 {
-            recyclerView?.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(it, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
+            binding?.recyclerView?.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(it, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
         }
-        recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
         if (savedInstanceState != null) {
             this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "")
@@ -133,33 +142,33 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
         when {
             this.isHatching -> {
                 dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
-                this.titleView?.text = getString(R.string.hatch_with, this.hatchingItem?.text)
-                this.titleView?.visibility = View.VISIBLE
-                this.footerView?.text = getString(R.string.hatching_market_info)
-                this.footerView?.visibility = View.VISIBLE
-                this.openMarketButton?.visibility = View.VISIBLE
+                binding?.titleTextView?.text = getString(R.string.hatch_with, this.hatchingItem?.text)
+                binding?.titleTextView?.visibility = View.VISIBLE
+                binding?.footerTextView?.text = getString(R.string.hatching_market_info)
+                binding?.footerTextView?.visibility = View.VISIBLE
+                binding?.openMarketButton?.visibility = View.VISIBLE
             }
             this.isFeeding -> {
                 dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
-                this.titleView?.text = getString(R.string.dialog_feeding, this.feedingPet?.text)
-                this.titleView?.visibility = View.VISIBLE
-                this.footerView?.text = getString(R.string.feeding_market_info)
-                this.footerView?.visibility = View.VISIBLE
-                this.openMarketButton?.visibility = View.VISIBLE
+                binding?.titleTextView?.text = getString(R.string.dialog_feeding, this.feedingPet?.text)
+                binding?.titleTextView?.visibility = View.VISIBLE
+                binding?.footerTextView?.text = getString(R.string.feeding_market_info)
+                binding?.footerTextView?.visibility = View.VISIBLE
+                binding?.openMarketButton?.visibility = View.VISIBLE
             }
             else -> {
-                this.titleView?.visibility = View.GONE
-                this.footerView?.visibility = View.GONE
-                this.openMarketButton?.visibility = View.GONE
+                binding?.titleTextView?.visibility = View.GONE
+                binding?.footerTextView?.visibility = View.GONE
+                binding?.openMarketButton?.visibility = View.GONE
             }
         }
 
-        openMarketButton?.setOnClickListener {
+        binding?.openMarketButton?.setOnClickListener {
             dismiss()
             openMarket()
         }
 
-        openEmptyMarketButton?.setOnClickListener { openMarket() }
+        binding?.openEmptyMarketButton?.setOnClickListener { openMarket() }
 
         this.loadItems()
     }
@@ -175,7 +184,7 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
         }
         fragment.isHatching = true
         fragment.isFeeding = false
-        fragmentManager?.let { fragment.show(it, "hatchingDialog") }
+        parentFragmentManager.let { fragment.show(it, "hatchingDialog") }
     }
 
     override fun onResume() {
@@ -195,11 +204,11 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
     }
 
     override fun onRefresh() {
-        refreshLayout?.isRefreshing = true
+        binding?.refreshLayout?.isRefreshing = true
         compositeSubscription.add(userRepository.retrieveUser(true, true)
                 .doOnTerminate {
-                    refreshLayout?.isRefreshing = false
-                }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    binding?.refreshLayout?.isRefreshing = false
+                }.subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun hatchPet(potion: HatchingPotion, egg: Egg) {
@@ -225,7 +234,7 @@ class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.
                             } else {
                                 items
                             }
-                            adapter?.updateData(filteredItems)
+                            adapter?.data = filteredItems
                         }
                     }
                     .map { items -> items.mapNotNull { it.key } }
@@ -237,23 +246,23 @@ 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.getOwnedPets().firstElement()
+        compositeSubscription.add(inventoryRepository.getPets().subscribe({ adapter?.setExistingPets(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(inventoryRepository.getOwnedPets()
                 .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() {
-        MainNavigationController.navigate(R.id.shopsFragment)
+        MainNavigationController.navigate(R.id.marketFragment)
     }
 
     companion object {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
index 64fc03f08..048a39c4b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
@@ -8,33 +8,33 @@ import androidx.fragment.app.FragmentPagerAdapter
 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.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 
-class ItemsFragment : BaseMainFragment() {
+class ItemsFragment : BaseMainFragment<FragmentViewpagerBinding>() {
 
-    private val viewPager: androidx.viewpager.widget.ViewPager? by bindView(R.id.viewPager)
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.usesTabLayout = true
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_viewpager, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
-        viewPager?.currentItem = 0
+        binding?.viewPager?.currentItem = 0
         setViewPagerAdapter()
 
         arguments?.let {
             val args = ItemsFragmentArgs.fromBundle(it)
-                viewPager?.currentItem = when (args.itemType) {
+            binding?.viewPager?.currentItem = when (args.itemType) {
                     "hatchingPotions" -> 1
                     "food" -> 2
                     "quests" -> 3
@@ -51,7 +51,7 @@ class ItemsFragment : BaseMainFragment() {
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
 
-        viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): androidx.fragment.app.Fragment {
                 val fragment = ItemRecyclerFragment()
@@ -89,7 +89,7 @@ class ItemsFragment : BaseMainFragment() {
                 } ?: ""
             }
         }
-        tabLayout?.setupWithViewPager(viewPager)
+        tabLayout?.setupWithViewPager(binding?.viewPager)
         tabLayout?.tabMode = TabLayout.MODE_SCROLLABLE
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
index 9a7d42a13..85e7a4e30 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
@@ -4,10 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.shops.Shop
 
-class MarketFragment: ShopsFragment() {
+class MarketFragment: ShopFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        lockTab = 0
+        shopIdentifier = Shop.MARKET
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
index 1850f81a1..f82675a92 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
@@ -4,10 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.shops.Shop
 
-class QuestShopFragment: ShopsFragment() {
+class QuestShopFragment: ShopFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        lockTab = 1
+        shopIdentifier = Shop.QUEST_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
index 695b6a64f..433f522b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
@@ -4,10 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.shops.Shop
 
-class SeasonalShopFragment: ShopsFragment() {
+class SeasonalShopFragment: ShopFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        lockTab = 2
+        shopIdentifier = Shop.SEASONAL_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index 6729460b5..5bdb411ca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -4,12 +4,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.GridLayoutManager
+import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.events.GearPurchasedEvent
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -19,57 +21,67 @@ import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.inventory.ShopRecyclerAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_recyclerview.*
+import com.habitrpg.android.habitica.ui.views.CurrencyViews
 import org.greenrobot.eventbus.Subscribe
 import javax.inject.Inject
 
-class ShopFragment : BaseFragment() {
+open class ShopFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
+
+
+
+    internal val currencyView: CurrencyViews by lazy {
+        val view = CurrencyViews(context)
+        view
+    }
 
     var adapter: ShopRecyclerAdapter? = null
     var shopIdentifier: String? = null
-    var user: User? = null
     var shop: Shop? = null
     @Inject
     lateinit var inventoryRepository: InventoryRepository
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
-    lateinit var userRepository: UserRepository
-    @Inject
     lateinit var configManager: AppConfigManager
 
     private var layoutManager: GridLayoutManager? = null
 
     private var gearCategories: MutableList<ShopCategory>? = null
 
+    override var binding: FragmentRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_recyclerview, container, false)
+        this.hidesToolbar = true
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onDestroyView() {
-        userRepository.close()
         inventoryRepository.close()
+        socialRepository.close()
+        toolbarAccessoryContainer?.removeView(currencyView)
         super.onDestroyView()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        recyclerView.setBackgroundResource(R.color.white)
+        toolbarAccessoryContainer?.addView(currencyView)
+        binding?.recyclerView?.setBackgroundResource(R.color.content_background)
 
-        adapter = recyclerView.adapter as? ShopRecyclerAdapter
+        adapter = binding?.recyclerView?.adapter as? ShopRecyclerAdapter
         if (adapter == null) {
-            adapter = ShopRecyclerAdapter(configManager)
+            adapter = ShopRecyclerAdapter()
             adapter?.context = context
-            recyclerView.adapter = adapter
-            recyclerView.itemAnimator = SafeDefaultItemAnimator()
+            binding?.recyclerView?.adapter = adapter
+            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
         }
 
-        if (recyclerView.layoutManager == null) {
+        if (binding?.recyclerView?.layoutManager == null) {
             layoutManager = GridLayoutManager(context, 2)
             layoutManager?.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
                 override fun getSpanSize(position: Int): Int {
@@ -80,7 +92,7 @@ class ShopFragment : BaseFragment() {
                     }
                 }
             }
-            recyclerView.layoutManager = layoutManager
+            binding?.recyclerView?.layoutManager = layoutManager
         }
 
         if (savedInstanceState != null) {
@@ -103,17 +115,24 @@ class ShopFragment : BaseFragment() {
             }
         }
 
-        adapter?.user = user
+        compositeSubscription.add(userRepository.getUser().subscribe({
+            adapter?.user = user
+            updateCurrencyView(it)
+        }, RxErrorHandler.handleEmptyError()))
 
         compositeSubscription.add(socialRepository.getGroup(Group.TAVERN_ID)
                 .filter { it.hasActiveQuest }
                 .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()))
 
         view.post { setGridSpanCount(view.width) }
+
+        currencyView.hourglassVisibility = View.GONE
+
+        context?.let { FirebaseAnalytics.getInstance(it).logEvent("open_shop", bundleOf(Pair("shopIdentifier", shopIdentifier))) }
     }
 
     override fun onResume() {
@@ -133,14 +152,15 @@ class ShopFragment : BaseFragment() {
                 .map { shop1 ->
                     if (shop1.identifier == Shop.MARKET) {
                         val user = user
+                        val specialCategory = ShopCategory()
+                        specialCategory.text = getString(R.string.special)
                         if (user?.isValid == true && user.purchased?.plan?.isActive == true) {
-                            val specialCategory = ShopCategory()
-                            specialCategory.text = getString(R.string.special)
                             val item = ShopItem.makeGemItem(context?.resources)
                             item.limitedNumberLeft = user.purchased?.plan?.numberOfGemsLeft()
                             specialCategory.items.add(item)
-                            shop1.categories.add(specialCategory)
                         }
+                        specialCategory.items.add(ShopItem.makeFortifyItem(context?.resources))
+                        shop1.categories.add(specialCategory)
                     }
                     if (shop1.identifier == Shop.TIME_TRAVELERS_SHOP) {
                         formatTimeTravelersShop(shop1)
@@ -148,18 +168,16 @@ class ShopFragment : BaseFragment() {
                         shop1
                     }
                 }
-                .subscribe(Consumer {
+                .subscribe({
                     this.shop = it
                     this.adapter?.setShop(it)
                 }, RxErrorHandler.handleEmptyError()))
 
-
-
         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 +205,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 +215,7 @@ class ShopFragment : BaseFragment() {
                     }
                     shop
                 })
-                .subscribe(Consumer<Shop> {
+                .subscribe({
                     this.gearCategories = it.categories
                     adapter?.gearCategories = it.categories
                 }, RxErrorHandler.handleEmptyError()))
@@ -239,4 +257,10 @@ class ShopFragment : BaseFragment() {
         }
     }
 
+
+    private fun updateCurrencyView(user: User) {
+        currencyView.gold = user.stats?.gp ?: 0.0
+        currencyView.gems = user.gemCount.toDouble()
+        currencyView.hourglasses = user.hourglassCount.toDouble()
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
deleted file mode 100644
index 5d2cc6be7..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.shops
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.os.bundleOf
-import androidx.fragment.app.FragmentPagerAdapter
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.shops.Shop
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.views.CurrencyViews
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_viewpager.*
-import javax.inject.Inject
-
-
-open class ShopsFragment : BaseMainFragment() {
-
-    protected var lockTab: Int? = null
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    private val currencyView: CurrencyViews by lazy {
-        val view = CurrencyViews(context)
-        view.lightBackground = true
-        view
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        this.usesTabLayout = true
-        this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_viewpager, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        viewPager.currentItem = 0
-        setViewPagerAdapter()
-        toolbarAccessoryContainer?.addView(currencyView)
-
-        if (lockTab == null) {
-            arguments?.let {
-                val args = ShopsFragmentArgs.fromBundle(it)
-                if (args.selectedTab > 0) {
-                    viewPager.currentItem = args.selectedTab
-                }
-            }
-        } else {
-            this.usesTabLayout = false
-            tabLayout?.visibility = View.GONE
-            viewPager.currentItem = lockTab ?: 0
-        }
-
-        context?.let { FirebaseAnalytics.getInstance(it).logEvent("open_shop", bundleOf(Pair("shopIndex", lockTab))) }
-
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer { updateCurrencyView(it) }, RxErrorHandler.handleEmptyError()))
-    }
-
-    override fun onDestroyView() {
-        toolbarAccessoryContainer?.removeView(currencyView)
-        super.onDestroyView()
-    }
-
-    override fun onDestroy() {
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    private fun setViewPagerAdapter() {
-        val fragmentManager = childFragmentManager
-
-        viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager) {
-
-            override fun getItem(position: Int): androidx.fragment.app.Fragment {
-
-                val fragment = ShopFragment()
-
-                fragment.shopIdentifier = when (lockTab ?: position) {
-                    0 -> Shop.MARKET
-                    1 -> Shop.QUEST_SHOP
-                    2 -> Shop.SEASONAL_SHOP
-                    3 -> Shop.TIME_TRAVELERS_SHOP
-                    else -> ""
-                }
-                fragment.user = this@ShopsFragment.user
-
-                return fragment
-            }
-
-            override fun getCount(): Int = if (lockTab != null) 1 else 4
-
-            override fun getPageTitle(position: Int): CharSequence? {
-                return when (position) {
-                    0 -> context?.getString(R.string.market)
-                    1 -> context?.getString(R.string.quests)
-                    2 -> context?.getString(R.string.seasonalShop)
-                    3 -> context?.getString(R.string.timeTravelers)
-                    else -> ""
-                }
-            }
-        }
-
-        if (viewPager != null) {
-            tabLayout?.setupWithViewPager(viewPager)
-        }
-    }
-
-    private fun updateCurrencyView(user: User) {
-        currencyView.gold = user.stats?.gp ?: 0.0
-        currencyView.gems = user.gemCount.toDouble()
-        currencyView.hourglasses = user.hourglassCount.toDouble()
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
index 2bcc6b3a8..59bdc7542 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
@@ -4,10 +4,19 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.shops.Shop
 
-class TimeTravelersShopFragment: ShopsFragment() {
+class TimeTravelersShopFragment: ShopFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        lockTab = 3
+        shopIdentifier = Shop.TIME_TRAVELERS_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        currencyView.goldVisibility = View.GONE
+        currencyView.gemVisibility = View.GONE
+        currencyView.hourglassVisibility = View.VISIBLE
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
index 2551b98b1..002ea37a1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
@@ -4,45 +4,41 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.getTranslatedType
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.Pet
 import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.OwnedObject
-import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
-import io.realm.RealmResults
-
 import javax.inject.Inject
 
-class MountDetailRecyclerFragment : BaseMainFragment() {
+class MountDetailRecyclerFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
 
     @Inject
     internal lateinit var inventoryRepository: InventoryRepository
 
-    private val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView)
     var adapter: MountDetailRecyclerAdapter? = null
     var animalType: String? = null
     var animalGroup: String? = null
     var animalColor: String? = null
     internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager? = null
 
+    override var binding: FragmentRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         this.usesTabLayout = false
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_recyclerview, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onDestroy() {
@@ -77,18 +73,18 @@ class MountDetailRecyclerFragment : BaseMainFragment() {
                 }
             }
         }
-        recyclerView.layoutManager = layoutManager
-        recyclerView.addItemDecoration(MarginDecoration(activity))
+        binding?.recyclerView?.layoutManager = layoutManager
+        binding?.recyclerView?.addItemDecoration(MarginDecoration(activity))
 
-        adapter = recyclerView.adapter as? MountDetailRecyclerAdapter
+        adapter = binding?.recyclerView?.adapter as? MountDetailRecyclerAdapter
         if (adapter == null) {
             adapter = MountDetailRecyclerAdapter()
-            recyclerView.adapter = adapter
-            recyclerView.itemAnimator = SafeDefaultItemAnimator()
+            binding?.recyclerView?.adapter = adapter
+            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
             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,14 +124,14 @@ 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
                         for (mount in unsortedAnimals) {
                             if (mount.type == "wacky" || mount.type == "special") continue
                             if (mount.type != lastMount?.type) {
-                                currentSection = StableSection(mount.type, mount.getTranslatedType(context))
+                                currentSection = StableSection(mount.type, mount.getTranslatedType(context) ?: "")
                                 items.add(currentSection)
                             }
                             currentSection?.let {
@@ -149,7 +145,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..ca7b0abd3 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
@@ -7,50 +7,51 @@ import android.view.ViewGroup
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.events.commands.FeedCommand
 import com.habitrpg.android.habitica.extensions.getTranslatedType
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.inventory.*
-import com.habitrpg.android.habitica.models.user.Items
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.OwnedObject
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.ui.adapter.inventory.PetDetailRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
-import io.reactivex.rxkotlin.combineLatest
-import io.realm.RealmResults
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.kotlin.Flowables
 import org.greenrobot.eventbus.Subscribe
-import java.util.ArrayList
 import javax.inject.Inject
 
-class PetDetailRecyclerFragment : BaseMainFragment() {
+class PetDetailRecyclerFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
 
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
-    private val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView)
 
     var adapter: PetDetailRecyclerAdapter = PetDetailRecyclerAdapter()
-    var animalType: String? = null
-    var animalGroup: String? = null
-    var animalColor: String? = null
+    private var animalType: String? = null
+    private var animalGroup: String? = null
+    private var animalColor: String? = null
     internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager? = null
 
+    override var binding: FragmentRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         this.usesTabLayout = false
-        super.onCreateView(inflater, container, savedInstanceState)
         if (savedInstanceState != null) {
             this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "")
         }
-
-        return inflater.inflate(R.layout.fragment_recyclerview, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onDestroy() {
@@ -75,9 +76,6 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
             animalColor = args.color
         }
 
-
-        resetViews()
-
         layoutManager = androidx.recyclerview.widget.GridLayoutManager(getActivity(), 2)
         layoutManager?.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
@@ -88,20 +86,25 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
                 }
             }
         }
-        recyclerView.layoutManager = layoutManager
-        recyclerView.addItemDecoration(MarginDecoration(getActivity()))
-        adapter.animalIngredientsRetriever = {
-            val egg = inventoryRepository.getItems(Egg::class.java, arrayOf(it.animal)).firstElement().blockingGet().firstOrNull()
-            val potion = inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(it.color)).firstElement().blockingGet().firstOrNull()
-            Pair(egg as? Egg, potion as? HatchingPotion)
+        binding?.recyclerView?.layoutManager = layoutManager
+        binding?.recyclerView?.addItemDecoration(MarginDecoration(getActivity()))
+        adapter.animalIngredientsRetriever = { animal, callback ->
+            Maybe.zip(
+                    inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal)).firstElement(),
+                    inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color)).firstElement(), { eggs, potions ->
+                Pair(eggs.first() as? Egg, potions.first() as? HatchingPotion)
+            }
+            ).subscribe({
+                callback(it)
+            }, RxErrorHandler.handleEmptyError())
         }
-        recyclerView.adapter = adapter
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        binding?.recyclerView?.adapter = adapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
         this.loadItems()
 
         compositeSubscription.add(adapter.getEquipFlowable()
-                .flatMap<Items> { key -> inventoryRepository.equip(user, "pet", key) }
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                .flatMap { key -> inventoryRepository.equip(user, "pet", key) }
+                .subscribe({ }, RxErrorHandler.handleEmptyError()))
 
 
         view.post { setGridSpanCount(view.width) }
@@ -139,9 +142,9 @@ 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()))
-            compositeSubscription.add(inventoryRepository.getPets(animalType, animalGroup, animalColor).combineLatest(inventoryRepository.getOwnedPets()
+                    .subscribe({ adapter.setOwnedMounts(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(inventoryRepository.getOwnedItems(true).subscribe({ adapter.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(Flowables.combineLatest(inventoryRepository.getPets(animalType, animalGroup, animalColor), inventoryRepository.getOwnedPets()
                     .map { ownedPets ->
                         val petMap = mutableMapOf<String, OwnedPet>()
                         ownedPets.forEach { petMap[it.key ?: ""] = it }
@@ -155,7 +158,7 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
                         for (pet in it.first) {
                             if (pet.type == "wacky" || pet.type == "special") continue
                             if (pet.type != lastPet?.type) {
-                                currentSection = StableSection(pet.type, pet.getTranslatedType(context))
+                                currentSection = StableSection(pet.type, pet.getTranslatedType(context) ?: "")
                                 items.add(currentSection)
                             }
                             currentSection?.let {section ->
@@ -168,8 +171,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()))
         }
     }
 
@@ -183,7 +186,7 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
             fragment.isHatching = false
             fragment.itemType = "food"
             fragment.itemTypeText = getString(R.string.food)
-            fragmentManager?.let { fragment.show(it, "feedDialog") }
+            parentFragmentManager.let { fragment.show(it, "feedDialog") }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
index c4149332d..cc109e048 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
@@ -1,33 +1,33 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.stable
 
 import android.os.Bundle
-import androidx.fragment.app.FragmentPagerAdapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-
+import androidx.fragment.app.FragmentPagerAdapter
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 
-class StableFragment : BaseMainFragment() {
+class StableFragment : BaseMainFragment<FragmentViewpagerBinding>() {
 
-    private val viewPager: androidx.viewpager.widget.ViewPager? by bindView(R.id.viewPager)
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.usesTabLayout = true
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_viewpager, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        resetViews()
-        viewPager?.currentItem = 0
+        binding?.viewPager?.currentItem = 0
 
         setViewPagerAdapter()
     }
@@ -39,7 +39,7 @@ class StableFragment : BaseMainFragment() {
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
 
-        viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): androidx.fragment.app.Fragment {
 
@@ -71,7 +71,7 @@ class StableFragment : BaseMainFragment() {
                 } ?:  ""
             }
         }
-        tabLayout?.setupWithViewPager(viewPager)
+        tabLayout?.setupWithViewPager(binding?.viewPager)
     }
 
 
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..abebebd38 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
@@ -4,12 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.getTranslatedType
-import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Animal
@@ -19,37 +18,38 @@ import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.models.user.*
 import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.*
-import io.reactivex.Maybe
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
+import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.RealmResults
 import java.util.*
 import javax.inject.Inject
 
-class StableRecyclerFragment : BaseFragment() {
+class StableRecyclerFragment : BaseFragment<FragmentRecyclerviewBinding>() {
 
     @Inject
     lateinit var inventoryRepository: InventoryRepository
     @Inject
     lateinit var configManager: AppConfigManager
 
-    private val recyclerView: RecyclerViewEmptySupport? by bindView(R.id.recyclerView)
-    private val emptyView: TextView? by bindView(R.id.emptyView)
     var adapter: StableRecyclerAdapter? = null
     var itemType: String? = null
     var itemTypeText: String? = null
     var user: User? = null
     internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager? = null
-    
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
 
+    override var binding: FragmentRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         if (savedInstanceState != null) {
             this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "")
         }
 
-        return container?.inflate(R.layout.fragment_recyclerview_stable)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onDestroy() {
@@ -64,10 +64,8 @@ class StableRecyclerFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-        
-        recyclerView?.setEmptyView(emptyView)
-        emptyView?.text = getString(R.string.empty_items, itemTypeText)
+        binding?.recyclerView?.setEmptyView(binding?.emptyView)
+        binding?.emptyView?.text = getString(R.string.empty_items, itemTypeText)
 
         layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 2)
         layoutManager?.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
@@ -80,28 +78,33 @@ class StableRecyclerFragment : BaseFragment() {
             }
         }
 
-        recyclerView?.layoutManager = layoutManager
+        binding?.recyclerView?.layoutManager = layoutManager
         activity?.let {
-            recyclerView?.addItemDecoration(MarginDecoration(it, setOf(HEADER_VIEW_TYPE)))
+            binding?.recyclerView?.addItemDecoration(MarginDecoration(it, setOf(HEADER_VIEW_TYPE)))
         }
 
-        adapter = recyclerView?.adapter as? StableRecyclerAdapter
+        adapter = binding?.recyclerView?.adapter as? StableRecyclerAdapter
         if (adapter == null) {
             adapter = StableRecyclerAdapter()
-            adapter?.animalIngredientsRetriever = {
-                val egg = inventoryRepository.getItems(Egg::class.java, arrayOf(it.animal)).firstElement().blockingGet().firstOrNull()
-                val potion = inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(it.color)).firstElement().blockingGet().firstOrNull()
-                Pair(egg as? Egg, potion as? HatchingPotion)
+            adapter?.animalIngredientsRetriever = { animal, callback ->
+                Maybe.zip(
+                        inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal)).firstElement(),
+                        inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color)).firstElement(), { eggs, potions ->
+                    Pair(eggs.first() as? Egg, potions.first() as? HatchingPotion)
+                }
+                ).subscribe({
+                    callback(it)
+                }, RxErrorHandler.handleEmptyError())
             }
             adapter?.itemType = this.itemType
             adapter?.shopSpriteSuffix = configManager.shopSpriteSuffix()
-            recyclerView?.adapter = adapter
-            recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+            binding?.recyclerView?.adapter = adapter
+            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
             adapter?.let {
                 compositeSubscription.add(it.getEquipFlowable()
-                        .flatMap<Items> { key -> inventoryRepository.equip(user, if (itemType == "pets") "pet" else "mount", key) }
-                        .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                        .flatMap { key -> inventoryRepository.equip(user, if (itemType == "pets") "pet" else "mount", key) }
+                        .subscribe({ }, RxErrorHandler.handleEmptyError()))
             }
         }
         
@@ -156,12 +159,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 +174,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..c8e96746c 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
@@ -7,6 +7,7 @@ import android.content.Context
 import android.os.Bundle
 import android.text.InputType
 import android.widget.EditText
+import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.core.os.bundleOf
 import androidx.preference.Preference
@@ -24,7 +25,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 class AuthenticationPreferenceFragment: BasePreferencesFragment() {
@@ -47,7 +47,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
         super.onCreate(savedInstanceState)
 
         findPreference("login_name").title = context?.getString(R.string.username)
-        findPreference("confirm_username").isVisible = user?.flags?.isVerifiedUsername != true
+        findPreference("confirm_username").isVisible = user?.flags?.verifiedUsername != true
     }
 
     private fun updateUserFields() {
@@ -55,7 +55,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
         configurePreference(findPreference("email"), user?.authentication?.localAuthentication?.email, true)
         findPreference("change_password").isVisible = user?.authentication?.localAuthentication?.email?.isNotEmpty() == true
         findPreference("add_local_auth").isVisible = user?.authentication?.localAuthentication?.email?.isNotEmpty() != true
-        findPreference("confirm_username").isVisible = user?.flags?.isVerifiedUsername != true
+        findPreference("confirm_username").isVisible = user?.flags?.verifiedUsername != true
         val preference = findPreference("authentication_methods")
         val methods = mutableListOf<String>()
         if (user?.authentication?.localAuthentication?.email != null) {
@@ -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())
             }
@@ -186,12 +186,13 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
             val dialog = HabiticaAlertDialog(context)
             dialog.setTitle(R.string.delete_account)
             dialog.setMessage(deleteMessage)
-            dialog.addButton(R.string.delete_account_confirmation, isPrimary = true, isDestructive = true) { _, _ ->
+            dialog.addCancelButton()
+            dialog.addButton(R.string.delete, isPrimary = true, isDestructive = true) { _, _ ->
                 deleteAccount(editText?.text?.toString() ?: "")
             }
-            dialog.addCancelButton()
             dialog.setAdditionalContentView(view)
             dialog.setAdditionalContentSidePadding(12.dpToPx(context))
+            dialog.buttonAxis = LinearLayout.HORIZONTAL
             dialog.show()
         }
     }
@@ -212,7 +213,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 +257,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..800c5b6ca 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
@@ -7,8 +7,7 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -28,7 +27,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/DayStartPreferenceDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt
index bb0a6ac80..a5023a436 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt
@@ -40,7 +40,7 @@ class DayStartPreferenceDialogFragment : PreferenceDialogFragmentCompat() {
         picker = TimePicker(context)
         descriptionTextView = TextView(context)
         @Suppress("DEPRECATION")
-        descriptionTextView?.setTextColor(resources.getColor(R.color.textColorLight))
+        descriptionTextView?.setTextColor(resources.getColor(R.color.text_primary))
         val padding = resources.getDimension(R.dimen.card_padding).toInt()
         descriptionTextView?.setPadding(padding, padding, padding, padding)
         val lp = LinearLayout.LayoutParams(
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..51536a052 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
@@ -6,7 +6,6 @@ import androidx.preference.CheckBoxPreference
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.functions.Consumer
 
 class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -74,7 +73,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("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..69585d9d8 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
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences
 
 import android.annotation.SuppressLint
-import android.app.ProgressDialog
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
@@ -17,16 +17,17 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
+import com.habitrpg.android.habitica.events.ShowSnackbarEvent
 import com.habitrpg.android.habitica.helpers.*
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
-import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.prefs.TimePreference
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
 import com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.PrefsActivity
-import io.reactivex.functions.Consumer
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import org.greenrobot.eventbus.EventBus
 import java.util.*
 import javax.inject.Inject
 
@@ -52,7 +53,11 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
     override fun onCreate(savedInstanceState: Bundle?) {
         HabiticaBaseApplication.userComponent?.inject(this)
         super.onCreate(savedInstanceState)
+    }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        listView.itemAnimator = null
     }
 
     override fun setupPreferences() {
@@ -60,7 +65,6 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         val useReminder = preferenceManager.sharedPreferences.getBoolean("use_reminder", false)
         timePreference?.isEnabled = useReminder
 
-
         pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
         val usePushNotifications = preferenceManager.sharedPreferences.getBoolean("usePushNotifications", true)
         pushNotificationsPreference?.isEnabled = usePushNotifications
@@ -69,16 +73,18 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         val useEmailNotifications = preferenceManager.sharedPreferences.getBoolean("useEmailNotifications", true)
         emailNotificationsPreference?.isEnabled = useEmailNotifications
 
-
         classSelectionPreference = findPreference("choose_class")
-        classSelectionPreference?.isVisible = false
+
+        val weekdayPreference = findPreference("FirstDayOfTheWeek") as? ListPreference
+        weekdayPreference?.summary = weekdayPreference?.entry
 
         serverUrlPreference = findPreference("server_url") as? ListPreference
         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?.summary = themePreference?.entry ?: "Default"
+        val themeModePreference = findPreference("theme_mode") as? ListPreference
+        themeModePreference?.summary = themeModePreference?.entry ?: "Follow System"
 
 
         val taskDisplayPreference = findPreference("task_display") as? ListPreference
@@ -92,7 +98,6 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
     override fun onResume() {
         super.onResume()
         preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-
     }
 
     override fun onPause() {
@@ -128,18 +133,16 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 return true
             }
             "reload_content" -> {
-                @Suppress("DEPRECATION")
-                val dialog = ProgressDialog.show(context, context?.getString(R.string.reloading_content), null, true)
+                val event = ShowSnackbarEvent()
+                event.text = context?.getString(R.string.reloading_content)
+                event.type = HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                EventBus.getDefault().post(event)
                 contentRepository.retrieveContent(context,true).subscribe({
-                    if (dialog.isShowing) {
-                        dialog.dismiss()
-                    }
-                }) { throwable ->
-                    if (dialog.isShowing) {
-                        dialog.dismiss()
-                    }
-                    RxErrorHandler.reportError(throwable)
-                }
+                    val completedEvent = ShowSnackbarEvent()
+                    completedEvent.text = context?.getString(R.string.reloaded_content)
+                    completedEvent.type = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+                    EventBus.getDefault().post(completedEvent)
+                }, RxErrorHandler.handleEmptyError())
             }
             "fixCharacterValues" -> {
                 val intent = Intent(activity, FixCharacterValuesActivity::class.java)
@@ -150,7 +153,6 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
     }
 
 
-    @SuppressLint("ObsoleteSdkInt")
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
         when (key) {
             "use_reminder" -> {
@@ -184,7 +186,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" -> {
@@ -192,33 +194,27 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
 
                 Locale.setDefault(languageHelper.locale)
                 val configuration = Configuration()
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
-                    @Suppress("Deprecation")
-                    configuration.locale = languageHelper.locale
-                } else {
-                    configuration.setLocale(languageHelper.locale)
-                }
+                configuration.setLocale(languageHelper.locale)
                 @Suppress("DEPRECATION")
                 activity?.resources?.updateConfiguration(configuration, activity?.resources?.displayMetrics)
-                userRepository.updateLanguage(user, languageHelper.languageCode ?: "en")
-                        .flatMap<ContentResult> { contentRepository.retrieveContent(context,true) }
-                        .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
 
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-                    val intent = Intent(activity, MainActivity::class.java)
-                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                    startActivity(intent)
-                } else {
-                    val intent = Intent(activity, MainActivity::class.java)
-                    this.startActivity(intent)
-                    activity?.finishAffinity()
+                if (user?.preferences?.language == languageHelper.languageCode) {
+                    return
                 }
+
+                userRepository.updateLanguage(languageHelper.languageCode ?: "en")
+                        .flatMap { contentRepository.retrieveContent(context,true) }
+                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+
+                val intent = Intent(activity, MainActivity::class.java)
+                this.startActivity(intent)
+                activity?.finishAffinity()
             }
             "audioTheme" -> {
                 val newAudioTheme = sharedPreferences.getString(key, "off")
                 if (newAudioTheme != null) {
-                    compositeSubscription.add(userRepository.updateUser(user, "preferences.sound", newAudioTheme)
-                            .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    compositeSubscription.add(userRepository.updateUser("preferences.sound", newAudioTheme)
+                            .subscribe({ }, RxErrorHandler.handleEmptyError()))
                     soundManager.soundTheme = newAudioTheme
                     soundManager.preloadAllFiles()
                 }
@@ -227,8 +223,12 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 val activity = activity as? PrefsActivity ?: return
                 activity.reload()
             }
-            "dailyDueDefaultView" -> userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
-                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            "theme_mode" -> {
+                val activity = activity as? PrefsActivity ?: return
+                activity.reload()
+            }
+            "dailyDueDefaultView" -> userRepository.updateUser("preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
+                    .subscribe({ }, RxErrorHandler.handleEmptyError())
             "server_url" -> {
                 apiClient.updateServerUrl(sharedPreferences.getString(key, ""))
                 findPreference(key).summary = sharedPreferences.getString(key, "")
@@ -237,11 +237,15 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 val preference = findPreference(key) as ListPreference
                 preference.summary = preference.entry
             }
+            "FirstDayOfTheWeek" -> {
+                val preference = findPreference(key) as ListPreference
+                preference.summary = preference.entry
+            }
             "disablePMs" -> {
                 val isDisabled = sharedPreferences.getBoolean("disablePMs", false)
                 if (user?.inbox?.optOut != isDisabled) {
-                    compositeSubscription.add(userRepository.updateUser(user, "inbox.optOut", isDisabled)
-                            .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    compositeSubscription.add(userRepository.updateUser("inbox.optOut", isDisabled)
+                            .subscribe({ }, RxErrorHandler.handleEmptyError()))
                 }
             }
         }
@@ -250,18 +254,14 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
     override fun onDisplayPreferenceDialog(preference: Preference) {
         if (preference is TimePreference) {
             if (preference.getKey() == "cds_time") {
-                if (fragmentManager?.findFragmentByTag(DayStartPreferenceDialogFragment.TAG) == null) {
-                    fragmentManager?.let {
-                        DayStartPreferenceDialogFragment.newInstance(this, preference.getKey())
-                                .show(it, DayStartPreferenceDialogFragment.TAG)
-                    }
+                if (parentFragmentManager.findFragmentByTag(DayStartPreferenceDialogFragment.TAG) == null) {
+                    DayStartPreferenceDialogFragment.newInstance(this, preference.getKey())
+                                .show(parentFragmentManager, DayStartPreferenceDialogFragment.TAG)
                 }
             } else {
-                if (fragmentManager?.findFragmentByTag(TimePreferenceDialogFragment.TAG) == null) {
-                    fragmentManager?.let {
+                if (parentFragmentManager.findFragmentByTag(TimePreferenceDialogFragment.TAG) == null) {
                         TimePreferenceDialogFragment.newInstance(this, preference.getKey())
-                                .show(it, TimePreferenceDialogFragment.TAG)
-                    }
+                                .show(parentFragmentManager, TimePreferenceDialogFragment.TAG)
                 }
             }
         } else {
@@ -279,11 +279,12 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                     classSelectionPreference?.title = getString(R.string.change_class)
                     classSelectionPreference?.summary = getString(R.string.change_class_description)
                 }
-                classSelectionPreference?.isVisible = true
             } else {
                 classSelectionPreference?.title = getString(R.string.enable_class)
-                classSelectionPreference?.isVisible = true
             }
+            classSelectionPreference?.isVisible = true
+        } else {
+            classSelectionPreference?.isVisible = false
         }
         val cdsTimePreference = findPreference("cds_time") as? TimePreference
         cdsTimePreference?.text = user?.preferences?.dayStart.toString() + ":00"
@@ -296,7 +297,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         audioThemePreference?.summary = audioThemePreference?.entry
 
         val preference = findPreference("authentication")
-        if (user?.flags?.isVerifiedUsername == true) {
+        if (user?.flags?.verifiedUsername == true) {
             preference.layoutResource = R.layout.preference_child_summary
             preference.summary = context?.getString(R.string.authentication_summary)
         } else {
@@ -308,7 +309,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         val inbox = user?.inbox
         disablePMsPreference?.isChecked = inbox?.optOut ?: true
 
-        if (user?.contributor?.admin == true) {
+        if (configManager.testingLevel() == AppTestingLevel.STAFF || BuildConfig.DEBUG) {
             serverUrlPreference?.isVisible = true
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
index 95a5da80d..863de186c 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
@@ -8,8 +8,7 @@ import androidx.preference.PreferenceCategory
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
 
 class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -59,28 +58,28 @@ class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.O
             val observable: Flowable<User>? = when (key) {
                 "display_name" -> {
                     if (newValue != user?.profile?.name) {
-                        userRepository.updateUser(user, "profile.name", newValue)
+                        userRepository.updateUser("profile.name", newValue)
                     } else {
                         null
                     }
                 }
                 "photo_url" -> {
                     if (newValue != user?.profile?.imageUrl) {
-                        userRepository.updateUser(user, "profile.imageUrl", newValue)
+                        userRepository.updateUser("profile.imageUrl", newValue)
                     } else {
                         null
                     }
                 }
                 "about" -> {
                     if (newValue != user?.profile?.blurb) {
-                        userRepository.updateUser(user, "profile.blurb", newValue)
+                        userRepository.updateUser("profile.blurb", newValue)
                     } else {
                         null
                     }
                 }
                 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..4413d02f5 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
@@ -6,7 +6,6 @@ import androidx.preference.CheckBoxPreference
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.functions.Consumer
 
 class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -76,7 +75,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("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/preferences/TimePreferenceDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt
index 08c75dd2e..3f733c790 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt
@@ -70,9 +70,7 @@ class TimePreferenceDialogFragment : PreferenceDialogFragmentCompat() {
     }
 
     companion object {
-
         val TAG = TimePreferenceDialogFragment::class.java.simpleName
-
         fun newInstance(
                 preferenceFragment: PreferenceFragmentCompat, key: String): TimePreferenceDialogFragment {
             val fragment = TimePreferenceDialogFragment()
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..fa7c8ed43 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
@@ -1,37 +1,39 @@
 package com.habitrpg.android.habitica.ui.fragments.purchases
 
 import android.content.Intent
-import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.*
-import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
+import com.habitrpg.android.habitica.models.promotions.PromoType
 import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity
 import com.habitrpg.android.habitica.ui.activities.GiftGemsActivity
 import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
-class GemsPurchaseFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragment {
+class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>(), GemPurchaseActivity.CheckoutFragment {
 
-    private lateinit var binding: FragmentGemPurchaseBinding
+    override var binding: FragmentGemPurchaseBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGemPurchaseBinding {
+        return FragmentGemPurchaseBinding.inflate(inflater, container, false)
+    }
 
-    @Inject
-    lateinit var crashlyticsProxy: CrashlyticsProxy
     @Inject
     lateinit var userRepository: UserRepository
     @Inject
@@ -39,12 +41,6 @@ class GemsPurchaseFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
 
     private var purchaseHandler: PurchaseHandler? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentGemPurchaseBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
@@ -52,35 +48,41 @@ 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 {
-            binding.subscriptionPromo.visibility = if (it.isSubscribed) View.GONE else View.VISIBLE
+        compositeSubscription.add(userRepository.getUser().subscribe({
+            binding?.subscriptionPromo?.visibility = if (it.isSubscribed) View.GONE else View.VISIBLE
         }, RxErrorHandler.handleEmptyError()))
 
-        binding.giftGemsButton.setOnClickListener { showGiftGemsDialog() }
+        binding?.giftGemsButton?.setOnClickListener { showGiftGemsDialog() }
 
-        binding.giftSubscriptionContainer.isVisible = appConfigManager.enableGiftOneGetOne()
-        binding.giftSubscriptionContainer.setOnClickListener { showGiftSubscriptionDialog() }
+        if (context?.isUsingNightModeResources() == true) {
+            binding?.headerImageView?.setImageResource(R.drawable.gem_purchase_header_dark)
+        }
 
-        val promo = appConfigManager.activePromo()
+        val promo = context?.let { appConfigManager.activePromo(it) }
         if (promo != null) {
-            promo.configurePurchaseBanner(binding)
-            promo.configureGemView(binding.gems4View.binding, 4)
-            promo.configureGemView(binding.gems21View.binding, 21)
-            promo.configureGemView(binding.gems42View.binding, 42)
-            promo.configureGemView(binding.gems84View.binding, 84)
-            binding.promoBanner.setOnClickListener {
-                MainNavigationController.navigate(R.id.promoInfoFragment)
+            binding?.let {
+                promo.configurePurchaseBanner(it)
+                if (promo.promoType != PromoType.SUBSCRIPTION) {
+                    promo.configureGemView(it.gems4View.binding, 4)
+                    promo.configureGemView(it.gems21View.binding, 21)
+                    promo.configureGemView(it.gems42View.binding, 42)
+                    promo.configureGemView(it.gems84View.binding, 84)
+                }
+            }
+            binding?.promoBanner?.setOnClickListener {
+                val fragment = PromoInfoFragment()
+                parentFragmentManager
+                        .beginTransaction()
+                        .replace(R.id.fragment_container, fragment as Fragment)
+                        .commit()
             }
         } else {
-            binding.promoBanner.visibility = View.GONE
+            binding?.promoBanner?.visibility = View.GONE
         }
     }
 
@@ -98,10 +100,10 @@ class GemsPurchaseFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
 
     private fun updateButtonLabel(sku: String, price: String) {
         val matchingView: GemPurchaseOptionsView? = when (sku) {
-            PurchaseTypes.Purchase4Gems -> binding.gems4View
-            PurchaseTypes.Purchase21Gems -> binding.gems21View
-            PurchaseTypes.Purchase42Gems -> binding.gems42View
-            PurchaseTypes.Purchase84Gems -> binding.gems84View
+            PurchaseTypes.Purchase4Gems -> binding?.gems4View
+            PurchaseTypes.Purchase21Gems -> binding?.gems21View
+            PurchaseTypes.Purchase42Gems -> binding?.gems42View
+            PurchaseTypes.Purchase84Gems -> binding?.gems84View
             else -> return
         }
         if (matchingView != null) {
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..03f0ce010 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
@@ -4,41 +4,33 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentGiftGemBalanceBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
-class GiftBalanceGemsFragment : BaseFragment() {
+class GiftBalanceGemsFragment : BaseFragment<FragmentGiftGemBalanceBinding>() {
 
     @Inject
     lateinit var socialRepository: SocialRepository
 
-    private val avatarView: AvatarView by bindView(R.id.avatar_view)
-    private val displayNameTextView: UsernameLabel by bindView(R.id.display_name_textview)
-    private val usernameTextView: TextView by bindView(R.id.username_textview)
-    private val giftEditText: EditText by bindView(R.id.gift_edit_text)
-    private val giftButton: Button by bindView(R.id.gift_button)
+    override var binding: FragmentGiftGemBalanceBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGiftGemBalanceBinding {
+        return FragmentGiftGemBalanceBinding.inflate(inflater, container, false)
+    }
 
     var giftedMember: Member? = null
         set(value) {
             field = value
             field?.let {
-                avatarView.setAvatar(it)
-                displayNameTextView.username = it.profile?.name
-                displayNameTextView.tier = it.contributor?.level ?: 0
-                usernameTextView.text = "@${it.username}"
+                binding?.avatarView?.setAvatar(it)
+                binding?.displayNameTextview?.username = it.profile?.name
+                binding?.displayNameTextview?.tier = it.contributor?.level ?: 0
+                binding?.usernameTextview?.text = "@${it.username}"
             }
         }
 
@@ -48,21 +40,16 @@ class GiftBalanceGemsFragment : BaseFragment() {
         component.inject(this)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_gift_gem_balance)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        giftButton.setOnClickListener { sendGift() }
+        binding?.giftButton?.setOnClickListener { sendGift() }
     }
 
     private fun sendGift() {
         try {
-            val amount = giftEditText.text.toString().toInt()
+            val amount = binding?.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..b40075395 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
@@ -4,61 +4,44 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import com.habitrpg.android.habitica.HabiticaPurchaseVerifier
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentGiftGemPurchaseBinding
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
-import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
-class GiftPurchaseGemsFragment : BaseFragment() {
+class GiftPurchaseGemsFragment : BaseFragment<FragmentGiftGemPurchaseBinding>() {
 
     @Inject
     lateinit var crashlyticsProxy: CrashlyticsProxy
     @Inject
     lateinit var socialRepository: SocialRepository
 
-    private val avatarView: AvatarView by bindView(R.id.avatar_view)
-    private val displayNameTextView: UsernameLabel by bindView(R.id.display_name_textview)
-    private val usernameTextView: TextView by bindView(R.id.username_textview)
-    private val gems4View: GemPurchaseOptionsView? by bindView(R.id.gems_4_view)
-    private val gems21View: GemPurchaseOptionsView? by bindView(R.id.gems_21_view)
-    private val gems42View: GemPurchaseOptionsView? by bindView(R.id.gems_42_view)
-    private val gems84View: GemPurchaseOptionsView? by bindView(R.id.gems_84_view)
+    override var binding: FragmentGiftGemPurchaseBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGiftGemPurchaseBinding {
+        return FragmentGiftGemPurchaseBinding.inflate(inflater, container, false)
+    }
 
     var giftedMember: Member? = null
     set(value) {
         field = value
         field?.let {
-            avatarView.setAvatar(it)
-            displayNameTextView.username = it.profile?.name
-            displayNameTextView.tier = it.contributor?.level ?: 0
-            usernameTextView.text = "@${it.username}"
+            binding?.avatarView?.setAvatar(it)
+            binding?.displayNameTextview?.username = it.profile?.name
+            binding?.displayNameTextview?.tier = it.contributor?.level ?: 0
+            binding?.usernameTextview?.text = "@${it.username}"
         }
     }
 
     private var purchaseHandler: PurchaseHandler? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        return container?.inflate(R.layout.fragment_gift_gem_purchase)
-    }
-
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
@@ -66,10 +49,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) })
+        binding?.gems4View?.setOnPurchaseClickListener { purchaseGems(PurchaseTypes.Purchase4Gems) }
+        binding?.gems21View?.setOnPurchaseClickListener { purchaseGems(PurchaseTypes.Purchase21Gems) }
+        binding?.gems42View?.setOnPurchaseClickListener { purchaseGems(PurchaseTypes.Purchase42Gems) }
+        binding?.gems84View?.setOnPurchaseClickListener({ purchaseGems(PurchaseTypes.Purchase84Gems) })
     }
 
     fun setupCheckout() {
@@ -86,10 +69,10 @@ class GiftPurchaseGemsFragment : BaseFragment() {
 
     private fun updateButtonLabel(sku: String, price: String) {
         val matchingView: GemPurchaseOptionsView? = when (sku) {
-            PurchaseTypes.Purchase4Gems -> gems4View
-            PurchaseTypes.Purchase21Gems -> gems21View
-            PurchaseTypes.Purchase42Gems -> gems42View
-            PurchaseTypes.Purchase84Gems -> gems84View
+            PurchaseTypes.Purchase4Gems -> binding?.gems4View
+            PurchaseTypes.Purchase21Gems -> binding?.gems21View
+            PurchaseTypes.Purchase42Gems -> binding?.gems42View
+            PurchaseTypes.Purchase84Gems -> binding?.gems84View
             else -> return
         }
         if (matchingView != null) {
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..149fe769c 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
@@ -1,13 +1,13 @@
 package com.habitrpg.android.habitica.ui.fragments.purchases
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
-import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
@@ -16,6 +16,8 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.events.UserSubscribedEvent
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
@@ -23,23 +25,26 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity
-import com.habitrpg.android.habitica.ui.activities.GiftOneGetOneInfoActivity
 import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
 import org.solovyev.android.checkout.Inventory
 import org.solovyev.android.checkout.Purchase
 import org.solovyev.android.checkout.Sku
 import javax.inject.Inject
 
-class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragment {
+class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>(), GemPurchaseActivity.CheckoutFragment {
+
+    override var binding: FragmentSubscriptionBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSubscriptionBinding {
+        return FragmentSubscriptionBinding.inflate(inflater, container, false)
+    }
 
-    private lateinit var binding: FragmentSubscriptionBinding
     @Inject
     lateinit var crashlyticsProxy: CrashlyticsProxy
     @Inject
@@ -60,13 +65,6 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     private var hasLoadedSubscriptionOptions: Boolean = false
     private var purchasedSubscription: Purchase? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentSubscriptionBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
     @Subscribe
     fun fetchUser(event: UserSubscribedEvent?) {
         refresh()
@@ -75,27 +73,40 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.subscriptionOptions.visibility = View.GONE
-        binding.subscriptionDetails.visibility = View.GONE
-        binding.subscriptionDetails.onShowSubscriptionOptions = { showSubscriptionOptions() }
+        binding?.subscriptionOptions?.visibility = View.GONE
+        binding?.subscriptionDetails?.visibility = View.GONE
+        binding?.subscriptionDetails?.onShowSubscriptionOptions = { showSubscriptionOptions() }
 
-        binding.giftSubscriptionContainer.setOnClickListener { showGiftSubscriptionDialog() }
-        binding.giftSubscriptionButton.setOnClickListener { showGiftSubscriptionDialog() }
+        binding?.giftSubscriptionButton?.setOnClickListener { context?.let { context -> showGiftSubscriptionDialog(context, appConfigManager.activePromo(context)?.identifier == "g1g1") } }
 
-        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() }
+        binding?.subscribeButton?.setOnClickListener { subscribeUser() }
 
-        binding.giftSubscriptionContainer.isVisible = appConfigManager.enableGiftOneGetOne()
+        val promo = context?.let { appConfigManager.activePromo(it) }
+        if (promo != null) {
+            binding?.let {
+                promo.configurePurchaseBanner(it)
+            }
+            binding?.promoBanner?.setOnClickListener {
+                val fragment = PromoInfoFragment()
+                parentFragmentManager
+                        .beginTransaction()
+                        .replace(R.id.fragment_container, fragment as Fragment)
+                        .commit()
+            }
+        } else {
+            binding?.promoBanner?.visibility = View.GONE
+        }
 
-        binding.refreshLayout.setOnRefreshListener { refresh() }
+        binding?.refreshLayout?.setOnRefreshListener { refresh() }
 
-        compositeSubscription.add(inventoryRepository.getLatestMysteryItem().subscribe(Consumer {
-            DataBindingUtils.loadImage(binding.subBenefitsMysteryItemIcon, "shop_set_mystery_${it.key?.split("_")?.last()}")
-            binding.subBenefitsMysteryItemText.text = context?.getString(R.string.subscribe_listitem3_description_new, it.text)
+        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,9 +116,9 @@ 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
+            binding?.refreshLayout?.isRefreshing = false
         }, RxErrorHandler.handleEmptyError()))
     }
 
@@ -153,8 +164,8 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         this.selectedSubscriptionSku = sku
         val subscriptionOptionButton = buttonForSku(this.selectedSubscriptionSku)
         subscriptionOptionButton?.setIsPurchased(true)
-        if (binding.subscribeButton != null) {
-            binding.subscribeButton?.isEnabled = true
+        if (binding?.subscribeButton != null) {
+            binding?.subscribeButton?.isEnabled = true
         }
     }
 
@@ -164,10 +175,10 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
 
     private fun buttonForSku(sku: String?): SubscriptionOptionView? {
         return when (sku) {
-            PurchaseTypes.Subscription1Month -> binding.subscription1month
-            PurchaseTypes.Subscription3Month -> binding.subscription3month
-            PurchaseTypes.Subscription6Month -> binding.subscription6month
-            PurchaseTypes.Subscription12Month -> binding.subscription12month
+            PurchaseTypes.Subscription1Month -> binding?.subscription1month
+            PurchaseTypes.Subscription3Month -> binding?.subscription3month
+            PurchaseTypes.Subscription6Month -> binding?.subscription6month
+            PurchaseTypes.Subscription12Month -> binding?.subscription12month
             else -> null
         }
     }
@@ -185,7 +196,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         selectedSubscriptionSku?.let { sku ->
             purchaseHandler?.purchaseSubscription(sku) {
                 fetchUser(null)
-                binding.scrollView.smoothScrollTo(0, 0)
+                binding?.scrollView?.smoothScrollTo(0, 0)
             }
         }
     }
@@ -203,27 +214,35 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         if (user != null) {
             val isSubscribed = user?.isSubscribed ?: false
 
-            if (binding.subscriptionDetails == null) {
+            if (binding?.subscriptionDetails == null) {
                 return
             }
 
             if (isSubscribed) {
-                binding.headerImageView?.setImageResource(R.drawable.subscriber_header)
-                binding.subscriptionDetails.visibility = View.VISIBLE
-                binding.subscriptionDetails.currentUserID = user?.id
-                user?.purchased?.plan?.let { binding.subscriptionDetails.setPlan(it) }
-                binding.subscribeBenefitsTitle.setText(R.string.subscribe_prompt_thanks)
-                binding.subscriptionOptions.visibility = View.GONE
+                if (context?.isUsingNightModeResources() == true) {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscriber_banner_dark)
+                } else {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscriber_header)
+                }
+                binding?.subscriptionDetails?.visibility = View.VISIBLE
+                binding?.subscriptionDetails?.currentUserID = user?.id
+                user?.purchased?.plan?.let { binding?.subscriptionDetails?.setPlan(it) }
+                binding?.subscribeBenefitsTitle?.setText(R.string.subscribe_prompt_thanks)
+                binding?.subscriptionOptions?.visibility = View.GONE
             } else {
-                binding.headerImageView.setImageResource(R.drawable.subscribe_header)
+                if (context?.isUsingNightModeResources() == true) {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header_dark)
+                } else {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header)
+                }
                 if (!hasLoadedSubscriptionOptions) {
                     return
                 }
-                binding.subscriptionOptions.visibility = View.VISIBLE
-                binding.subscriptionDetails.visibility = View.GONE
-                binding.subscribeBenefitsTitle.setText(R.string.subscribe_prompt)
+                binding?.subscriptionOptions?.visibility = View.VISIBLE
+                binding?.subscriptionDetails?.visibility = View.GONE
+                binding?.subscribeBenefitsTitle?.setText(R.string.subscribe_prompt)
             }
-            binding.loadingIndicator.visibility = View.GONE
+            binding?.loadingIndicator?.visibility = View.GONE
         }
     }
 
@@ -231,16 +250,16 @@ 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()))
         }
     }
 
     private fun showSubscriptionOptions() {
-        binding.subscriptionOptions.visibility = View.VISIBLE
-        binding.subscriptionOptions.postDelayed({
-            binding.scrollView.smoothScrollTo(0, binding.subscriptionOptions.top)
+        binding?.subscriptionOptions?.visibility = View.VISIBLE
+        binding?.subscriptionOptions?.postDelayed({
+            binding?.scrollView?.smoothScrollTo(0, binding?.subscriptionOptions?.top ?: 0)
         }, 500)
     }
 
@@ -248,29 +267,24 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         purchaseSubscription()
     }
 
-    private fun showGiftSubscriptionDialog() {
-        if (appConfigManager.enableGiftOneGetOne()) {
-            val intent = Intent(context, GiftOneGetOneInfoActivity::class.java)
-            context?.startActivity(intent)
-        } else {
-            val chooseRecipientDialogView = this.activity?.layoutInflater?.inflate(R.layout.dialog_choose_message_recipient, null)
+    companion object {
+        fun showGiftSubscriptionDialog(context: Context, iSG1G1: Boolean) {
+            val chooseRecipientDialogView = context.layoutInflater.inflate(R.layout.dialog_choose_message_recipient, null)
 
-            this.activity?.let { thisActivity ->
-                val alert = HabiticaAlertDialog(thisActivity)
-                alert.setTitle(getString(R.string.gift_title))
-                alert.addButton(getString(R.string.action_continue), true) { _, _ ->
+                val alert = HabiticaAlertDialog(context)
+                alert.setTitle(context.getString(R.string.gift_title))
+                alert.addButton(context.getString(R.string.action_continue), true) { _, _ ->
                     val usernameEditText = chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
-                    val intent = Intent(thisActivity, GiftSubscriptionActivity::class.java).apply {
+                    val intent = Intent(context, GiftSubscriptionActivity::class.java).apply {
                         putExtra("username", usernameEditText?.text.toString())
                     }
-                    startActivity(intent)
+                    context.startActivity(intent)
                 }
                 alert.addCancelButton { _, _ ->
-                    thisActivity.dismissKeyboard()
+                   //context.dismissKeyboard()
                 }
                 alert.setAdditionalContentView(chooseRecipientDialogView)
                 alert.show()
-            }
         }
     }
 }
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..c619c3d3a 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
@@ -5,34 +5,26 @@ import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 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.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentSetupAvatarBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.models.SetupCustomization
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.AvatarView
-import com.habitrpg.android.habitica.ui.SpeechBubbleView
 import com.habitrpg.android.habitica.ui.activities.SetupActivity
 import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
-import io.reactivex.functions.Consumer
 import java.util.*
 import javax.inject.Inject
 
-class AvatarSetupFragment : BaseFragment() {
+class AvatarSetupFragment : BaseFragment<FragmentSetupAvatarBinding>() {
 
     @Inject
     lateinit var customizationRepository: SetupCustomizationRepository
@@ -40,19 +32,15 @@ class AvatarSetupFragment : BaseFragment() {
     lateinit var userRepository: UserRepository
     @Inject
     lateinit var inventoryRepository: InventoryRepository
-    
+
+    override var binding: FragmentSetupAvatarBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSetupAvatarBinding {
+        return FragmentSetupAvatarBinding.inflate(inflater, container, false)
+    }
+
     var activity: SetupActivity? = null
     var width: Int = 0
-    private val avatarView: AvatarView? by bindOptionalView(R.id.avatarView)
-    private val customizationList: RecyclerView? by bindOptionalView(R.id.customization_list)
-    private val subCategoryTabs: TabLayout? by bindOptionalView(R.id.subcategory_tabs)
-    private val bodyButton: AvatarCategoryView? by bindOptionalView(R.id.body_button)
-    private val skinButton: AvatarCategoryView? by bindOptionalView(R.id.skin_button)
-    private val hairButton: AvatarCategoryView? by bindOptionalView(R.id.hair_button)
-    private val extrasButton: AvatarCategoryView? by bindOptionalView(R.id.extras_button)
-    private val caretView: ImageView? by bindOptionalView(R.id.caret_view)
-    private val speechBubbleView: SpeechBubbleView? by bindOptionalView(R.id.speech_bubble)
-    private val randomizeButton: Button? by bindOptionalView(R.id.randomize_button)
 
     internal var adapter: CustomizationSetupAdapter? = null
 
@@ -63,29 +51,22 @@ class AvatarSetupFragment : BaseFragment() {
     private var activeSubCategory: String? = null
     private var random = Random()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_setup_avatar)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         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(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)
         layoutManager.orientation = LinearLayoutManager.HORIZONTAL
-        this.customizationList?.layoutManager = layoutManager
+        binding?.customizationDrawer?.binding?.customizationList?.layoutManager = layoutManager
 
-        this.customizationList?.adapter = this.adapter
+        binding?.customizationDrawer?.binding?.customizationList?.adapter = this.adapter
 
-        this.subCategoryTabs?.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
             override fun onTabSelected(tab: TabLayout.Tab) {
                 val position = tab.position
                 if (position < subcategories.size) {
@@ -99,11 +80,11 @@ class AvatarSetupFragment : BaseFragment() {
             override fun onTabReselected(tab: TabLayout.Tab) { /* no-on */ }
         })
 
-        bodyButton?.setOnClickListener { selectedBodyCategory() }
-        skinButton?.setOnClickListener { selectedSkinCategory() }
-        hairButton?.setOnClickListener { selectedHairCategory() }
-        extrasButton?.setOnClickListener { selectedExtrasCategory() }
-        randomizeButton?.setOnClickListener { randomizeCharacter() }
+        binding?.customizationDrawer?.binding?.bodyButton?.setOnClickListener { selectedBodyCategory() }
+        binding?.customizationDrawer?.binding?.skinButton?.setOnClickListener { selectedSkinCategory() }
+        binding?.customizationDrawer?.binding?.hairButton?.setOnClickListener { selectedHairCategory() }
+        binding?.customizationDrawer?.binding?.extrasButton?.setOnClickListener { selectedExtrasCategory() }
+        binding?.randomizeButton?.setOnClickListener { randomizeCharacter() }
 
         this.selectedBodyCategory()
 
@@ -118,12 +99,8 @@ class AvatarSetupFragment : BaseFragment() {
             this.updateAvatar()
         }
         this.selectedBodyCategory()
-    }
-
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        if (isVisibleToUser && context != null) {
-            speechBubbleView?.animateText(context?.getString(R.string.avatar_setup_description) ?: "")
+        if (context != null) {
+            binding?.speechBubble?.animateText(context?.getString(R.string.avatar_setup_description) ?: "")
         }
     }
 
@@ -140,7 +117,7 @@ class AvatarSetupFragment : BaseFragment() {
 
     fun setUser(user: User?) {
         this.user = user
-        if (avatarView != null) {
+        if (binding?.avatarView != null) {
             updateAvatar()
         }
         if (this.adapter != null) {
@@ -152,48 +129,48 @@ class AvatarSetupFragment : BaseFragment() {
 
     private fun updateAvatar() {
         user?.let {
-            avatarView?.setAvatar(it)
+            binding?.avatarView?.setAvatar(it)
         }
     }
 
     private fun selectedBodyCategory() {
-        activateButton(bodyButton)
+        activateButton(binding?.customizationDrawer?.binding?.bodyButton)
         this.activeCategory = SetupCustomizationRepository.CATEGORY_BODY
-        this.subCategoryTabs?.removeAllTabs()
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
         this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_SIZE, SetupCustomizationRepository.SUBCATEGORY_SHIRT)
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_size)?.let { this.subCategoryTabs?.addTab(it) }
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_shirt)?.let { this.subCategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_size)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_shirt)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
         loadCustomizations()
     }
 
     private fun selectedSkinCategory() {
-        activateButton(skinButton)
+        activateButton(binding?.customizationDrawer?.binding?.skinButton)
         this.activeCategory = SetupCustomizationRepository.CATEGORY_SKIN
-        this.subCategoryTabs?.removeAllTabs()
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
         this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_COLOR)
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_skin_color)?.let { this.subCategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_skin_color)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
         loadCustomizations()
     }
 
     private fun selectedHairCategory() {
-        activateButton(hairButton)
+        activateButton(binding?.customizationDrawer?.binding?.hairButton)
         this.activeCategory = SetupCustomizationRepository.CATEGORY_HAIR
-        this.subCategoryTabs?.removeAllTabs()
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
         this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_BANGS, SetupCustomizationRepository.SUBCATEGORY_COLOR, SetupCustomizationRepository.SUBCATEGORY_PONYTAIL)
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_hair_bangs)?.let { this.subCategoryTabs?.addTab(it) }
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_hair_color)?.let { this.subCategoryTabs?.addTab(it) }
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_hair_ponytail)?.let { this.subCategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_hair_bangs)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_hair_color)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_hair_ponytail)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
         loadCustomizations()
     }
 
     private fun selectedExtrasCategory() {
-        activateButton(extrasButton)
+        activateButton(binding?.customizationDrawer?.binding?.extrasButton)
         this.activeCategory = SetupCustomizationRepository.CATEGORY_EXTRAS
-        this.subCategoryTabs?.removeAllTabs()
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
         this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_GLASSES, SetupCustomizationRepository.SUBCATEGORY_FLOWER, SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR)
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_glasses)?.let { this.subCategoryTabs?.addTab(it) }
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_flower)?.let { this.subCategoryTabs?.addTab(it) }
-        subCategoryTabs?.newTab()?.setText(R.string.avatar_wheelchair)?.let { this.subCategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_glasses)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_flower)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_wheelchair)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
         loadCustomizations()
     }
 
@@ -208,7 +185,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(updateData).subscribeWithErrorHandler({}))
     }
 
     @Suppress("ReturnCount")
@@ -231,12 +208,12 @@ class AvatarSetupFragment : BaseFragment() {
         this.activeButton = button
         this.activeButton?.setActive(true)
         val location = IntArray(2)
-        val params = this.caretView?.layoutParams as? RelativeLayout.LayoutParams
+        val params = binding?.customizationDrawer?.binding?.caretView?.layoutParams as? RelativeLayout.LayoutParams
         this.activeButton?.getLocationOnScreen(location)
         val r = resources
         val px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, r.displayMetrics).toInt()
         params?.marginStart = location[0] + px
-        this.caretView?.layoutParams = params
+        binding?.customizationDrawer?.binding?.caretView?.layoutParams = params
     }
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
index b29bbd90a..009da53eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
@@ -9,9 +9,14 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentIntroBinding
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 
-class IntroFragment : BaseFragment() {
+class IntroFragment : BaseFragment<FragmentIntroBinding>() {
+
+    override var binding: FragmentIntroBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentIntroBinding {
+        return FragmentIntroBinding.inflate(inflater, container, false)
+    }
 
-    private var binding: FragmentIntroBinding? = null
     private var image: Drawable? = null
     private var titleImage: Drawable? = null
     private var subtitle: String? = null
@@ -19,12 +24,6 @@ class IntroFragment : BaseFragment() {
     private var description: String? = null
     private var backgroundColor: Int? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentIntroBinding.inflate(layoutInflater, container, false)
-        return binding?.root
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
index f3f9b45e9..b3a1a1bdf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
@@ -5,81 +5,69 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentSetupTasksBinding
 import com.habitrpg.android.habitica.models.tasks.Days
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.AvatarView
-import com.habitrpg.android.habitica.ui.SpeechBubbleView
 import com.habitrpg.android.habitica.ui.activities.SetupActivity
 import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.util.*
 
-class TaskSetupFragment : BaseFragment() {
-
+class TaskSetupFragment : BaseFragment<FragmentSetupTasksBinding>() {
 
     var activity: SetupActivity? = null
     var width: Int = 0
-    private val recyclerView: RecyclerView? by bindOptionalView(R.id.recyclerView)
-    private val avatarView: AvatarView? by bindOptionalView(R.id.avatarView)
-    private val speechBubbleView: SpeechBubbleView? by bindOptionalView(R.id.speech_bubble)
-    private val heartView: ImageView? by bindOptionalView(R.id.heart_icon)
+
+    override var binding: FragmentSetupTasksBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSetupTasksBinding {
+        return FragmentSetupTasksBinding.inflate(inflater, container, false)
+    }
+
     internal var adapter: TaskSetupAdapter = TaskSetupAdapter()
     private var taskGroups: List<List<String>> = listOf()
     private var tasks: List<List<Any>> = listOf()
     private var user: User? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        return container?.inflate(R.layout.fragment_setup_tasks)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         this.setTasks()
 
         this.adapter = TaskSetupAdapter()
         this.adapter.setTaskList(this.taskGroups)
-        this.recyclerView?.layoutManager = GridLayoutManager(activity, 2)
-        this.recyclerView?.adapter = this.adapter
+        binding?.recyclerView?.layoutManager = GridLayoutManager(activity, 2)
+        binding?.recyclerView?.adapter = this.adapter
 
         if (this.user != null) {
             this.updateAvatar()
         }
 
-        heartView?.setImageDrawable(BitmapDrawable(HabiticaIconsHelper.imageOfHeartLightBg()))
+        binding?.heartIcon?.setImageDrawable(BitmapDrawable(HabiticaIconsHelper.imageOfHeartLightBg()))
     }
 
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        if (isVisibleToUser && context != null) {
-            speechBubbleView?.animateText(context?.getString(R.string.task_setup_description) ?: "")
+    override fun onResume() {
+        super.onResume()
+        if (context != null) {
+            binding?.speechBubble?.animateText(context?.getString(R.string.task_setup_description) ?: "")
         }
     }
 
     fun setUser(user: User?) {
         this.user = user
-        if (avatarView != null) {
+        if (binding?.avatarView != null) {
             updateAvatar()
         }
     }
 
     private fun updateAvatar() {
         user?.let {
-            avatarView?.setAvatar(it)
+            binding?.avatarView?.setAvatar(it)
         }
     }
 
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..aefed5c54 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
@@ -2,111 +2,100 @@ package com.habitrpg.android.habitica.ui.fragments.setup
 
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.graphics.drawable.VectorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.EditText
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentWelcomeBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
-import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.ui.SpeechBubbleView
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.BackpressureStrategy
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.PublishSubject
-import java.util.*
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class WelcomeFragment : BaseFragment() {
+class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
 
     val nameValidEvents = PublishSubject.create<Boolean>()
 
     @Inject
     lateinit var userRepository: UserRepository
 
-    private val speechBubbleView: SpeechBubbleView? by bindView(R.id.speech_bubble)
-    private val displayNameEditText: EditText by bindView(R.id.display_name_edit_text)
-    private val usernameEditText: EditText by bindView(R.id.username_edit_text)
-    private val issuesTextView: TextView by bindView(R.id.issues_text_view)
+    override var binding: FragmentWelcomeBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentWelcomeBinding {
+        return FragmentWelcomeBinding.inflate(inflater, container, false)
+    }
 
     private val displayNameVerificationEvents = PublishSubject.create<String>()
     private val usernameVerificationEvents = PublishSubject.create<String>()
 
     private val checkmarkIcon: Drawable by lazy {
-        BitmapDrawable(resources, HabiticaIconsHelper.imageOfCheckmark(ContextCompat.getColor(context!!, R.color.green_50), 1f))
+        context?.let {
+            BitmapDrawable(resources, HabiticaIconsHelper.imageOfCheckmark(ContextCompat.getColor(it, R.color.green_50), 1f))
+        } ?: VectorDrawable()
     }
     private val alertIcon: Drawable by lazy {
         BitmapDrawable(resources, HabiticaIconsHelper.imageOfAlertIcon())
     }
     val username: String
-    get() = usernameEditText.text.toString()
+    get() = binding?.usernameEditText?.text?.toString() ?: ""
     val displayName: String
-    get() = displayNameEditText.text.toString()
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_welcome)
-    }
+    get() = binding?.displayNameEditText?.text?.toString() ?: ""
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
-        speechBubbleView?.animateText(context?.getString(R.string.welcome_text) ?: "")
+        binding?.speechBubble?.animateText(context?.getString(R.string.welcome_text) ?: "")
 
         super.onCreate(savedInstanceState)
 
-        displayNameEditText.addTextChangedListener(OnChangeTextWatcher { p0, _, _, _ ->
+        binding?.displayNameEditText?.addTextChangedListener(OnChangeTextWatcher { p0, _, _, _ ->
                 displayNameVerificationEvents.onNext(p0.toString())
         })
-        usernameEditText.addTextChangedListener(OnChangeTextWatcher { p0, _, _, _ ->
+        binding?.usernameEditText?.addTextChangedListener(OnChangeTextWatcher { p0, _, _, _ ->
                 usernameVerificationEvents.onNext(p0.toString())
         })
 
         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
+                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
+                        binding?.issuesTextView?.visibility = View.GONE
                     } else {
-                        displayNameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
-                        issuesTextView.visibility = View.VISIBLE
-                        issuesTextView.text = context?.getString(R.string.display_name_length_error)
+                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
+                        binding?.issuesTextView?.visibility = View.VISIBLE
+                        binding?.issuesTextView?.text = context?.getString(R.string.display_name_length_error)
                     }
-                }))
+                })
         compositeSubscription.add(usernameVerificationEvents.toFlowable(BackpressureStrategy.DROP)
                 .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
+                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
+                        binding?.issuesTextView?.visibility = View.GONE
                     } else {
-                        usernameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
-                        issuesTextView.visibility = View.VISIBLE
-                        issuesTextView.text = it.issues.joinToString("\n")
+                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
+                        binding?.issuesTextView?.visibility = View.VISIBLE
+                        binding?.issuesTextView?.text = it.issues.joinToString("\n")
                     }
                     nameValidEvents.onNext(it.isUsable)
-                }))
+                })
 
         compositeSubscription.add(userRepository.getUser().firstElement().subscribe {
-            displayNameEditText.setText(it.profile?.name)
+            binding?.displayNameEditText?.setText(it.profile?.name)
             displayNameVerificationEvents.onNext(it.profile?.name ?: "")
-            usernameEditText.setText(it.username)
+            binding?.usernameEditText?.setText(it.username)
             usernameVerificationEvents.onNext(it.username ?: "")
         })
     }
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..e1dc6412e 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
@@ -5,35 +5,34 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import javax.inject.Inject
 import javax.inject.Named
 
-class SkillTasksRecyclerViewFragment() : BaseFragment() {
+class SkillTasksRecyclerViewFragment : BaseFragment<FragmentRecyclerviewBinding>() {
     @Inject
     lateinit var taskRepository: TaskRepository
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
     var taskType: String? = null
 
-    private val recyclerView: RecyclerView? by bindView(R.id.recyclerView)
+    override var binding: FragmentRecyclerviewBinding? = null
 
-    var adapter: SkillTasksRecyclerViewAdapter = SkillTasksRecyclerViewAdapter(null, true)
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    var adapter: SkillTasksRecyclerViewAdapter = SkillTasksRecyclerViewAdapter()
     internal var layoutManager: LinearLayoutManager? = null
 
     private val taskSelectionEvents = PublishSubject.create<Task>()
@@ -42,11 +41,6 @@ class SkillTasksRecyclerViewFragment() : BaseFragment() {
         return taskSelectionEvents.toFlowable(BackpressureStrategy.DROP)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_recyclerview)
-    }
-
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
@@ -54,16 +48,14 @@ class SkillTasksRecyclerViewFragment() : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         val layoutManager = LinearLayoutManager(context)
-        recyclerView?.layoutManager = layoutManager
+        binding?.recyclerView?.layoutManager = layoutManager
 
-        adapter = SkillTasksRecyclerViewAdapter(null, true)
-        compositeSubscription.add(adapter.getTaskSelectionEvents().subscribe(Consumer {
+        adapter = SkillTasksRecyclerViewAdapter()
+        compositeSubscription.add(adapter.getTaskSelectionEvents().subscribe({
             taskSelectionEvents.onNext(it)
         }, RxErrorHandler.handleEmptyError()))
-        recyclerView?.adapter = adapter
+        binding?.recyclerView?.adapter = adapter
     }
 
     override fun onResume() {
@@ -73,8 +65,8 @@ class SkillTasksRecyclerViewFragment() : BaseFragment() {
         if (taskType == Task.TYPE_TODO) {
             tasks = tasks.map { it.where().equalTo("completed", false).findAll() }
         }
-        compositeSubscription.add(tasks.subscribe(Consumer {
-            adapter.updateData(it)
+        compositeSubscription.add(tasks.subscribe({
+            adapter.data = 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..c7c9962b6 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
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.skills
 
 import android.app.Activity
-import android.app.ProgressDialog
 import android.content.Intent
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
@@ -11,6 +10,7 @@ import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentSkillsBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.Skill
@@ -21,24 +21,26 @@ import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity
 import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import io.reactivex.Flowable
-import io.reactivex.Observable
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_skills.*
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
 
-class SkillsFragment : BaseMainFragment() {
+class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
 
     private val TASK_SELECTION_ACTIVITY = 10
     private val MEMBER_SELECTION_ACTIVITY = 11
 
     internal var adapter: SkillsRecyclerViewAdapter? = null
     private var selectedSkill: Skill? = null
-    @Suppress("DEPRECATION")
-    private var progressDialog: ProgressDialog? = null
+
+
+    override var binding: FragmentSkillsBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSkillsBinding {
+        return FragmentSkillsBinding.inflate(inflater, container, false)
+    }
 
     override var user: User? = null
         set(value) {
@@ -47,15 +49,13 @@ 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"
         this.tutorialText = getString(R.string.tutorial_skills)
-
-        return inflater.inflate(R.layout.fragment_skills, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -65,11 +65,9 @@ class SkillsFragment : BaseMainFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
-        recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
-        recyclerView.adapter = adapter
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
+        binding?.recyclerView?.adapter = adapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
     }
 
     private fun checkUserLoadSkills() {
@@ -80,10 +78,18 @@ class SkillsFragment : BaseMainFragment() {
         adapter?.level = this.user?.stats?.lvl ?: 0
         adapter?.specialItems = this.user?.items?.special
         user?.let { user ->
-            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())
+            Flowable.combineLatest(userRepository.getSkills(user),
+                    userRepository.getSpecialItems(user), { skills, items ->
+                val allEntries = mutableListOf<Skill>()
+                for (skill in skills) {
+                    allEntries.add(skill)
+                }
+                for (item in items) {
+                    allEntries.add(item)
+                }
+                return@combineLatest allEntries
+            })
+                    .subscribe({ skills -> adapter?.setSkillList(skills) }, RxErrorHandler.handleEmptyError())
         }
     }
 
@@ -117,7 +123,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 +154,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..b72324f68 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
@@ -26,17 +25,20 @@ import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
 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.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.Disposable
 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() {
+class ChatFragment : BaseFragment<FragmentChatBinding>() {
+
+    override var binding: FragmentChatBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentChatBinding {
+        return FragmentChatBinding.inflate(inflater, container, false)
+    }
 
     var viewModel: GroupViewModel? = null
 
@@ -46,6 +48,7 @@ class ChatFragment : BaseFragment() {
     private var chatAdapter: ChatRecyclerViewAdapter? = null
     private var navigatedOnceToFragment = false
     private var isScrolledToBottom = true
+    private var isFirstRefresh = true
     private var refreshDisposable: Disposable? = null
     var autocompleteContext: String = ""
 
@@ -53,63 +56,51 @@ class ChatFragment : BaseFragment() {
         component.inject(this)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_chat, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         val layoutManager = LinearLayoutManager(context)
         layoutManager.reverseLayout = true
         layoutManager.stackFromEnd = false
-        recyclerView.layoutManager = layoutManager
+        binding?.recyclerView?.layoutManager = layoutManager
 
-        chatAdapter = ChatRecyclerViewAdapter(null, true, null, true)
+        chatAdapter = ChatRecyclerViewAdapter(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?.communityGuidelinesAccepted == true
         })
     }
 
@@ -118,13 +109,14 @@ class ChatFragment : BaseFragment() {
         stopAutoRefreshing()
     }
 
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        if (isVisibleToUser) {
-            startAutoRefreshing()
-        } else {
-            stopAutoRefreshing()
-        }
+    override fun onResume() {
+        super.onResume()
+        startAutoRefreshing()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        stopAutoRefreshing()
     }
 
     private fun startAutoRefreshing() {
@@ -133,9 +125,10 @@ class ChatFragment : BaseFragment() {
         }
         refreshDisposable = Observable.interval(30, TimeUnit.SECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer {
+                .subscribe({
             refresh()
         }, RxErrorHandler.handleEmptyError())
+        refresh()
     }
 
     private fun stopAutoRefreshing() {
@@ -146,18 +139,19 @@ 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 || isFirstRefresh) {
+                binding?.recyclerView?.scrollToPosition(0)
             }
+            isFirstRefresh = false
         }
     }
 
@@ -194,14 +188,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 }
+        chatAdapter?.data = chatMessages
+        viewModel?.socialRepository?.getUnmanagedCopy(chatMessages)?.let { binding?.chatBarView?.chatMessages = it }
 
         viewModel?.gotNewMessages = true
 
@@ -210,9 +204,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..8a339bee4 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
@@ -7,79 +7,55 @@ import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.lifecycle.Observer
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 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.FragmentGuildDetailBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
 import com.habitrpg.android.habitica.ui.activities.GroupInviteActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaIcons
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
 import java.util.*
 import javax.inject.Inject
 
-class GuildDetailFragment : BaseFragment() {
+class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
 
     @Inject
     lateinit var configManager: AppConfigManager
 
-    val refreshLayout: SwipeRefreshLayout by bindView(R.id.refreshLayout)
-    private val guildTitleView: TextView by bindView(R.id.title_view)
-    private val guildMembersIconView: ImageView by bindView(R.id.guild_members_icon)
-    private val guildMembersTextView: TextView by bindView(R.id.guild_members_text)
-    private val guildBankIconView: ImageView by bindView(R.id.guild_bank_icon)
-    private val guildBankTextView: TextView by bindView(R.id.guild_bank_text)
-    private val guildSummaryView: TextView by bindView(R.id.guild_summary)
-    private val guildDescriptionView: TextView by bindView(R.id.guild_description)
-    private val leaderWrapperView: ViewGroup by bindView(R.id.leader_wrapper)
-    private val leaderAvatarView: AvatarView by bindView(R.id.leader_avatar_view)
-    private val leaderProfileNameView: UsernameLabel by bindView(R.id.leader_profile_name)
-    private val leaderUsernameView: TextView by bindView(R.id.leader_username)
+    override var binding: FragmentGuildDetailBinding? = null
 
-    val inviteToGuildButton: Button by bindView(R.id.invite_button)
-    private val joinGuildButton: Button by bindView(R.id.join_button)
-    private val leaveGuildButton: Button by bindView(R.id.leave_button)
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGuildDetailBinding {
+        return FragmentGuildDetailBinding.inflate(inflater, container, false)
+    }
 
     var viewModel: GroupViewModel? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
-            inflater.inflate(R.layout.fragment_guild_detail, container, false)
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
+        binding?.refreshLayout?.setOnRefreshListener { this.refresh() }
 
-        refreshLayout.setOnRefreshListener { this.refresh() }
+        viewModel?.getGroupData()?.observe(viewLifecycleOwner, { updateGuild(it) })
+        viewModel?.getLeaderData()?.observe(viewLifecycleOwner, { setLeader(it) })
+        viewModel?.getIsMemberData()?.observe(viewLifecycleOwner, { updateMembership(it) })
 
-        viewModel?.getGroupData()?.observe(viewLifecycleOwner, Observer { updateGuild(it) })
-        viewModel?.getLeaderData()?.observe(viewLifecycleOwner, Observer { setLeader(it) })
-        viewModel?.getIsMemberData()?.observe(viewLifecycleOwner, Observer { updateMembership(it) })
-
-        guildDescriptionView.movementMethod = LinkMovementMethod.getInstance()
-        guildBankIconView.setImageBitmap(HabiticaIconsHelper.imageOfGem())
-        leaveGuildButton.setOnClickListener {
+        binding?.guildDescription?.movementMethod = LinkMovementMethod.getInstance()
+        binding?.guildBankIcon?.setImageBitmap(HabiticaIconsHelper.imageOfGem())
+        binding?.leaveButton?.setOnClickListener {
             leaveGuild()
         }
-        joinGuildButton.setOnClickListener {
+        binding?.joinButton?.setOnClickListener {
             viewModel?.joinGroup {
                 val activity = activity as? MainActivity
                 if (activity != null) {
@@ -87,11 +63,11 @@ class GuildDetailFragment : BaseFragment() {
                 }
             }
         }
-        inviteToGuildButton.setOnClickListener {
+        binding?.inviteButton?.setOnClickListener {
             val intent = Intent(activity, GroupInviteActivity::class.java)
             startActivityForResult(intent, GroupInviteActivity.RESULT_SEND_INVITES)
         }
-        leaderWrapperView.setOnClickListener {
+        binding?.leaderWrapper?.setOnClickListener {
             viewModel?.getGroupData()?.value?.leaderID?.let {leaderID ->
                 val profileDirections = MainNavDirections.openProfileActivity(leaderID)
                 MainNavigationController.navigate(profileDirections)
@@ -103,15 +79,15 @@ class GuildDetailFragment : BaseFragment() {
         if (leader == null) {
             return
         }
-        leaderAvatarView.setAvatar(leader)
-        leaderProfileNameView.username = leader.profile?.name
-        leaderProfileNameView.tier = leader.contributor?.level ?: 0
-        leaderUsernameView.text = leader.formattedUsername
+        binding?.leaderAvatarView?.setAvatar(leader)
+        binding?.leaderProfileName?.username = leader.profile?.name
+        binding?.leaderProfileName?.tier = leader.contributor?.level ?: 0
+        binding?.leaderUsername?.text = leader.formattedUsername
     }
 
     private fun updateMembership(isMember: Boolean?) {
-        joinGuildButton.visibility = if (isMember == true) View.GONE else View.VISIBLE
-        leaveGuildButton.visibility = if (isMember == true) View.VISIBLE else View.GONE
+        binding?.joinButton?.visibility = if (isMember == true) View.GONE else View.VISIBLE
+        binding?.leaveButton?.visibility = if (isMember == true) View.VISIBLE else View.GONE
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -150,7 +126,7 @@ class GuildDetailFragment : BaseFragment() {
 
     private fun refresh() {
         viewModel?.retrieveGroup {
-            refreshLayout.isRefreshing = false
+            binding?.refreshLayout?.isRefreshing = false
         }
     }
 
@@ -182,12 +158,12 @@ class GuildDetailFragment : BaseFragment() {
     }
 
     private fun updateGuild(guild: Group?) {
-        guildTitleView.text = guild?.name
-        guildMembersIconView.setImageBitmap(HabiticaIcons.imageOfGuildCrestMedium((guild?.memberCount ?: 0).toFloat()))
-        guildMembersTextView.text = guild?.memberCount.toString()
-        guildBankTextView.text = guild?.gemCount.toString()
-        guildSummaryView.setMarkdown(guild?.summary)
-        guildDescriptionView.setMarkdown(guild?.description)
+        binding?.titleView?.text = guild?.name
+        binding?.guildMembersIcon?.setImageBitmap(HabiticaIcons.imageOfGuildCrestMedium((guild?.memberCount ?: 0).toFloat()))
+        binding?.guildMembersText?.text = guild?.memberCount.toString()
+        binding?.guildBankText?.text = guild?.gemCount.toString()
+        binding?.guildSummary?.setMarkdown(guild?.summary)
+        binding?.guildDescription?.setMarkdown(guild?.description)
     }
 
     companion object {
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..949c1ca51 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
@@ -6,61 +6,61 @@ import android.os.Bundle
 import android.view.*
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
 
-class GuildFragment : BaseMainFragment() {
+class GuildFragment : BaseMainFragment<FragmentViewpagerBinding>() {
 
-    private val viewPager: androidx.viewpager.widget.ViewPager? by bindView(R.id.viewPager)
     internal lateinit var viewModel: GroupViewModel
     private var guildInformationFragment: GuildDetailFragment? = null
     private var chatFragment: ChatFragment? = null
 
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.usesTabLayout = true
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_viewpager, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         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)
             viewModel.setGroupID(args.groupID)
         }
 
-        viewPager?.currentItem = 0
+        binding?.viewPager?.currentItem = 0
 
         setViewPagerAdapter()
         setFragments()
 
         arguments?.let {
             val args = GuildFragmentArgs.fromBundle(it)
-            viewPager?.currentItem = args.tabToOpen
+            binding?.viewPager?.currentItem = args.tabToOpen
         }
 
         if (viewModel.groupID == "f2db2a7f-13c5-454d-b3ee-ea1f5089e601") {
@@ -130,10 +130,9 @@ class GuildFragment : BaseMainFragment() {
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
 
-        viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): Fragment {
-
                 val fragment: Fragment?
 
                 when (position) {
@@ -165,7 +164,7 @@ class GuildFragment : BaseMainFragment() {
             }
         }
 
-        viewPager?.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
+        binding?.viewPager?.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
                 if (position == 1) {
                     chatFragment?.setNavigatedToFragment()
@@ -181,7 +180,7 @@ class GuildFragment : BaseMainFragment() {
             override fun onPageScrollStateChanged(state: Int) { /* no-on */ }
         })
 
-        tabLayout?.setupWithViewPager(viewPager)
+        tabLayout?.setupWithViewPager(binding?.viewPager)
     }
 
     private fun displayEditForm() {
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..6dec4924c 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
@@ -1,29 +1,35 @@
 package com.habitrpg.android.habitica.ui.fragments.social
 
 import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.TextView
+import androidx.core.net.toUri
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentGuildsOverviewBinding
+import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.Consumer
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.realm.RealmResults
 import java.util.*
 import javax.inject.Inject
 
-class GuildsOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+class GuildsOverviewFragment : BaseMainFragment<FragmentGuildsOverviewBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+
+    override var binding: FragmentGuildsOverviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGuildsOverviewBinding {
+        return FragmentGuildsOverviewBinding.inflate(inflater, container, false)
+    }
 
-    private var binding: FragmentGuildsOverviewBinding? = null
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
@@ -40,21 +46,17 @@ class GuildsOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.w
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentGuildsOverviewBinding.inflate(inflater, container, false)
-        return binding?.root
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         binding?.refreshLayout?.setOnRefreshListener(this)
         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()
@@ -62,6 +64,42 @@ class GuildsOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.w
         super.onDestroy()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_create_refresh, menu)
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.menu_refresh -> {
+                onRefresh()
+                return true
+            }
+            R.id.menu_create_item -> {
+                showCreationDialog()
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun showCreationDialog() {
+        val context = context ?: return
+        val dialog = HabiticaAlertDialog(context)
+        dialog.setTitle(R.string.create_guild)
+        dialog.setMessage(R.string.create_guild_description)
+        dialog.addButton(R.string.open_website, true, false) { _, _ ->
+            val uriUrl = "https://habitica.com/groups/myGuilds".toUri()
+            val launchBrowser = Intent(Intent.ACTION_VIEW, uriUrl)
+            val l = context.packageManager.queryIntentActivities(launchBrowser, PackageManager.MATCH_DEFAULT_ONLY)
+            val notHabitica = l.first { !it.activityInfo.processName.contains("habitica") }
+            launchBrowser.setPackage(notHabitica.activityInfo.processName)
+            startActivity(launchBrowser)
+        }
+        dialog.addCloseButton()
+        dialog.show()
+    }
+
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
@@ -73,7 +111,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..016877148 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
@@ -7,11 +7,14 @@ 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 androidx.paging.DataSource
+import androidx.paging.PagedList
 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
@@ -26,15 +29,22 @@ import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel
 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 io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.functions.Action
+import io.reactivex.rxjava3.functions.Consumer
+import java.lang.Exception
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBinding>() {
+
+    override var binding: FragmentInboxMessageListBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentInboxMessageListBinding {
+        return FragmentInboxMessageListBinding.inflate(inflater, container, false)
+    }
 
     @Inject
     lateinit var socialRepository: SocialRepository
@@ -46,54 +56,62 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
     private var replyToUserUUID: String? = null
 
     private var viewModel: InboxViewModel? = null
+    private var refreshDisposable: Disposable? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        return inflater.inflate(R.layout.fragment_inbox_message_list, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        showsBackButton = true
         super.onViewCreated(view, savedInstanceState)
-        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
-
-        chatAdapter = InboxAdapter(user)
-        viewModel?.messages?.observe(this.viewLifecycleOwner, Observer { chatAdapter?.submitList(it) })
-        viewModel?.getMemberData()?.observe(this.viewLifecycleOwner, Observer {
-            activity?.binding?.toolbarTitle?.text = it?.profile?.name
-        })
-        recyclerView.adapter = chatAdapter
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
-        chatAdapter?.let { adapter ->
-            compositeSubscription.add(adapter.getUserLabelClickFlowable().subscribe(Consumer<String> {
-                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()))
+        layoutManager.reverseLayout = true
+        layoutManager.stackFromEnd = false
+        binding?.recyclerView?.layoutManager = layoutManager
+        val observable = if (replyToUserUUID?.isNotBlank() == true) {
+            apiClient.getMember(replyToUserUUID!!)
+        } else {
+            apiClient.getMemberWithUsername(chatRoomUser ?: "")
         }
+        compositeSubscription.add(observable.subscribe( { member ->
+            setReceivingUser(member.username, member.id)
+            activity?.title = member.displayName
+            chatAdapter = InboxAdapter(user, member)
+            viewModel?.messages?.observe(this.viewLifecycleOwner, { chatAdapter?.submitList(it) })
 
-        chatBarView.sendAction = { sendMessage(it) }
-        chatBarView.maxChatLength = configManager.maxChatLength()
+            binding?.recyclerView?.adapter = chatAdapter
+            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+            chatAdapter?.let { adapter ->
+                compositeSubscription.add(adapter.getUserLabelClickFlowable().subscribe({
+                    FullProfileActivity.open(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()))
+            }
+        }, RxErrorHandler.handleEmptyError()))
 
-        communityGuidelinesView.visibility = View.GONE
+        binding?.chatBarView?.sendAction = { sendMessage(it) }
+        binding?.chatBarView?.maxChatLength = configManager.maxChatLength()
+
+        binding?.chatBarView?.hasAcceptedGuidelines = true
     }
 
     override fun onResume() {
         if (replyToUserUUID?.isNotBlank() != true && chatRoomUser?.isNotBlank() != true) {
-            fragmentManager?.popBackStack()
+            parentFragmentManager.popBackStack()
         }
+        startAutoRefreshing()
         super.onResume()
     }
 
@@ -104,6 +122,18 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
         super.onAttach(context)
     }
 
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        stopAutoRefreshing()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        stopAutoRefreshing()
+    }
+
+
     override fun onDestroy() {
         socialRepository.close()
         super.onDestroy()
@@ -111,7 +141,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)
     }
 
@@ -129,37 +158,50 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
         component.inject(this)
     }
 
+    private fun startAutoRefreshing() {
+        if (refreshDisposable != null && refreshDisposable?.isDisposed != true) {
+            refreshDisposable?.dispose()
+        }
+        refreshDisposable = Observable.interval(30, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({
+                    refreshConversation()
+                }, RxErrorHandler.handleEmptyError())
+        refreshConversation()
+    }
+
+    private fun stopAutoRefreshing() {
+        if (refreshDisposable?.isDisposed != true) {
+            refreshDisposable?.dispose()
+            refreshDisposable = null
+        }
+    }
+
     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(), {
                     viewModel?.invalidateDataSource()
                 }))
     }
 
-    override fun onRefresh() {
-        this.swipeRefreshLayout?.isRefreshing = true
-        this.refreshConversation()
-    }
-
     private fun sendMessage(chatText: String) {
         viewModel?.memberID?.let {userID ->
             socialRepository.postPrivateMessage(userID, chatText)
                     .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())
         }
     }
 
-    private fun setReceivingUser(chatRoomUser: String?, replyToUserUUID: String) {
+    private fun setReceivingUser(chatRoomUser: String?, replyToUserUUID: String?) {
         this.chatRoomUser = chatRoomUser
         this.replyToUserUUID = replyToUserUUID
         activity?.title = chatRoomUser
@@ -187,8 +229,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..a562f342a 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
@@ -4,10 +4,12 @@ import android.content.Context
 import android.os.Bundle
 import android.view.*
 import android.widget.TextView
+import com.habitrpg.android.habitica.BuildConfig
 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.DialogChooseMessageRecipientBinding
+import com.habitrpg.android.habitica.databinding.FragmentInboxBinding
 import com.habitrpg.android.habitica.extensions.getAgoString
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
@@ -19,13 +21,11 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-import io.reactivex.functions.Consumer
 import io.realm.RealmResults
-import kotlinx.android.synthetic.main.fragment_inbox.*
 import javax.inject.Inject
 import javax.inject.Named
 
-class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
+class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
 
     @Inject
     lateinit var socialRepository: SocialRepository
@@ -34,24 +34,25 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
     @Inject
     lateinit var configManager: AppConfigManager
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+    override var binding: FragmentInboxBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentInboxBinding {
+        return FragmentInboxBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        compositeSubscription.add(this.socialRepository.markPrivateMessagesRead(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
-
-
-        return inflater.inflate(R.layout.fragment_inbox, container, false)
+        compositeSubscription.add(this.socialRepository.markPrivateMessagesRead(user).subscribe({ }, RxErrorHandler.handleEmptyError()))
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        inbox_refresh_layout?.setOnRefreshListener(this)
+        binding?.inboxRefreshLayout?.setOnRefreshListener(this)
 
-        compositeSubscription.add(userRepository.getUser().map { user?.inbox?.optOut ?: false }.distinctUntilChanged().subscribe {
-            opt_out_view.visibility = if (it) View.VISIBLE else View.GONE
+        compositeSubscription.add(userRepository.getUser().map { it.inbox?.optOut ?: false }.distinctUntilChanged().subscribe {
+            binding?.optOutView?.visibility = if (it) View.VISIBLE else View.GONE
         })
 
         loadMessages()
@@ -59,7 +60,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()))
     }
@@ -87,7 +88,9 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
     }
 
     private fun openNewMessageDialog() {
-        assert(this.activity != null)
+        if (BuildConfig.DEBUG && this.activity == null) {
+            error("Assertion failed")
+        }
         val binding = DialogChooseMessageRecipientBinding.inflate(layoutInflater)
         this.activity?.let { thisActivity ->
             val alert = HabiticaAlertDialog(thisActivity)
@@ -95,8 +98,8 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
             alert.addButton(
                     getString(R.string.action_continue),
                     true,
-                    false,
-                    false
+                    isDestructive = false,
+                    autoDismiss = false
             ) { _, _ ->
                 binding.errorTextView.visibility = View.GONE
                 binding.progressCircular.visibility = View.VISIBLE
@@ -128,27 +131,27 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
 
     private fun retrieveMessages() {
         compositeSubscription.add(this.socialRepository.retrieveInboxConversations()
-                .subscribe(Consumer<List<InboxConversation>> {
-                    inbox_refresh_layout.isRefreshing = false
+                .subscribe({
+                    binding?.inboxRefreshLayout?.isRefreshing = false
                 }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onRefresh() {
-        inbox_refresh_layout.isRefreshing = true
+        binding?.inboxRefreshLayout?.isRefreshing = true
         retrieveMessages()
     }
 
     private fun setInboxMessages(messages: RealmResults<InboxConversation>) {
-        if (inbox_messages == null) {
+        if (binding?.inboxMessages == null) {
             return
         }
 
-        inbox_messages.removeAllViewsInLayout()
+        binding?.inboxMessages?.removeAllViewsInLayout()
 
         val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
         if (messages.isNotEmpty()) {
             for (message in messages) {
-                val entry = inflater?.inflate(R.layout.item_inbox_overview, inbox_messages, false)
+                val entry = inflater?.inflate(R.layout.item_inbox_overview, binding?.inboxMessages, false)
                 val avatarView = entry?.findViewById(R.id.avatar_view) as? AvatarView
                 message.userStyles?.let { avatarView?.setAvatar(it) }
                 val displayNameTextView = entry?.findViewById(R.id.display_name_textview) as? UsernameLabel
@@ -167,7 +170,7 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
                 messageTextView?.text = message.text
                 entry?.tag = message.uuid
                 entry?.setOnClickListener(this)
-                inbox_messages.addView(entry)
+                binding?.inboxMessages?.addView(entry)
             }
         } else {
             val tv = TextView(context)
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..40a68b6c6 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
@@ -12,73 +12,78 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.core.os.bundleOf
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding
 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.members.Member
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_no_party.*
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
 
-class NoPartyFragmentFragment : BaseMainFragment() {
+class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
 
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
     lateinit var configManager: AppConfigManager
 
+    override var binding: FragmentNoPartyBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentNoPartyBinding {
+        return FragmentNoPartyBinding.inflate(inflater, container, false)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_no_party, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        refreshLayout?.setOnRefreshListener { this.refresh() }
+        binding?.refreshLayout?.setOnRefreshListener { this.refresh() }
 
-        invitations_view.acceptCall = {
+        binding?.invitationsView?.acceptCall = {
             socialRepository.joinGroup(it)
                     .flatMap { userRepository.retrieveUser(false) }
-                    .subscribe(Consumer {
-                        fragmentManager?.popBackStack()
+                    .subscribe({
+                        parentFragmentManager.popBackStack()
                         MainNavigationController.navigate(R.id.partyFragment,
                                 bundleOf(Pair("partyID", user?.party?.id)))
                     }, RxErrorHandler.handleEmptyError())
         }
 
-        invitations_view.rejectCall = {
-            socialRepository.rejectGroupInvite(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
-            invitationWrapper.visibility = View.GONE
+        binding?.invitationsView?.rejectCall = {
+            socialRepository.rejectGroupInvite(it).subscribe({ }, RxErrorHandler.handleEmptyError())
+            binding?.invitationWrapper?.visibility = View.GONE
         }
 
-        invitations_view.setLeader = { leader ->
+        binding?.invitationsView?.setLeader = { leader ->
             compositeSubscription.add(
                     socialRepository.getMember(leader)
-                            .subscribe(Consumer {
-                                invitations_view.avatarView.setAvatar(it)
-                                invitations_view.textView.text = getString(R.string.invitation_title,it.displayName,invitations_view.groupName)
+                            .subscribe({
+                                binding?.root?.findViewById<AvatarView>(R.id.groupleader_avatar_view)?.setAvatar(it)
+                                binding?.root?.findViewById<TextView>(R.id.groupleader_text_view)?.text = getString(R.string.invitation_title,it.displayName, binding?.invitationsView?.groupName)
                             }, RxErrorHandler.handleEmptyError())
             )
         }
 
-        username_textview.setOnClickListener {
+        binding?.usernameTextview?.setOnClickListener {
             val clipboard = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
             val clip = ClipData.newPlainText(context?.getString(R.string.username), user?.username)
             clipboard?.setPrimaryClip(clip)
@@ -88,7 +93,7 @@ class NoPartyFragmentFragment : BaseMainFragment() {
             }
         }
 
-        createPartyButton.setOnClickListener {
+        binding?.createPartyButton?.setOnClickListener {
             val bundle = Bundle()
             bundle.putString("groupType", "party")
             bundle.putString("leader", user?.id)
@@ -107,30 +112,30 @@ class NoPartyFragmentFragment : BaseMainFragment() {
                 drawable.tileModeX = Shader.TileMode.REPEAT
                 Observable.just(drawable)
                         .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(Consumer {
-                            if (no_party_background != null) {
-                                no_party_background.background = it
+                        .subscribe({
+                            if (binding?.noPartyBackground != null) {
+                                binding?.noPartyBackground?.background = it
                             }
                         }, RxErrorHandler.handleEmptyError())
             }
         }
 
         if (configManager.noPartyLinkPartyGuild()) {
-            join_party_description_textview.setMarkdown(getString(R.string.join_party_description_guild, "[Party Wanted Guild](https://habitica.com/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601)"))
-            join_party_description_textview.setOnClickListener {
+            binding?.joinPartyDescriptionTextview?.setMarkdown(getString(R.string.join_party_description_guild, "[Party Wanted Guild](https://habitica.com/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601)"))
+            binding?.joinPartyDescriptionTextview?.setOnClickListener {
                 context?.let { FirebaseAnalytics.getInstance(it).logEvent("clicked_party_wanted", null) }
                 MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "f2db2a7f-13c5-454d-b3ee-ea1f5089e601"))
             }
         }
 
         if ((user?.invitations?.parties?.count() ?: 0) > 0) {
-            invitationWrapper.visibility = View.VISIBLE
-            user?.invitations?.parties?.let { invitations_view.setInvitations(it) }
+            binding?.invitationWrapper?.visibility = View.VISIBLE
+            user?.invitations?.parties?.let { binding?.invitationsView?.setInvitations(it) }
         } else {
-            invitationWrapper.visibility = View.GONE
+            binding?.invitationWrapper?.visibility = View.GONE
         }
 
-        username_textview.text = user?.formattedUsername
+        binding?.usernameTextview?.text = user?.formattedUsername
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -149,7 +154,7 @@ class NoPartyFragmentFragment : BaseMainFragment() {
                                 .flatMap {
                                     userRepository.retrieveUser(false)
                                 }
-                                .subscribe(Consumer {
+                                .subscribe({
                                     fragmentManager?.popBackStack()
                                     MainNavigationController.navigate(R.id.partyFragment,
                                             bundleOf(Pair("partyID", user?.party?.id)))
@@ -164,9 +169,9 @@ class NoPartyFragmentFragment : BaseMainFragment() {
         compositeSubscription.add(userRepository.retrieveUser(false, forced = true)
                 .filter { it.hasParty() }
                 .flatMap { socialRepository.retrieveGroup("party") }
-                .flatMap<List<Member>> { group1 -> socialRepository.retrieveGroupMembers(group1.id, true) }
-                .doOnComplete { refreshLayout.isRefreshing = false }
-                .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+                .flatMap { group1 -> socialRepository.retrieveGroupMembers(group1.id, true) }
+                .doOnComplete { binding?.refreshLayout?.isRefreshing = false }
+                .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..b7f31011d 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
@@ -7,32 +7,28 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
-class PublicGuildsFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
+class PublicGuildsFragment : BaseMainFragment<FragmentRecyclerviewBinding>(), SearchView.OnQueryTextListener {
 
     @Inject
     lateinit var socialRepository: SocialRepository
 
-    private val recyclerView: androidx.recyclerview.widget.RecyclerView? by bindView(R.id.recyclerView)
+    override var binding: FragmentRecyclerviewBinding? = null
 
-    private var viewAdapter = PublicGuildsRecyclerViewAdapter(null, true)
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_recyclerview)
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
     }
 
+    private var viewAdapter = PublicGuildsRecyclerViewAdapter()
+
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
@@ -40,17 +36,14 @@ class PublicGuildsFragment : BaseMainFragment(), SearchView.OnQueryTextListener
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
-        recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
-        recyclerView?.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(activity, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
-        viewAdapter = PublicGuildsRecyclerViewAdapter(null, true)
+        binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
+        binding?.recyclerView?.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(activity, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
         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()
+        binding?.recyclerView?.adapter = viewAdapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
         this.fetchGuilds()
     }
 
@@ -61,11 +54,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..74cc5656a 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
@@ -6,15 +6,16 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import com.facebook.drawee.view.SimpleDraweeView
+import androidx.core.text.parseAsHtml
+import androidx.core.text.toHtml
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.FragmentQuestDetailBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
@@ -22,13 +23,14 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.*
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 import javax.inject.Named
 
-class QuestDetailFragment : BaseMainFragment() {
+class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
 
     @Inject
     lateinit var socialRepository: SocialRepository
@@ -37,20 +39,11 @@ class QuestDetailFragment : BaseMainFragment() {
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
 
-    private val questTitleView: TextView? by bindOptionalView(R.id.title_view)
-    private val questScrollImageView: SimpleDraweeView? by bindOptionalView(R.id.quest_scroll_image_view)
-    private val questLeaderView: TextView? by bindOptionalView(R.id.quest_leader_view)
-    private val questDescriptionView: TextView? by bindOptionalView(R.id.description_view)
-    private val questParticipantList: LinearLayout? by bindOptionalView(R.id.quest_participant_list)
-    private val participantHeader: TextView? by bindOptionalView(R.id.participants_header)
-    private val participantHeaderCount: TextView? by bindOptionalView(R.id.participants_header_count)
-    private val questParticipantResponseWrapper: ViewGroup? by bindOptionalView(R.id.quest_participant_response_wrapper)
-    private val questLeaderResponseWrapper: ViewGroup? by bindOptionalView(R.id.quest_leader_response_wrapper)
-    private val questAcceptButton: Button? by bindOptionalView(R.id.quest_accept_button)
-    private val questRejectButton: Button? by bindOptionalView(R.id.quest_reject_button)
-    private val questBeginButton: Button? by bindOptionalView(R.id.quest_begin_button)
-    private val questCancelButton: Button? by bindOptionalView(R.id.quest_cancel_button)
-    private val questAbortButton: Button? by bindOptionalView(R.id.quest_abort_button)
+    override var binding: FragmentQuestDetailBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQuestDetailBinding {
+        return FragmentQuestDetailBinding.inflate(inflater, container, false)
+    }
 
     var partyId: String? = null
     var questKey: String? = null
@@ -63,9 +56,8 @@ class QuestDetailFragment : BaseMainFragment() {
 
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
         this.hidesToolbar = true
-        return inflater.inflate(R.layout.fragment_quest_detail, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
 
@@ -78,57 +70,52 @@ class QuestDetailFragment : BaseMainFragment() {
             questKey = args.questKey
         }
 
-        resetViews()
-
-        questAcceptButton?.setOnClickListener { onQuestAccept() }
-        questRejectButton?.setOnClickListener { onQuestReject() }
-        questBeginButton?.setOnClickListener { onQuestBegin() }
-        questCancelButton?.setOnClickListener { onQuestCancel() }
-        questAbortButton?.setOnClickListener { onQuestAbort() }
+        binding?.questAcceptButton?.setOnClickListener { onQuestAccept() }
+        binding?.questRejectButton?.setOnClickListener { onQuestReject() }
+        binding?.questBeginButton?.setOnClickListener { onQuestBegin() }
+        binding?.questCancelButton?.setOnClickListener { onQuestCancel() }
+        binding?.questLeaveButton?.setOnClickListener { onQuestLeave() }
     }
 
     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()))
         }
     }
 
     private fun updateParty(group: Group?) {
-        if (questTitleView == null || group == null || group.quest == null) {
+        if (binding?.titleView == null || group == null || group.quest == null) {
             return
         }
         party = group
         quest = group.quest
         setQuestParticipants(group.quest?.participants)
-        compositeSubscription.add(socialRepository.getMember(quest?.leader).firstElement().subscribe(Consumer { member ->
-            if (context != null && questLeaderView != null && member != null) {
-                questLeaderView?.text = context?.getString(R.string.quest_leader_header, member.displayName)
+        compositeSubscription.add(socialRepository.getMember(quest?.leader).subscribe({ member ->
+            if (context != null && binding?.questLeaderView != null && member != null) {
+                binding?.questLeaderView?.text = context?.getString(R.string.quest_leader_header, member.displayName)
             }
         }, RxErrorHandler.handleEmptyError()))
 
-        if (questLeaderResponseWrapper != null) {
+        if (binding?.questLeaderResponseWrapper != null) {
             if (showParticipatantButtons()) {
-                questLeaderResponseWrapper?.visibility = View.GONE
-                questParticipantResponseWrapper?.visibility = View.VISIBLE
+                binding?.questLeaderResponseWrapper?.visibility = View.GONE
+                binding?.questParticipantResponseWrapper?.visibility = View.VISIBLE
             } else if (showLeaderButtons()) {
-                questParticipantResponseWrapper?.visibility = View.GONE
-                questLeaderResponseWrapper?.visibility = View.VISIBLE
+                binding?.questParticipantResponseWrapper?.visibility = View.GONE
+                binding?.questLeaderResponseWrapper?.visibility = View.VISIBLE
+                binding?.questCancelButton?.visibility = View.VISIBLE
                 if (isQuestActive) {
-                    questBeginButton?.visibility = View.GONE
-                    questCancelButton?.visibility = View.GONE
-                    questAbortButton?.visibility = View.VISIBLE
+                    binding?.questBeginButton?.visibility = View.GONE
                 } else {
-                    questBeginButton?.visibility = View.VISIBLE
-                    questCancelButton?.visibility = View.VISIBLE
-                    questAbortButton?.visibility = View.GONE
+                    binding?.questBeginButton?.visibility = View.VISIBLE
                 }
             } else {
-                questLeaderResponseWrapper?.visibility = View.GONE
-                questParticipantResponseWrapper?.visibility = View.GONE
+                binding?.questLeaderResponseWrapper?.visibility = View.GONE
+                binding?.questParticipantResponseWrapper?.visibility = View.GONE
             }
         }
     }
@@ -138,58 +125,60 @@ class QuestDetailFragment : BaseMainFragment() {
     }
 
     private fun showParticipatantButtons(): Boolean {
-        return if (user == null || user?.party == null || user?.party?.quest == null) {
+        return if (user?.party?.quest == null) {
             false
         } else !isQuestActive && user?.party?.quest?.RSVPNeeded == true
     }
 
 
     private fun updateQuestContent(questContent: QuestContent) {
-        if (questTitleView == null || !questContent.isManaged) {
+        if (binding?.titleView == null || !questContent.isManaged) {
             return
         }
-        questTitleView?.text = questContent.text
-        questDescriptionView?.setMarkdown(questContent.notes)
-        DataBindingUtils.loadImage(questScrollImageView, "inventory_quest_scroll_" + questContent.key)
+        binding?.titleView?.text = questContent.text
+        // We need to do this, because the quest description can contain markdown AND HTML.
+        binding?.descriptionView?.setText(MarkdownParser.parseMarkdown(questContent.notes).toHtml().fromHtml(), TextView.BufferType.SPANNABLE)
+
+        DataBindingUtils.loadImage(binding?.questScrollImageView, "inventory_quest_scroll_" + questContent.key)
     }
 
     private fun setQuestParticipants(participants: List<Member>?) {
-        if (questParticipantList == null) {
+        if (binding?.questParticipantList == null) {
             return
         }
-        questParticipantList?.removeAllViews()
+        binding?.questParticipantList?.removeAllViews()
         val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
         var participantCount = 0
         for (participant in participants ?: emptyList()) {
             if (quest?.active == true && participant.participatesInQuest == false) {
                 continue
             }
-            val participantView = inflater?.inflate(R.layout.quest_participant, questParticipantList, false)
+            val participantView = inflater?.inflate(R.layout.quest_participant, binding?.questParticipantList, false)
             val textView = participantView?.findViewById<View>(R.id.participant_name) as? TextView
             textView?.text = participant.displayName
             val statusTextView = participantView?.findViewById<View>(R.id.status_view) as? TextView
             if (quest?.active == false) {
                 context?.let {
-                    when {
-                        participant.participatesInQuest == null -> {
+                    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 -> {
+                        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))
                         }
                     }
                 }
-                questParticipantList?.addView(participantView)
+                binding?.questParticipantList?.addView(participantView)
             } else {
                 statusTextView?.visibility = View.GONE
                 if (participant.participatesInQuest == true) {
-                    questParticipantList?.addView(participantView)
+                    binding?.questParticipantList?.addView(participantView)
                 }
             }
             if (participant.participatesInQuest == true) {
@@ -197,11 +186,11 @@ class QuestDetailFragment : BaseMainFragment() {
             }
         }
         if (quest?.active == true) {
-            participantHeader?.setText(R.string.participants)
-            participantHeaderCount?.text = participantCount.toString()
+            binding?.participantsHeader?.setText(R.string.participants)
+            binding?.participantsHeaderCount?.text = participantCount.toString()
         } else {
-            participantHeader?.setText(R.string.invitations)
-            participantHeaderCount?.text = participantCount.toString() + "/" + quest?.participants?.size
+            binding?.participantsHeader?.setText(R.string.invitations)
+            binding?.participantsHeaderCount?.text = participantCount.toString() + "/" + quest?.participants?.size
             beginQuestMessage = getString(R.string.quest_begin_message, participantCount, quest?.participants?.size)
         }
     }
@@ -215,14 +204,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 +224,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)
@@ -245,28 +234,45 @@ class QuestDetailFragment : BaseMainFragment() {
 
     private fun onQuestCancel() {
         context?.let {
-            val alert = HabiticaAlertDialog(it)
-            alert.setMessage(R.string.quest_cancel_message)
-            alert.addButton(R.string.yes, true) { _, _ ->
-                partyId?.let { partyID ->
-                    @Suppress("DEPRECATION")
-                    socialRepository.cancelQuest(partyID)
-                            .subscribe(Consumer { getActivity()?.fragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+            if (isQuestActive) {
+
+                val builder = AlertDialog.Builder(getActivity())
+                        .setMessage(R.string.quest_abort_message)
+                        .setPositiveButton(R.string.yes) { _, _ ->
+                            partyId?.let { partyID ->
+                                @Suppress("DEPRECATION")
+                                socialRepository.abortQuest(partyID)
+                                        .flatMap { userRepository.retrieveUser() }
+                                        .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                            }
+                        }.setNegativeButton(R.string.no) { _, _ -> }
+                builder.show()
+            } else {
+                val alert = HabiticaAlertDialog(it)
+                alert.setMessage(R.string.quest_cancel_message)
+                alert.addButton(R.string.yes, true) { _, _ ->
+                    partyId?.let { partyID ->
+                        @Suppress("DEPRECATION")
+                        socialRepository.cancelQuest(partyID)
+                                .flatMap { userRepository.retrieveUser() }
+                                .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                    }
                 }
+                alert.addButton(R.string.no, false)
+                alert.show()
             }
-            alert.addButton(R.string.no, false)
-            alert.show()
         }
     }
 
-    private fun onQuestAbort() {
+    private fun onQuestLeave() {
         val builder = AlertDialog.Builder(getActivity())
                 .setMessage(R.string.quest_abort_message)
                 .setPositiveButton(R.string.yes) { _, _ ->
                     partyId?.let { partyID ->
                         @Suppress("DEPRECATION")
-                        socialRepository.abortQuest(partyID)
-                                .subscribe(Consumer { getActivity()?.fragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                        socialRepository.leaveQuest(partyID)
+                                .flatMap { userRepository.retrieveUser() }
+                                .subscribe({ getActivity()?.supportFragmentManager?.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..321e2603e 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
@@ -16,6 +16,8 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentTavernDetailBinding
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -27,13 +29,10 @@ import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_tavern_detail.*
-import kotlinx.android.synthetic.main.shop_header.*
 import javax.inject.Inject
 import javax.inject.Named
 
-class TavernDetailFragment : BaseFragment() {
+class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {
 
     @Inject
     lateinit var userRepository: UserRepository
@@ -48,39 +47,39 @@ class TavernDetailFragment : BaseFragment() {
 
     private var shopSpriteSuffix = ""
 
-    private var user: User? = null
+    override var binding: FragmentTavernDetailBinding? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_tavern_detail, container, false)
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentTavernDetailBinding {
+        return FragmentTavernDetailBinding.inflate(inflater, container, false)
     }
 
+    private var user: User? = null
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         shopSpriteSuffix = configManager.shopSpriteSuffix()
 
-        compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer {
+        compositeSubscription.add(userRepository.getUser(userId).subscribe({
             this.user = it
             this.updatePausedState()
         }, RxErrorHandler.handleEmptyError()))
 
-        descriptionView.setText(R.string.tavern_description)
-        namePlate.setText(R.string.tavern_owner)
+        binding?.shopHeader?.descriptionView?.setText(R.string.tavern_description)
+        binding?.shopHeader?.namePlate?.setText(R.string.tavern_owner)
 
-        npcBannerView.shopSpriteSuffix = configManager.shopSpriteSuffix()
-        npcBannerView.identifier = "tavern"
+        binding?.shopHeader?.npcBannerView?.shopSpriteSuffix = configManager.shopSpriteSuffix()
+        binding?.shopHeader?.npcBannerView?.identifier = "tavern"
 
         addPlayerTiers()
         bindButtons()
 
         compositeSubscription.add(socialRepository.getGroup(Group.TAVERN_ID)
-                .doOnNext {  if (!it.hasActiveQuest) worldBossSection.visibility = View.GONE }
+                .doOnNext {  if (!it.hasActiveQuest) binding?.worldBossSection?.visibility = View.GONE }
                 .filter { it.hasActiveQuest }
                 .doOnNext {
-                    questProgressView.progress = it.quest
-                    descriptionView.setText(R.string.tavern_description_world_boss)
+                    binding?.questProgressView?.progress = it.quest
+                    binding?.shopHeader?.descriptionView?.setText(R.string.tavern_description_world_boss)
                     val filtered = it.quest?.rageStrikes?.filter { strike -> strike.key == "tavern" }
                     if (filtered?.size ?: 0 > 0 && filtered?.get(0)?.wasHit == true) {
                         val key = it.quest?.key
@@ -90,14 +89,14 @@ class TavernDetailFragment : BaseFragment() {
                     }
                 }
                 .flatMapMaybe { inventoryRepository.getQuestContent(it.quest?.key ?: "").firstElement() }
-                .subscribe(Consumer {
-                    questProgressView.quest = it
-                    worldBossSection.visibility = View.VISIBLE
+                .subscribe({
+                    binding?.questProgressView?.quest = it
+                    binding?.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) }
+        user?.let { binding?.questProgressView?.configure(it) }
     }
 
     override fun onDestroy() {
@@ -108,22 +107,22 @@ class TavernDetailFragment : BaseFragment() {
     }
 
     private fun bindButtons() {
-        innButton.setOnClickListener {
-            user?.let { user -> userRepository.sleep(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
+        binding?.innButton?.setOnClickListener {
+            user?.let { user -> userRepository.sleep(user).subscribe({ }, RxErrorHandler.handleEmptyError()) }
         }
-        guidelinesButton.setOnClickListener {
+        binding?.guidelinesButton?.setOnClickListener {
             MainNavigationController.navigate(R.id.guidelinesActivity)
         }
-        faqButton.setOnClickListener {
+        binding?.faqButton?.setOnClickListener {
             MainNavigationController.navigate(R.id.FAQOverviewFragment)
         }
-        reportButton.setOnClickListener {
+        binding?.reportButton?.setOnClickListener {
             MainNavigationController.navigate(R.id.aboutFragment)
         }
 
-        worldBossSection.infoIconView.setOnClickListener {
+        binding?.worldBossSection?.infoIconView?.setOnClickListener {
             val context = this.context
-            val quest = questProgressView.quest
+            val quest = binding?.questProgressView?.quest
             if (context != null && quest != null) {
                 showWorldBossInfoDialog(context, quest)
             }
@@ -132,13 +131,13 @@ class TavernDetailFragment : BaseFragment() {
 
 
     private fun updatePausedState() {
-        if (innButton == null) {
+        if (binding?.innButton == null) {
             return
         }
         if (user?.preferences?.sleep == true) {
-            innButton .setText(R.string.tavern_inn_checkOut)
+            binding?.innButton?.setText(R.string.tavern_inn_checkOut)
         } else {
-            innButton.setText(R.string.tavern_inn_rest)
+            binding?.innButton?.setText(R.string.tavern_inn_rest)
         }
     }
 
@@ -146,7 +145,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
@@ -155,12 +154,12 @@ class TavernDetailFragment : BaseFragment() {
                         FrameLayout.LayoutParams.WRAP_CONTENT,
                         Gravity.CENTER)
                 container.addView(label, params)
-                playerTiersView.addView(container)
+                binding?.playerTiersView?.addView(container)
                 val padding = context?.resources?.getDimension(R.dimen.spacing_medium)?.toInt() ?: 0
                 container.setPadding(0, padding, 0, padding)
             }
         }
-        (playerTiersView.parent as? ViewGroup)?.invalidate()
+        (binding?.playerTiersView?.parent as? ViewGroup)?.invalidate()
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -181,7 +180,7 @@ class TavernDetailFragment : BaseFragment() {
             promptView?.text = context.getString(R.string.world_boss_action_prompt, bossName)
             promptView?.setTextColor(quest.colors?.lightColor ?: 0)
             val background = ContextCompat.getDrawable(context, R.drawable.rounded_border)
-            background?.setColorFilter(quest.colors?.extraLightColor ?: 0, PorterDuff.Mode.MULTIPLY)
+            background?.setTintWith(quest.colors?.extraLightColor ?: 0, PorterDuff.Mode.MULTIPLY)
             promptView?.background = background
 
             alert.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close)) { dialog, _ ->
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..256ad7314 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,40 +4,52 @@ 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.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import kotlinx.android.synthetic.main.fragment_viewpager.*
+import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
+import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
 import javax.inject.Inject
 
-class TavernFragment : BaseMainFragment() {
+class TavernFragment : BaseMainFragment<FragmentViewpagerBinding>() {
 
     @Inject
     lateinit var socialRepository: SocialRepository
 
-    internal var tavern: Group? = null
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
+    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? {
         this.usesTabLayout = true
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        val v = inflater.inflate(R.layout.fragment_viewpager, container, false)
         this.tutorialStepIdentifier = "tavern"
         this.tutorialText = getString(R.string.tutorial_tavern)
 
-        return v
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(GroupViewModel::class.java)
+        viewModel.groupViewType = GroupViewType.GUILD
+        viewModel.setGroupID(Group.TAVERN_ID)
+
         setViewPagerAdapter()
-        viewPager.currentItem = 0
+        binding?.viewPager?.currentItem = 0
     }
 
     override fun onDestroy() {
@@ -58,7 +70,7 @@ class TavernFragment : BaseMainFragment() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_guild_refresh -> {
-                chatListFragment.refresh()
+                viewModel.retrieveGroup {  }
                 return true
             }
         }
@@ -67,26 +79,23 @@ class TavernFragment : BaseMainFragment() {
 
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
-        if (this.user == null) {
-            return
-        }
-
-        viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding?.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
             }
@@ -100,7 +109,7 @@ class TavernFragment : BaseMainFragment() {
                 }
             }
         }
-        tabLayout?.setupWithViewPager(viewPager)
+        tabLayout?.setupWithViewPager(binding?.viewPager)
     }
 
 }
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..341652199 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
@@ -1,69 +1,62 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges
 
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.*
-import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.DialogChallengeDetailTaskGroupBinding
+import com.habitrpg.android.habitica.databinding.FragmentChallengeDetailBinding
+import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.tasks.Task
-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.EmojiParser
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
-import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder
 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
 
 
-class ChallengeDetailFragment: BaseMainFragment() {
+class ChallengeDetailFragment: BaseMainFragment<FragmentChallengeDetailBinding>() {
 
     @Inject
     lateinit var challengeRepository: ChallengeRepository
     @Inject
     lateinit var socialRepository: SocialRepository
 
-    private val joinButtonWrapper: ViewGroup? by bindView(R.id.join_button_wrapper)
-    private val joinButton: Button? by bindView(R.id.join_button)
-    private val leaveButonWrapper: ViewGroup? by bindView(R.id.leave_button_wrapper)
-    private val leaveButton: Button? by bindView(R.id.leave_button)
-    private val challengeName: HabiticaEmojiTextView? by bindView(R.id.challenge_name)
-    private val challengeDescription: HabiticaEmojiTextView? by bindView(R.id.challenge_description)
-    private val challengeLeaderWrapper: ViewGroup? by bindView(R.id.challenge_creator_wrapper)
-    private val challengeLeaderAvatarView: AvatarView? by bindView(R.id.creator_avatarview)
-    private val challengeLeaderLabel: UsernameLabel? by bindView(R.id.creator_label)
-    private val gemAmountView: TextView? by bindView(R.id.gem_amount)
-    private val gemAmountIconView: ImageView? by bindView(R.id.gem_amount_icon)
-    private val memberCountView: TextView? by bindView(R.id.participant_count)
-    private val memberCountIconView: ImageView? by bindView(R.id.participant_count_icon)
-    private val taskGrouplayout: LinearLayout? by bindView(R.id.task_group_layout)
+    override var binding: FragmentChallengeDetailBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentChallengeDetailBinding {
+        return FragmentChallengeDetailBinding.inflate(inflater, container, false)
+    }
 
     var challengeID: String? = null
     var challenge: Challenge? = null
-    var isCreator = false
+    private var isCreator = false
 
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
@@ -71,8 +64,7 @@ class ChallengeDetailFragment: BaseMainFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_challenge_detail)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     @Suppress("ReturnCount")
@@ -84,16 +76,16 @@ class ChallengeDetailFragment: BaseMainFragment() {
             challengeID = args.challengeID
         }
 
-        gemAmountIconView?.setImageBitmap(HabiticaIconsHelper.imageOfGem_36())
-        memberCountIconView?.setImageBitmap(HabiticaIconsHelper.imageOfParticipantsIcon())
-        challengeDescription?.movementMethod = LinkMovementMethod.getInstance()
+        binding?.gemAmountIcon?.setImageBitmap(HabiticaIconsHelper.imageOfGem_36())
+        binding?.participantCountIcon?.setImageBitmap(HabiticaIconsHelper.imageOfParticipantsIcon())
+        binding?.challengeDescription?.movementMethod = LinkMovementMethod.getInstance()
 
-        challengeLeaderWrapper?.setOnClickListener {
+        binding?.challengeCreatorWrapper?.setOnClickListener {
             val leaderID = challenge?.leaderId ?: return@setOnClickListener
             FullProfileActivity.open(leaderID)
         }
 
-        challengeID?.let {id ->
+        challengeID?.let { id ->
             compositeSubscription.add(challengeRepository.getChallenge(id)
                     .doOnNext {
                         set(it)
@@ -105,9 +97,9 @@ class ChallengeDetailFragment: BaseMainFragment() {
                     .flatMap { creatorID ->
                         return@flatMap socialRepository.getMember(creatorID)
                     }
-                    .subscribe(Consumer { set(it)}, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(challengeRepository.getChallengeTasks(id).subscribe(Consumer { taskList ->
-                taskGrouplayout?.removeAllViewsInLayout()
+                    .subscribe({ set(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(challengeRepository.getChallengeTasks(id).subscribe({ taskList ->
+                binding?.taskGroupLayout?.removeAllViewsInLayout()
 
                 val todos = ArrayList<Task>()
                 val habits = ArrayList<Task>()
@@ -140,15 +132,15 @@ 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)
+        binding?.joinButton?.setOnClickListener { challenge?.let { challenge -> challengeRepository.joinChallenge(challenge)
                 .flatMap { userRepository.retrieveUser(true) }
-                .subscribe(Consumer {}, RxErrorHandler.handleEmptyError()) } }
-        leaveButton?.setOnClickListener { showChallengeLeaveDialog() }
+                .subscribe({}, RxErrorHandler.handleEmptyError()) } }
+        binding?.leaveButton?.setOnClickListener { showChallengeLeaveDialog() }
 
         refresh()
     }
@@ -157,190 +149,143 @@ class ChallengeDetailFragment: BaseMainFragment() {
         inflater.inflate(R.menu.menu_challenge_details, menu)
         val editMenuItem = menu.findItem(R.id.action_edit)
         editMenuItem?.isVisible = isCreator
+        val endChallengeMenuItem = menu.findItem(R.id.action_end_challenge)
+        endChallengeMenuItem?.isVisible = isCreator
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == R.id.action_edit) {
-            val intent = Intent(getActivity(), ChallengeFormActivity::class.java)
-            val bundle = Bundle()
-            bundle.putString(ChallengeFormActivity.CHALLENGE_ID_KEY, challengeID)
-            intent.putExtras(bundle)
-            startActivity(intent)
-            return true
-        }
-        else if (item.itemId == R.id.action_share) {
-            val shareGuildIntent = Intent().apply {
-                action = Intent.ACTION_SEND
-                putExtra(Intent.EXTRA_TEXT, "${context?.getString(R.string.base_url)}/challenges/$challengeID")
-                type = "text/plain"
+        when (item.itemId) {
+            R.id.action_edit -> {
+                val intent = Intent(getActivity(), ChallengeFormActivity::class.java)
+                val bundle = Bundle()
+                bundle.putString(ChallengeFormActivity.CHALLENGE_ID_KEY, challengeID)
+                intent.putExtras(bundle)
+                startActivity(intent)
+                return true
+            }
+            R.id.action_share -> {
+                val shareGuildIntent = Intent().apply {
+                    action = Intent.ACTION_SEND
+                    putExtra(Intent.EXTRA_TEXT, "${context?.getString(R.string.base_url)}/challenges/$challengeID")
+                    type = "text/plain"
+                }
+                startActivity(Intent.createChooser(shareGuildIntent, context?.getString(R.string.share_challenge_with)))
+            }
+            R.id.action_end_challenge -> {
+                showEndChallengeDialog()
             }
-            startActivity(Intent.createChooser(shareGuildIntent, context?.getString(R.string.share_challenge_with)))
         }
 
         return super.onOptionsItemSelected(item)
     }
 
+    private fun showEndChallengeDialog() {
+        val context = context ?: return
+        val dialog = HabiticaAlertDialog(context)
+        dialog.setTitle(R.string.action_end_challenge)
+        dialog.setMessage(R.string.end_challenge_description)
+        dialog.addButton(R.string.open_website, true, false) { _, _ ->
+            val uriUrl = "https://habitica.com/challenges/${challengeID}".toUri()
+            val launchBrowser = Intent(Intent.ACTION_VIEW, uriUrl)
+            val l = context.packageManager.queryIntentActivities(launchBrowser, PackageManager.MATCH_DEFAULT_ONLY)
+            val notHabitica = l.first { !it.activityInfo.processName.contains("habitica") }
+            launchBrowser.setPackage(notHabitica.activityInfo.processName)
+            startActivity(launchBrowser)
+        }
+        dialog.addCloseButton()
+        dialog.show()
+    }
+
     private fun refresh() {
-        challengeID?.let {id ->
+        challengeID?.let { id ->
             challengeRepository.retrieveChallenge(id)
                     .flatMap { challengeRepository.retrieveChallengeTasks(id) }
-                    .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError(), Action {  })
+                    .subscribe({ }, RxErrorHandler.handleEmptyError(), { })
         }
     }
 
     private fun set(challenge: Challenge) {
         this.challenge = challenge
-        challengeName?.text = EmojiParser.parseEmojis(challenge.name)
-        challengeDescription?.setMarkdown(challenge.description)
-        challengeLeaderLabel?.username = challenge.leaderName
+        binding?.challengeName?.text = EmojiParser.parseEmojis(challenge.name)
+        binding?.challengeDescription?.setMarkdown(challenge.description)
+        binding?.creatorLabel?.username = challenge.leaderName
 
-        gemAmountView?.text = challenge.prize.toString()
-        memberCountView?.text = challenge.memberCount.toString()
+        binding?.gemAmount?.text = challenge.prize.toString()
+        binding?.participantCount?.text = challenge.memberCount.toString()
     }
 
     private fun set(creator: Member) {
-        challengeLeaderAvatarView?.setAvatar(creator)
-        challengeLeaderLabel?.tier = creator.contributor?.level ?: 0
-        challengeLeaderLabel?.username = creator.displayName
+        binding?.creatorAvatarview?.setAvatar(creator)
+        binding?.creatorLabel?.tier = creator.contributor?.level ?: 0
+        binding?.creatorLabel?.username = creator.displayName
         isCreator = creator.id == user?.id
         this.activity?.invalidateOptionsMenu()
     }
 
     private fun setJoined(joined: Boolean) {
-        joinButton?.visibility = if (!joined) View.VISIBLE else View.GONE
-        joinButtonWrapper?.visibility = if (!joined) View.VISIBLE else View.GONE
-        leaveButton?.visibility = if (joined) View.VISIBLE else View.GONE
-        leaveButonWrapper?.visibility = if (joined) View.VISIBLE else View.GONE
+        binding?.joinButton?.visibility = if (!joined) View.VISIBLE else View.GONE
+        binding?.joinButtonWrapper?.visibility = if (!joined) View.VISIBLE else View.GONE
+        binding?.leaveButton?.visibility = if (joined) View.VISIBLE else View.GONE
+        binding?.leaveButtonWrapper?.visibility = if (joined) View.VISIBLE else View.GONE
     }
 
     private fun addHabits(habits: ArrayList<Task>) {
-        val taskGroup = taskGrouplayout?.inflate(R.layout.dialog_challenge_detail_task_group)
-        val groupName = taskGroup?.findViewById(R.id.task_group_name) as? TextView
-        val tasksLayout = taskGroup?.findViewById(R.id.tasks_layout) as? LinearLayout
-
-        groupName?.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_HABITS, habits.size)
-        taskGroup?.findViewById<TextView>(R.id.task_count_view)?.text = habits.size.toString()
-
-        val size = habits.size
-        for (i in 0 until size) {
+        val groupBinding = DialogChallengeDetailTaskGroupBinding.inflate(layoutInflater, binding?.taskGroupLayout, true)
+        groupBinding.taskGroupName.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_HABITS, habits.size)
+        groupBinding.taskCountView.text = habits.size.toString()
+        for (i in 0 until habits.size) {
             val task = habits[i]
-            val entry = tasksLayout?.inflate(R.layout.dialog_challenge_detail_habit)
-            val habitTitle = entry?.findViewById(R.id.habit_title) as? TextView
-
-            entry?.findViewById<ImageView>(R.id.lock_icon_plus)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#DFDEDF")))
-            entry?.findViewById<ImageView>(R.id.lock_icon_minus)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#DFDEDF")))
-            context?.let {
-                if (task.up == true) {
-                    entry?.findViewById<ImageView>(R.id.lock_icon_plus)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#B3FFFFFF")))
-                    entry?.findViewById<View>(R.id.lock_icon_background_plus)?.setBackgroundColor(ContextCompat.getColor(it, task.mediumTaskColor))
-                    val drawable = ContextCompat.getDrawable(it, R.drawable.circle_white)
-                    drawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(it, task.darkTaskColor), PorterDuff.Mode.MULTIPLY)
-                    entry?.findViewById<View>(R.id.lock_icon_plus)?.background = drawable
-                }
-                if (task.down == true) {
-                    entry?.findViewById<ImageView>(R.id.lock_icon_minus)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#B3FFFFFF")))
-                    entry?.findViewById<View>(R.id.lock_icon_background_minus)?.setBackgroundColor(ContextCompat.getColor(it, task.mediumTaskColor))
-                    val drawable = ContextCompat.getDrawable(it, R.drawable.circle_white)
-                    drawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(it, task.darkTaskColor), PorterDuff.Mode.MULTIPLY)
-                    entry?.findViewById<View>(R.id.lock_icon_plus)?.background = drawable
-                }
-            }
-
-            habitTitle?.text = EmojiParser.parseEmojis(task.text)
-            tasksLayout?.addView(entry)
+            val entry = groupBinding.tasksLayout.inflate(R.layout.habit_item_card)
+            val viewHolder = HabitViewHolder(entry, { _, _ -> }, {}, {})
+            viewHolder.isLocked = true
+            viewHolder.bind(task, i, "normal")
+            groupBinding.tasksLayout.addView(entry)
         }
-        taskGrouplayout?.addView(taskGroup)
     }
 
     private fun addDailys(dailies: ArrayList<Task>) {
-        val taskGroup = taskGrouplayout?.inflate(R.layout.dialog_challenge_detail_task_group)
-        val groupName = taskGroup?.findViewById(R.id.task_group_name) as? TextView
-        val tasksLayout = taskGroup?.findViewById(R.id.tasks_layout) as? LinearLayout
+        val groupBinding = DialogChallengeDetailTaskGroupBinding.inflate(layoutInflater, binding?.taskGroupLayout, true)
+        groupBinding.taskGroupName.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_DAILYS, dailies.size)
+        groupBinding.taskCountView.text = dailies.size.toString()
 
-        val size = dailies.size
-        groupName?.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_DAILYS, size)
-        taskGroup?.findViewById<TextView>(R.id.task_count_view)?.text = dailies.size.toString()
-
-        for (i in 0 until size) {
+        for (i in 0 until dailies.size) {
             val task = dailies[i]
-            val entry = tasksLayout?.inflate(R.layout.dialog_challenge_detail_daily)
-            val title = entry?.findViewById(R.id.daily_title) as? TextView?
-            title?.text = EmojiParser.parseEmojis(task.text)
-            entry?.findViewById<ImageView>(R.id.lock_icon)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#949494")))
-            context?.let {
-                entry?.findViewById<View>(R.id.lock_icon_background)?.setBackgroundColor(ContextCompat.getColor(it, task.mediumTaskColor))
-                val drawable = ContextCompat.getDrawable(it, R.drawable.circle_white)
-                drawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(it, task.extraLightTaskColor), PorterDuff.Mode.MULTIPLY)
-                entry?.findViewById<View>(R.id.lock_icon)?.background = drawable
-            }
-            if (task.checklist != null && task.checklist?.isEmpty() == false) {
-                val checklistIndicatorWrapper = entry?.findViewById<View>(R.id.checklistIndicatorWrapper)
-
-                checklistIndicatorWrapper?.visibility = View.VISIBLE
-
-                val checkListAllTextView = entry?.findViewById<View>(R.id.checkListAllTextView) as? TextView
-                checkListAllTextView?.text = task.checklist?.size.toString()
-            }
-            tasksLayout?.addView(entry)
+            val entry = groupBinding.tasksLayout.inflate(R.layout.daily_item_card)
+            val viewHolder = DailyViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {})
+            viewHolder.isLocked = true
+            viewHolder.bind(task, i, "normal")
+            groupBinding.tasksLayout.addView(entry)
         }
-        taskGrouplayout?.addView(taskGroup)
     }
 
     private fun addTodos(todos: ArrayList<Task>) {
-        val taskGroup = taskGrouplayout?.inflate(R.layout.dialog_challenge_detail_task_group)
-        val groupName = taskGroup?.findViewById(R.id.task_group_name) as? TextView
-        val tasksLayout = taskGroup?.findViewById(R.id.tasks_layout) as? LinearLayout
+        val groupBinding = DialogChallengeDetailTaskGroupBinding.inflate(layoutInflater, binding?.taskGroupLayout, true)
+        groupBinding.taskGroupName.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_TODOS, todos.size)
+        groupBinding.taskCountView.text = todos.size.toString()
 
-        val size = todos.size
-        groupName?.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_TODOS, size)
-        taskGroup?.findViewById<TextView>(R.id.task_count_view)?.text = todos.size.toString()
-
-        for (i in 0 until size) {
+        for (i in 0 until todos.size) {
             val task = todos[i]
-            val entry = tasksLayout?.inflate(R.layout.dialog_challenge_detail_todo)
-            val title = entry?.findViewById(R.id.todo_title) as? TextView
-            title?.text = EmojiParser.parseEmojis(task.text)
-            entry?.findViewById<ImageView>(R.id.lock_icon)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#949494")))
-            context?.let {
-                entry?.findViewById<View>(R.id.lock_icon_background)?.setBackgroundColor(ContextCompat.getColor(it, task.mediumTaskColor))
-                val drawable = ContextCompat.getDrawable(it, R.drawable.circle_white)
-                drawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(it, task.extraLightTaskColor), PorterDuff.Mode.MULTIPLY)
-                entry?.findViewById<View>(R.id.lock_icon)?.background = drawable
-            }
-
-            if (task.checklist != null && task.checklist?.isEmpty() == false) {
-                val checklistIndicatorWrapper = entry?.findViewById<View>(R.id.checklistIndicatorWrapper)
-
-                checklistIndicatorWrapper?.visibility = View.VISIBLE
-
-                val checkListAllTextView = entry?.findViewById<View>(R.id.checkListAllTextView) as? TextView
-                checkListAllTextView?.text = task.checklist?.size.toString()
-            }
-            tasksLayout?.addView(entry)
+            val entry = groupBinding.tasksLayout.inflate(R.layout.todo_item_card)
+            val viewHolder = TodoViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {})
+            viewHolder.isLocked = true
+            viewHolder.bind(task, i, "normal")
+            groupBinding.tasksLayout.addView(entry)
         }
-        taskGrouplayout?.addView(taskGroup)
     }
 
     private fun addRewards(rewards: ArrayList<Task>) {
-        val taskGroup = taskGrouplayout?.inflate(R.layout.dialog_challenge_detail_task_group)
-        val groupName = taskGroup?.findViewById(R.id.task_group_name) as? TextView
+        val groupBinding = DialogChallengeDetailTaskGroupBinding.inflate(layoutInflater, binding?.taskGroupLayout, true)
+        groupBinding.taskGroupName.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_HABITS, rewards.size)
+        groupBinding.taskCountView.text = rewards.size.toString()
 
-        val tasksLayout = taskGroup?.findViewById(R.id.tasks_layout) as? LinearLayout
-
-        val size = rewards.size
-        groupName?.text =  getLabelByTypeAndCount(Challenge.TASK_ORDER_REWARDS, size)
-        taskGroup?.findViewById<TextView>(R.id.task_count_view)?.text = rewards.size.toString()
-
-        for (i in 0 until size) {
+        for (i in 0 until rewards.size) {
             val task = rewards[i]
-
-            val entry = tasksLayout?.inflate(R.layout.dialog_challenge_detail_reward)
-            (entry?.findViewById<View>(R.id.gold_icon) as? ImageView)?.setImageBitmap(HabiticaIconsHelper.imageOfGold())
-            val title = entry?.findViewById<View>(R.id.reward_title) as? TextView
-            title?.text = EmojiParser.parseEmojis(task.text)
-            tasksLayout?.addView(entry)
+            val entry = groupBinding.tasksLayout.inflate(R.layout.habit_item_card)
+            val viewHolder = RewardViewHolder(entry, { _, _ -> }, {}, {})
+            viewHolder.isLocked = true
+            viewHolder.bind(task, i, "normal")
+            groupBinding.tasksLayout.addView(entry)
         }
-        taskGrouplayout?.addView(taskGroup)
     }
 
     private fun getLabelByTypeAndCount(type: String, count: Int): String {
@@ -357,13 +302,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/ChallengeFilterDialogHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
index 952f20d44..dc60425f3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
@@ -3,23 +3,15 @@ package com.habitrpg.android.habitica.ui.fragments.social.challenges
 import android.app.Activity
 import android.app.AlertDialog
 import android.view.View
-import android.widget.Button
-import android.widget.CheckBox
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.DialogChallengeFilterBinding
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengesFilterRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.utils.Action1
 
 internal class ChallengeFilterDialogHolder private constructor(view: View, private val context: Activity) {
-
-    private val groupRecyclerView: RecyclerView? by bindView(view, R.id.challenge_filter_recycler_view)
-    private val allButton: Button? by bindView(view, R.id.challenge_filter_button_all)
-    private val noneButton: Button? by bindView(view, R.id.challenge_filter_button_none)
-    private val checkboxOwned: CheckBox? by bindView(view, R.id.challenge_filter_owned)
-    private val checkboxNotOwned: CheckBox? by bindView(view, R.id.challenge_filter_not_owned)
+    private val binding = DialogChallengeFilterBinding.bind(view)
 
     private var dialog: AlertDialog? = null
     private var filterGroups: List<Group>? = null
@@ -28,8 +20,8 @@ internal class ChallengeFilterDialogHolder private constructor(view: View, priva
     private var adapter: ChallengesFilterRecyclerViewAdapter? = null
 
     init {
-        allButton?.setOnClickListener { allClicked() }
-        noneButton?.setOnClickListener { noneClicked() }
+        binding.challengeFilterButtonAll.setOnClickListener { allClicked() }
+        binding.challengeFilterButtonNone.setOnClickListener { noneClicked() }
     }
 
     fun bind(builder: AlertDialog.Builder, filterGroups: List<Group>,
@@ -43,32 +35,31 @@ internal class ChallengeFilterDialogHolder private constructor(view: View, priva
         fillChallengeGroups()
 
         if (currentFilter != null) {
-            checkboxOwned?.isChecked = currentFilter.showOwned
-            checkboxNotOwned?.isChecked = currentFilter.notOwned
+            binding.challengeFilterOwned.isChecked = currentFilter.showOwned
+            binding.challengeFilterNotOwned.isChecked = currentFilter.notOwned
         }
     }
 
     private fun fillChallengeGroups() {
-        this.groupRecyclerView?.layoutManager = LinearLayoutManager(context)
+        binding.challengeFilterRecyclerView.layoutManager = LinearLayoutManager(context)
         adapter = filterGroups?.let { ChallengesFilterRecyclerViewAdapter(it) }
         if (currentFilter != null && currentFilter?.showByGroups != null) {
             adapter?.selectAll(currentFilter?.showByGroups ?: emptyList())
         }
 
-        this.groupRecyclerView?.adapter = adapter
+        binding.challengeFilterRecyclerView.adapter = adapter
     }
 
     private fun doneClicked() {
         val options = ChallengeFilterOptions()
         options.showByGroups = this.adapter?.checkedEntries
-        options.showOwned = checkboxOwned?.isChecked ?: false
-        options.notOwned = checkboxNotOwned?.isChecked ?: false
+        options.showOwned = binding.challengeFilterOwned.isChecked
+        options.notOwned = binding.challengeFilterNotOwned.isChecked
 
         selectedGroupsCallback?.call(options)
         this.dialog?.hide()
     }
 
-
     private fun allClicked() {
         this.adapter?.selectAll()
     }
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..0d71a42db 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
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentChallengeslistBinding
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Challenge
@@ -18,20 +18,16 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.utils.Action1
-import io.reactivex.Flowable
-import io.reactivex.functions.Consumer
-import io.reactivex.rxkotlin.combineLatest
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.kotlin.Flowables
 import io.realm.RealmResults
 import javax.inject.Inject
 import javax.inject.Named
 
 
-class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+class ChallengeListFragment : BaseFragment<FragmentChallengeslistBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var challengeRepository: ChallengeRepository
@@ -42,9 +38,11 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
 
-    private val swipeRefreshLayout: androidx.swiperefreshlayout.widget.SwipeRefreshLayout? by bindView(R.id.refreshLayout)
-    private val recyclerView: RecyclerViewEmptySupport? by bindView(R.id.recyclerView)
-    private val emptyView: View? by bindView(R.id.emptyView)
+    override var binding: FragmentChallengeslistBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentChallengeslistBinding {
+        return FragmentChallengeslistBinding.inflate(inflater, container, false)
+    }
 
     private var challengeAdapter: ChallengesListViewAdapter? = null
     private var viewUserChallengesOnly: Boolean = false
@@ -66,42 +64,34 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
         super.onDestroy()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_challengeslist)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
-        challengeAdapter = ChallengesListViewAdapter(null, true, viewUserChallengesOnly, userId)
-        challengeAdapter?.getOpenDetailFragmentFlowable()?.subscribe(Consumer { openDetailFragment(it) }, RxErrorHandler.handleEmptyError())
+        challengeAdapter = ChallengesListViewAdapter(viewUserChallengesOnly, userId)
+        challengeAdapter?.getOpenDetailFragmentFlowable()?.subscribe({ openDetailFragment(it) }, RxErrorHandler.handleEmptyError())
                 ?.let { compositeSubscription.add(it) }
 
-        swipeRefreshLayout?.setOnRefreshListener(this)
+        binding?.refreshLayout?.setOnRefreshListener(this)
 
-        recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this.activity)
-        recyclerView?.adapter = challengeAdapter
+        binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this.activity)
+        binding?.recyclerView?.adapter = challengeAdapter
         if (!viewUserChallengesOnly) {
-            this.recyclerView?.setBackgroundResource(R.color.white)
+            binding?.recyclerView?.setBackgroundResource(R.color.content_background)
         }
 
-        compositeSubscription.add(socialRepository.getGroup(Group.TAVERN_ID).combineLatest(socialRepository.getUserGroups("guild")).subscribe(Consumer {
+        compositeSubscription.add(Flowables.combineLatest(socialRepository.getGroup(Group.TAVERN_ID), socialRepository.getUserGroups("guild")).subscribe({
             this.filterGroups = mutableListOf()
             filterGroups?.add(it.first)
             filterGroups?.addAll(it.second)
         }, RxErrorHandler.handleEmptyError()))
 
-        recyclerView?.setEmptyView(emptyView)
-        recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+        binding?.recyclerView?.setEmptyView(binding?.emptyView)
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
         challengeAdapter?.updateUnfilteredData(challenges)
         loadLocalChallenges()
 
-        recyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+        binding?.recyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                 super.onScrollStateChanged(recyclerView, newState)
 
@@ -127,7 +117,7 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
     }
 
     private fun setRefreshing(state: Boolean) {
-        swipeRefreshLayout?.isRefreshing = state
+        binding?.refreshLayout?.isRefreshing = state
     }
 
     private fun loadLocalChallenges() {
@@ -137,7 +127,7 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
             challengeRepository.getChallenges()
         }
 
-        compositeSubscription.add(observable.firstElement().subscribe(Consumer { challenges ->
+        compositeSubscription.add(observable.subscribe({ challenges ->
             if (challenges.size == 0) {
                 retrieveChallengesPage()
             }
@@ -147,13 +137,13 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
     }
 
     internal fun retrieveChallengesPage(forced: Boolean = false) {
-        if ((!forced && swipeRefreshLayout?.isRefreshing == true) || loadedAllData) {
+        if ((!forced && binding?.refreshLayout?.isRefreshing == true) || loadedAllData || !this::challengeRepository.isInitialized) {
             return
         }
         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/challenges/ChallengesOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
index bb6a87d96..02a6a39e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
@@ -11,19 +11,23 @@ import androidx.fragment.app.FragmentStatePagerAdapter
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import javax.inject.Inject
 
-class ChallengesOverviewFragment : BaseMainFragment() {
+class ChallengesOverviewFragment : BaseMainFragment<FragmentViewpagerBinding>() {
 
     @Inject
     internal lateinit var challengeRepository: ChallengeRepository
 
-    private val viewPager: androidx.viewpager.widget.ViewPager? by bindView(R.id.viewPager)
-    var statePagerAdapter: FragmentStatePagerAdapter? = null
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
+    private var statePagerAdapter: FragmentStatePagerAdapter? = null
     private var userChallengesFragment: ChallengeListFragment? = ChallengeListFragment()
     private var availableChallengesFragment: ChallengeListFragment? = ChallengeListFragment()
 
@@ -31,15 +35,12 @@ class ChallengesOverviewFragment : BaseMainFragment() {
                               savedInstanceState: Bundle?): View? {
         this.usesTabLayout = true
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_viewpager, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         userChallengesFragment?.setViewUserChallengesOnly(true)
 
         availableChallengesFragment?.setViewUserChallengesOnly(false)
@@ -71,12 +72,7 @@ class ChallengesOverviewFragment : BaseMainFragment() {
 
     @Suppress("ReturnCount")
     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
-
-        when (id) {
+        when (item.itemId) {
             R.id.action_create_challenge -> {
                 val intent = Intent(getActivity(), ChallengeFormActivity::class.java)
                 startActivity(intent)
@@ -96,7 +92,7 @@ class ChallengesOverviewFragment : BaseMainFragment() {
     }
 
     private fun getActiveFragment(): ChallengeListFragment? {
-        return if (viewPager?.currentItem == 0) {
+        return if (binding?.viewPager?.currentItem == 0) {
             userChallengesFragment
         } else {
             availableChallengesFragment
@@ -128,8 +124,8 @@ class ChallengesOverviewFragment : BaseMainFragment() {
                 }
             }
         }
-        viewPager?.adapter = statePagerAdapter
-        tabLayout?.setupWithViewPager(viewPager)
+        binding?.viewPager?.adapter = statePagerAdapter
+        tabLayout?.setupWithViewPager(binding?.viewPager)
         statePagerAdapter?.notifyDataSetChanged()
     }
 
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..91f3afc5c 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
@@ -5,17 +5,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
-import androidx.lifecycle.Observer
-import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentPartyDetailBinding
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -29,28 +28,31 @@ import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment
-import com.habitrpg.android.habitica.ui.helpers.*
-import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder.GroupMemberViewHolder
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
+import com.habitrpg.android.habitica.ui.helpers.setMarkdown
+import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.social.InvitationsView
-import com.habitrpg.android.habitica.ui.views.social.OldQuestProgressView
-import io.reactivex.functions.Consumer
 import io.realm.RealmResults
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import net.pherth.android.emoji_library.EmojiEditText
 import javax.inject.Inject
 import javax.inject.Named
-import kotlinx.android.synthetic.main.fragment_party_detail.invitations_view
 
-class PartyDetailFragment : BaseFragment() {
+class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
 
     var viewModel: PartyViewModel? = null
 
+    override var binding: FragmentPartyDetailBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentPartyDetailBinding {
+        return FragmentPartyDetailBinding.inflate(inflater, container, false)
+    }
+
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
@@ -60,36 +62,10 @@ class PartyDetailFragment : BaseFragment() {
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
 
-    private val refreshLayout: androidx.swiperefreshlayout.widget.SwipeRefreshLayout? by bindView(R.id.refreshLayout)
-    private val partyInvitationWrapper: ViewGroup? by bindView(R.id.party_invitation_wrapper)
-    private val invitationsView: InvitationsView? by bindView(R.id.invitations_view)
-    private val inviteLeaderAvatarView: AvatarView? by bindView(R.id.groupleader_avatar_view)
-    private val inviteLeaderTextView: TextView? by bindView(R.id.groupleader_text_view)
-    private val titleView: TextView? by bindView(R.id.title_view)
-    private val descriptionView: TextView? by bindView(R.id.description_view)
-    private val newQuestButton: Button? by bindView(R.id.new_quest_button)
-    private val questDetailButton: ViewGroup? by bindView(R.id.quest_detail_button)
-    private val questScrollImageView: SimpleDraweeView? by bindView(R.id.quest_scroll_image_view)
-    private val questTitleView: TextView? by bindOptionalView(R.id.quest_title_view)
-    private val questParticipationView: TextView? by bindOptionalView(R.id.quest_participation_view)
-    private val questImageWrapper: ViewGroup? by bindView(R.id.quest_image_wrapper)
-    private val questImageView: SimpleDraweeView? by bindView(R.id.quest_image_view)
-    private val questParticipantResponseWrapper: ViewGroup? by bindView(R.id.quest_participant_response_wrapper)
-    private val questAcceptButton: Button? by bindView(R.id.quest_accept_button)
-    private val questRejectButton: Button? by bindView(R.id.quest_reject_button)
-    private val questProgressView: OldQuestProgressView? by bindView(R.id.quest_progress_view)
-    private val membersWrapper: LinearLayout? by bindView(R.id.members_wrapper)
-    private val leaveButton: Button? by bindView(R.id.leave_button)
-
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_party_detail, container, false)
-    }
-
     override fun onDestroyView() {
         inventoryRepository.close()
         super.onDestroyView()
@@ -98,44 +74,43 @@ class PartyDetailFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
 
-        refreshLayout?.setOnRefreshListener { this.refreshParty() }
+        binding?.refreshLayout?.setOnRefreshListener { this.refreshParty() }
 
-        questAcceptButton?.setOnClickListener { onQuestAccept() }
-        questRejectButton?.setOnClickListener { onQuestReject() }
-        newQuestButton?.setOnClickListener { inviteNewQuest() }
-        questDetailButton?.setOnClickListener { questDetailButtonClicked() }
-        leaveButton?.setOnClickListener { leaveParty() }
+        binding?.questAcceptButton?.setOnClickListener { onQuestAccept() }
+        binding?.questRejectButton?.setOnClickListener { onQuestReject() }
+        binding?.newQuestButton?.setOnClickListener { inviteNewQuest() }
+        binding?.questDetailButton?.setOnClickListener { questDetailButtonClicked() }
+        binding?.leaveButton?.setOnClickListener { leaveParty() }
 
-        invitationsView?.setLeader = null
+        binding?.invitationsView?.setLeader = null
 
-        invitationsView?.acceptCall = {
+        binding?.invitationsView?.acceptCall = {
             viewModel?.joinGroup(it) {
                 compositeSubscription.add(userRepository.retrieveUser(false)
-                        .subscribe(Consumer { user ->
-                            fragmentManager?.popBackStack()
+                        .subscribe { user ->
+                            parentFragmentManager.popBackStack()
                             MainNavigationController.navigate(R.id.partyFragment,
                                     bundleOf(Pair("partyID", user.party?.id)))
 
-                        }))
+                        })
             }
         }
 
-        invitationsView?.rejectCall = {
+        binding?.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() {
         viewModel?.retrieveGroup {
-            refreshLayout?.isRefreshing = false
+            binding?.refreshLayout?.isRefreshing = false
         }
     }
 
@@ -143,27 +118,26 @@ class PartyDetailFragment : BaseFragment() {
         if (party == null) {
             return
         }
-        if (titleView == null) {
+        if (binding?.titleView == null) {
             return
         }
-        titleView?.text = party.name
-        descriptionView?.setMarkdown(party.description)
+        binding?.titleView?.text = party.name
+        binding?.descriptionView?.setMarkdown(party.description)
 
         if (party.quest?.key?.isEmpty() == false) {
-            newQuestButton?.visibility = View.GONE
-            questDetailButton?.visibility = View.VISIBLE
-            questImageWrapper?.visibility = View.VISIBLE
+            binding?.newQuestButton?.visibility = View.GONE
+            binding?.questDetailButton?.visibility = View.VISIBLE
+            binding?.questImageWrapper?.visibility = View.VISIBLE
             GlobalScope.launch(Dispatchers.Main) {
                 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
-            questDetailButton?.visibility = View.GONE
-            questImageWrapper?.visibility = View.GONE
-            questProgressView?.visibility = View.GONE
+            binding?.newQuestButton?.visibility = View.VISIBLE
+            binding?.questDetailButton?.visibility = View.GONE
+            binding?.questImageWrapper?.visibility = View.GONE
+            binding?.questProgressView?.visibility = View.GONE
         }
     }
 
@@ -177,48 +151,48 @@ class PartyDetailFragment : BaseFragment() {
             invitationVisibility = View.VISIBLE
         }
 
-        if (partyInvitationWrapper != null) {
-            partyInvitationWrapper?.visibility = invitationVisibility
+        if (binding?.partyInvitationWrapper != null) {
+            binding?.partyInvitationWrapper?.visibility = invitationVisibility
         }
 
-        if (questParticipantResponseWrapper != null) {
+        if (binding?.questParticipantResponseWrapper != null) {
             if (showParticipantButtons()) {
-                questParticipantResponseWrapper?.visibility = View.VISIBLE
+                binding?.questParticipantResponseWrapper?.visibility = View.VISIBLE
             } else {
-                questParticipantResponseWrapper?.visibility = View.GONE
+                binding?.questParticipantResponseWrapper?.visibility = View.GONE
             }
         }
 
-        questProgressView?.configure(user, viewModel?.isUserOnQuest)
+        binding?.questProgressView?.configure(user, viewModel?.isUserOnQuest)
 
         if ((user.invitations?.parties?.count() ?: 0) > 0) {
-            partyInvitationWrapper?.visibility = View.VISIBLE
+            binding?.partyInvitationWrapper?.visibility = View.VISIBLE
             user.invitations?.parties?.let {
                 for (invitation in it){
                     val leaderID = invitation.inviter
                     val groupName = invitation.name
 
-                    leaderID.let {
+                    leaderID.let { id ->
                         compositeSubscription.add(
-                            socialRepository.getMember(it)
-                                    .subscribe(Consumer {
-                                        inviteLeaderAvatarView?.setAvatar(it)
-                                        inviteLeaderTextView?.text = getString(R.string.invitation_title,it.displayName,groupName)
+                            socialRepository.getMember(id)
+                                    .subscribe({ member ->
+                                        binding?.root?.findViewById<AvatarView>(R.id.groupleader_avatar_view)?.setAvatar(member)
+                                        binding?.root?.findViewById<TextView>(R.id.groupleader_text_view)?.text = getString(R.string.invitation_title, member.displayName, groupName)
                                     }, RxErrorHandler.handleEmptyError())
                                 )
                     }
 
                     view?.findViewById<Button>(R.id.accept_button)?.setOnClickListener {
-                        invitation.id?.let { it1 -> invitations_view.acceptCall?.invoke(it1) }
+                        invitation.id?.let { it1 -> binding?.invitationsView?.acceptCall?.invoke(it1) }
                     }
 
                     view?.findViewById<Button>(R.id.reject_button)?.setOnClickListener {
-                        invitation.id?.let { it1 -> invitations_view.rejectCall?.invoke(it1) }
+                        invitation.id?.let { it1 -> binding?.invitationsView?.rejectCall?.invoke(it1) }
                     }
                 }
             }
         } else {
-            partyInvitationWrapper?.visibility = View.GONE
+            binding?.partyInvitationWrapper?.visibility = View.GONE
         }
     }
 
@@ -227,48 +201,48 @@ class PartyDetailFragment : BaseFragment() {
     }
 
     private fun updateQuestContent(questContent: QuestContent) {
-        if (questTitleView == null || !questContent.isValid) {
+        if (binding?.questTitleView == null || !questContent.isValid) {
             return
         }
-        questTitleView?.text = questContent.text
-        DataBindingUtils.loadImage(questScrollImageView, "inventory_quest_scroll_" + questContent.key)
+        binding?.questTitleView?.text = questContent.text
+        DataBindingUtils.loadImage(binding?.questScrollImageView, "inventory_quest_scroll_" + questContent.key)
         if (questContent.hasGifImage()) {
-            DataBindingUtils.loadImage(questImageView, "quest_" + questContent.key, "gif")
+            DataBindingUtils.loadImage(binding?.questImageView, "quest_" + questContent.key, "gif")
         } else {
-            DataBindingUtils.loadImage(questImageView, "quest_" + questContent.key)
+            DataBindingUtils.loadImage(binding?.questImageView, "quest_" + questContent.key)
         }
-        questImageWrapper?.alpha = 1.0f
-        questProgressView?.alpha = 1.0f
-        context?.let { questParticipationView?.setTextColor(ContextCompat.getColor(it, R.color.gray_300)) }
+        binding?.questImageWrapper?.alpha = 1.0f
+        binding?.questProgressView?.alpha = 1.0f
+        context?.let { binding?.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)
+            binding?.questProgressView?.visibility = View.VISIBLE
+            binding?.questProgressView?.setData(questContent, viewModel?.getGroupData()?.value?.quest?.progress)
 
             val questParticipants = viewModel?.getGroupData()?.value?.quest?.members
             if (questParticipants?.find { it.key == userId } != null) {
-                questParticipationView?.text = context?.getString(R.string.number_participants, questParticipants.size)
+                binding?.questParticipationView?.text = context?.getString(R.string.number_participants, questParticipants.size)
             } else {
-                questParticipationView?.text = context?.getString(R.string.not_participating)
-                context?.let { questParticipationView?.setTextColor(ContextCompat.getColor(it, R.color.red_10)) }
-                questImageWrapper?.alpha = 0.5f
-                questProgressView?.alpha = 0.5f
+                binding?.questParticipationView?.text = context?.getString(R.string.not_participating)
+                context?.let { binding?.questParticipationView?.setTextColor(ContextCompat.getColor(it, R.color.red_10)) }
+                binding?.questImageWrapper?.alpha = 0.5f
+                binding?.questProgressView?.alpha = 0.5f
             }
         } else {
-            questProgressView?.visibility = View.GONE
+            binding?.questProgressView?.visibility = View.GONE
             val members = viewModel?.getGroupData()?.value?.quest?.members
             val responded = members?.filter { it.isParticipating != null }
-            questParticipationView?.text = context?.getString(R.string.number_responded, responded?.size, members?.size)
+            binding?.questParticipationView?.text = context?.getString(R.string.number_responded, responded?.size, members?.size)
         }
     }
 
     private fun updateMembersList(members: RealmResults<Member>?) {
         val leaderID = viewModel?.leaderID
         members?.forEachIndexed { index, member ->
-            val memberView = (if (membersWrapper?.childCount ?: 0 > index) {
-                membersWrapper?.getChildAt(index)
+            val memberView = (if (binding?.membersWrapper?.childCount ?: 0 > index) {
+                binding?.membersWrapper?.getChildAt(index)
             } else {
-                val view = membersWrapper?.inflate(R.layout.party_member, false)
-                membersWrapper?.addView(view)
+                val view = binding?.membersWrapper?.inflate(R.layout.party_member, false)
+                binding?.membersWrapper?.addView(view)
                 view
             }) ?: return@forEachIndexed
             val viewHolder = GroupMemberViewHolder(memberView)
@@ -292,7 +266,7 @@ class PartyDetailFragment : BaseFragment() {
         val factory = LayoutInflater.from(context)
         val newMessageView = factory.inflate(R.layout.profile_new_message_dialog, null)
 
-        val emojiEditText = newMessageView.findViewById<EmojiEditText>(R.id.edit_new_message_text)
+        val emojiEditText = newMessageView.findViewById<AppCompatEditText>(R.id.edit_new_message_text)
 
         val newMessageTitle = newMessageView.findViewById<TextView>(R.id.new_message_title)
         newMessageTitle.text = String.format(getString(R.string.profile_send_message_to), username)
@@ -300,7 +274,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 +291,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 +309,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)
@@ -352,7 +326,8 @@ class PartyDetailFragment : BaseFragment() {
         val fragment = ItemRecyclerFragment()
         fragment.itemType = "quests"
         fragment.itemTypeText = getString(R.string.quest)
-        fragmentManager?.let { fragment.show(it, "questDialog") }
+        fragment.isModal = true
+        fragment.show(parentFragmentManager, "questDialog")
     }
 
     internal fun leaveParty() {
@@ -362,13 +337,13 @@ class PartyDetailFragment : BaseFragment() {
             alert.setMessage(R.string.leave_party_confirmation)
             alert.addButton(R.string.keep_challenges, true) { _, _ ->
                 viewModel?.leaveGroup(true) {
-                    fragmentManager?.popBackStack()
+                    parentFragmentManager.popBackStack()
                     MainNavigationController.navigate(R.id.noPartyFragment)
                 }
             }
             alert.addButton(R.string.leave_challenges, true) { _, _ ->
                 viewModel?.leaveGroup(false) {
-                    fragmentManager?.popBackStack()
+                    parentFragmentManager.popBackStack()
                     MainNavigationController.navigate(R.id.noPartyFragment)
                 }
             }
@@ -386,18 +361,6 @@ class PartyDetailFragment : BaseFragment() {
         viewModel?.rejectQuest()
     }
 
-    private fun onPartyInviteAccepted() {
-        viewModel?.getUserData()?.value?.invitations?.party?.id?.let {
-            viewModel?.joinGroup(it)
-        }
-    }
-
-    private fun onPartyInviteRejected() {
-        viewModel?.getUserData()?.value?.invitations?.party?.id?.let {
-            viewModel?.rejectGroupInvite(it)
-        }
-    }
-
     private fun questDetailButtonClicked() {
         viewModel?.getGroupData()?.value?.let { party ->
             MainNavigationController.navigate(PartyFragmentDirections.openQuestDetail(party.id, party.quest?.key ?: ""))
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..1eccf3a5a 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
@@ -6,61 +6,62 @@ import android.os.Bundle
 import android.view.*
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager.widget.ViewPager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
 import com.habitrpg.android.habitica.ui.activities.GroupInviteActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.fragments.social.ChatFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
 import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
 import java.util.*
 
 
-class PartyFragment : BaseMainFragment() {
+class PartyFragment : BaseMainFragment<FragmentViewpagerBinding>() {
 
     private var detailFragment: PartyDetailFragment? = null
-    private val viewPager: ViewPager? by bindView(R.id.viewPager)
     private var chatFragment: ChatFragment? = null
     private var viewPagerAdapter: FragmentPagerAdapter? = null
 
     internal lateinit var viewModel: PartyViewModel
 
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.usesTabLayout = true
         this.hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_viewpager, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        resetViews()
 
-        viewModel = ViewModelProviders.of(this)
+        viewModel = ViewModelProvider(this)
                 .get(PartyViewModel::class.java)
         viewModel.groupViewType = GroupViewType.PARTY
 
         viewModel.getGroupData().observe(viewLifecycleOwner,
-                Observer {
+                {
                     updateGroupUI(it)
                 })
 
 
-        viewPager?.currentItem = 0
+        binding?.viewPager?.currentItem = 0
 
         setViewPagerAdapter()
 
         arguments?.let {
             val args = PartyFragmentArgs.fromBundle(it)
-            viewPager?.currentItem = args.tabToOpen
+            binding?.viewPager?.currentItem = args.tabToOpen
             if (args.partyID?.isNotBlank() == true) {
                 viewModel.setGroupID(args.partyID ?: "")
             }
@@ -184,9 +185,6 @@ class PartyFragment : BaseMainFragment() {
 
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
-        if (this.user == null) {
-            return
-        }
 
         viewPagerAdapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
@@ -221,9 +219,9 @@ class PartyFragment : BaseMainFragment() {
                 } ?: ""
             }
         }
-        this.viewPager?.adapter = viewPagerAdapter
+        binding?.viewPager?.adapter = viewPagerAdapter
 
-        viewPager?.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+        binding?.viewPager?.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
                 if (position == 1) {
                     chatFragment?.setNavigatedToFragment()
@@ -238,6 +236,6 @@ class PartyFragment : BaseMainFragment() {
 
             override fun onPageScrollStateChanged(state: Int) { /* no-op */ }
         })
-        tabLayout?.setupWithViewPager(viewPager)
+        tabLayout?.setupWithViewPager(binding?.viewPager)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
index fd5c0bdbe..ecab13d0a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
@@ -5,35 +5,34 @@ import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentPartyInviteBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 import java.util.*
 import javax.inject.Inject
 
-class PartyInviteFragment : BaseFragment() {
+class PartyInviteFragment : BaseFragment<FragmentPartyInviteBinding>() {
 
     @Inject
     lateinit var configManager: AppConfigManager
 
+    override var binding: FragmentPartyInviteBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentPartyInviteBinding {
+        return FragmentPartyInviteBinding.inflate(inflater, container, false)
+    }
+
     var isEmailInvite: Boolean = false
 
-    private val inviteDescription: TextView? by bindView(R.id.inviteDescription)
-    private val invitationWrapper: LinearLayout? by bindView(R.id.invitationWrapper)
-    private val addInviteButton: Button? by bindView(R.id.addInviteButton)
 
     val values: Array<String>
         get() {
             val values = ArrayList<String>()
-            for (i in 0 until (invitationWrapper?.childCount ?: 0)) {
-                val valueEditText = invitationWrapper?.getChildAt(i) as? EditText
+            for (i in 0 until (binding?.invitationWrapper?.childCount ?: 0)) {
+                val valueEditText = binding?.invitationWrapper?.getChildAt(i) as? EditText
                 if (valueEditText?.text?.toString()?.isNotEmpty() == true) {
                     values.add(valueEditText.text.toString())
                 }
@@ -41,25 +40,18 @@ class PartyInviteFragment : BaseFragment() {
             return values.toTypedArray()
         }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_party_invite, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         if (isEmailInvite) {
-            inviteDescription?.text = getString(R.string.invite_email_description)
+            binding?.inviteDescription?.text = getString(R.string.invite_email_description)
         } else {
-            inviteDescription?.text = getString(R.string.invite_username_description)
+            binding?.inviteDescription?.text = getString(R.string.invite_username_description)
         }
 
         addInviteField()
 
-        addInviteButton?.setOnClickListener { addInviteField() }
+        binding?.addInviteButton?.setOnClickListener { addInviteField() }
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -75,6 +67,6 @@ class PartyInviteFragment : BaseFragment() {
         } else {
             editText.setHint(R.string.username)
         }
-        invitationWrapper?.addView(editText)
+        binding?.invitationWrapper?.addView(editText)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
index e980d938a..b65d5609e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
@@ -8,23 +8,31 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding
+import com.habitrpg.android.habitica.databinding.KnownIssueBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.AppTestingLevel
 import com.habitrpg.android.habitica.helpers.DeviceName
+import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import io.reactivex.Completable
+import io.reactivex.rxjava3.core.Completable
 import javax.inject.Inject
 import javax.inject.Named
 
-class BugFixFragment: BaseMainFragment() {
+class BugFixFragment: BaseMainFragment<FragmentSupportBugFixBinding>() {
     private var deviceInfo: DeviceName.DeviceInfo? = null
 
-    private lateinit var binding: FragmentSupportBugFixBinding
+    override var binding: FragmentSupportBugFixBinding? = null
 
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSupportBugFixBinding {
+        return FragmentSupportBugFixBinding.inflate(inflater, container, false)
+    }
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
     @Inject
@@ -37,21 +45,29 @@ class BugFixFragment: BaseMainFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentSupportBugFixBinding.inflate(inflater, container, false)
-        return binding.root
+        showsBackButton = true
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         compositeSubscription.add(Completable.fromAction {
-            deviceInfo = DeviceName.getDeviceInfo(context)
+            deviceInfo = context?.let { DeviceName.getDeviceInfo(it) }
         }.subscribe())
 
-        binding.reportBugButton.setOnClickListener {
+        binding?.reportBugButton?.setOnClickListener {
             sendEmail("[Android] Bugreport")
         }
+
+        appConfigManager.knownIssues().forEach { issue ->
+            val issueBinding = KnownIssueBinding.inflate(view.context.layoutInflater)
+            issueBinding.root.text = issue["title"]
+            issueBinding.root.setOnClickListener {
+                MainNavigationController.navigate(R.id.FAQDetailFragment, bundleOf(Pair("question", issue["title"]), Pair("answer", issue["text"])))
+            }
+            binding?.knownIssuesLayout?.addView(issueBinding.root)
+        }
     }
 
     private val versionName: String by lazy {
@@ -74,14 +90,14 @@ class BugFixFragment: BaseMainFragment() {
 
     private fun sendEmail(subject: String) {
         val version = Build.VERSION.SDK_INT
-        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
+        val deviceName = deviceInfo?.name ?: DeviceName.deviceName
         val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
         var bodyOfEmail = Uri.encode("Device: $manufacturer $deviceName") +
                 "%0D%0A" + Uri.encode("Android Version: $version") +
                 "%0D%0A" + Uri.encode("AppVersion: " + getString(R.string.version_info, versionName, versionCode))
 
         if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
-            bodyOfEmail += "%0D%0A" + Uri.encode("${appConfigManager.testingLevel().name}")
+            bodyOfEmail += "%0D%0A" + Uri.encode(appConfigManager.testingLevel().name)
         }
         bodyOfEmail += "%0D%0A" + Uri.encode("User ID: $userId")
 
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..2f5b54698 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
@@ -5,46 +5,48 @@ import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.FAQRepository
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentFaqDetailBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
-class FAQDetailFragment : BaseMainFragment() {
+class FAQDetailFragment : BaseMainFragment<FragmentFaqDetailBinding>() {
     @Inject
     lateinit var faqRepository: FAQRepository
 
-    private val questionTextView: TextView? by bindOptionalView(R.id.questionTextView)
-    private val answerTextView: TextView? by bindOptionalView(R.id.answerTextView)
+    override var binding: FragmentFaqDetailBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFaqDetailBinding {
+        return FragmentFaqDetailBinding.inflate(inflater, container, false)
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_faq_detail)
+        showsBackButton = true
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         arguments?.let {
             val args = FAQDetailFragmentArgs.fromBundle(it)
-            compositeSubscription.add(faqRepository.getArticle(args.position).subscribe(Consumer { faq ->
-                this.questionTextView?.text = faq.question
-                this.answerTextView?.text = MarkdownParser.parseMarkdown(faq.answer)
-            }, RxErrorHandler.handleEmptyError()))
+            if (args.question != null) {
+                binding?.questionTextView?.text = args.question
+                binding?.answerTextView?.text = MarkdownParser.parseMarkdown(args.answer)
+            } else {
+                compositeSubscription.add(faqRepository.getArticle(args.position).subscribe({ faq ->
+                    binding?.questionTextView?.text = faq.question
+                    binding?.answerTextView?.text = MarkdownParser.parseMarkdown(faq.answer)
+                }, RxErrorHandler.handleEmptyError()))
+            }
+
         }
 
-        this.answerTextView?.movementMethod = LinkMovementMethod.getInstance()
+        binding?.answerTextView?.movementMethod = LinkMovementMethod.getInstance()
     }
 
     override fun injectFragment(component: UserComponent) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
index cdfa5d49b..bd4c523c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
@@ -18,12 +18,16 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 
-class FAQOverviewFragment : BaseMainFragment() {
+class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
 
-    private lateinit var binding: FragmentFaqOverviewBinding
+    override var binding: FragmentFaqOverviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFaqOverviewBinding {
+        return FragmentFaqOverviewBinding.inflate(inflater, container, false)
+    }
 
     @Inject
     lateinit var faqRepository: FAQRepository
@@ -31,25 +35,25 @@ class FAQOverviewFragment : BaseMainFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentFaqOverviewBinding.inflate(inflater, container, false)
-        binding.healthSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfHeartLarge())
-        binding.experienceSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
-        binding.manaSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfMagicLarge())
-        binding.goldSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
-        binding.gemsSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfGem())
-        binding.hourglassesSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfHourglassLarge())
-        binding.statsSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfStats())
-
-        binding.moreHelpTextView.setMarkdown(context?.getString(R.string.need_help_header_description, "[Habitica Help Guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)"))
-        binding.moreHelpTextView.setOnClickListener { MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "5481ccf3-5d2d-48a9-a871-70a7380cee5a")) }
-        binding.moreHelpTextView.movementMethod = LinkMovementMethod.getInstance()
-        return binding.root
+        showsBackButton = true
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding?.healthSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfHeartLarge())
+        binding?.experienceSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
+        binding?.manaSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfMagicLarge())
+        binding?.goldSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
+        binding?.gemsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfGem())
+        binding?.hourglassesSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfHourglassLarge())
+        binding?.statsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfStats())
+
+        binding?.moreHelpTextView?.setMarkdown(context?.getString(R.string.need_help_header_description, "[Habitica Help Guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)"))
+        binding?.moreHelpTextView?.setOnClickListener { MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "5481ccf3-5d2d-48a9-a871-70a7380cee5a")) }
+        binding?.moreHelpTextView?.movementMethod = LinkMovementMethod.getInstance()
+
         this.loadArticles()
     }
 
@@ -66,10 +70,12 @@ class FAQOverviewFragment : BaseMainFragment() {
         compositeSubscription.add(faqRepository.getArticles().subscribe(Consumer {
             val context = context ?: return@Consumer
             for (article in it) {
-                val binding = SupportFaqItemBinding.inflate(context.layoutInflater, binding.faqLinearLayout, true)
+                val binding = SupportFaqItemBinding.inflate(context.layoutInflater, binding?.faqLinearLayout, true)
                 binding.textView.text = article.question
                 binding.root.setOnClickListener {
-                    MainNavigationController.navigate(FAQOverviewFragmentDirections.openFAQDetail(article.position ?: 0))
+                    val direction = FAQOverviewFragmentDirections.openFAQDetail(null, null)
+                    direction.position = article.position ?: 0
+                    MainNavigationController.navigate(direction)
                 }
             }
         }, RxErrorHandler.handleEmptyError()))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
index 0c64c7a48..6ee86ea7e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
@@ -1,9 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.support
 
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -14,20 +11,24 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.FAQRepository
 import com.habitrpg.android.habitica.databinding.FragmentSupportMainBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.AppTestingLevel
 import com.habitrpg.android.habitica.helpers.DeviceName
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import io.reactivex.Completable
+import io.reactivex.rxjava3.core.Completable
 import javax.inject.Inject
 import javax.inject.Named
 
 
-class SupportMainFragment : BaseMainFragment() {
+class SupportMainFragment : BaseMainFragment<FragmentSupportMainBinding>() {
     private var deviceInfo: DeviceName.DeviceInfo? = null
 
-    private lateinit var binding: FragmentSupportMainBinding
+    override var binding: FragmentSupportMainBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSupportMainBinding {
+        return FragmentSupportMainBinding.inflate(inflater, container, false)
+    }
+
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
     @Inject
@@ -38,20 +39,18 @@ class SupportMainFragment : BaseMainFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         hidesToolbar = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        binding = FragmentSupportMainBinding.inflate(inflater, container, false)
-        return binding.root
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.usingHabiticaWrapper.setOnClickListener {
+        binding?.usingHabiticaWrapper?.setOnClickListener {
             MainNavigationController.navigate(R.id.FAQOverviewFragment)
         }
-        binding.bugsFixesWrapper.setOnClickListener {
+        binding?.bugsFixesWrapper?.setOnClickListener {
             MainNavigationController.navigate(R.id.bugFixFragment)
         }
-        binding.suggestionsFeedbackWrapper.setOnClickListener {
+        binding?.suggestionsFeedbackWrapper?.setOnClickListener {
             if (appConfigManager.feedbackURL().isNotBlank()) {
                 val uriUrl = appConfigManager.feedbackURL().toUri()
                 val launchBrowser = Intent(Intent.ACTION_VIEW, uriUrl)
@@ -60,11 +59,11 @@ class SupportMainFragment : BaseMainFragment() {
         }
 
         compositeSubscription.add(Completable.fromAction {
-            deviceInfo = DeviceName.getDeviceInfo(context)
+            deviceInfo = context?.let { DeviceName.getDeviceInfo(it) }
         }.subscribe())
 
-        binding.resetTutorialButton.setOnClickListener {
-            userRepository.resetTutorial(user)
+        binding?.resetTutorialButton?.setOnClickListener {
+            userRepository.resetTutorial()
         }
     }
 
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..7adf2cc55 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
@@ -20,16 +20,16 @@ import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
 import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_refresh_recyclerview.*
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 
 class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
+    private var showCustomRewards: Boolean = true
     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)
     }
 
@@ -48,20 +48,26 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
         view.post { setGridSpanCount(view.width) }
         context?.let {
-            recyclerView.setBackgroundColor(ContextCompat.getColor(it, R.color.white))
+            binding?.recyclerView?.setBackgroundColor(ContextCompat.getColor(it, R.color.content_background))
         }
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
-        compositeSubscription.add(inventoryRepository.getInAppRewards().subscribe(Consumer {
-            (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
-        }, RxErrorHandler.handleEmptyError()))
+        if (showCustomRewards) {
+            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) }
+
+        compositeSubscription.add(userRepository.getUser().subscribe({
+            (recyclerAdapter as? RewardsRecyclerViewAdapter)?.user = it
+        }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun getLayoutManager(context: Context?): LinearLayoutManager {
@@ -69,12 +75,12 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
     }
 
     override fun onRefresh() {
-        refreshLayout.isRefreshing = true
+        binding?.refreshLayout?.isRefreshing = true
         compositeSubscription.add(userRepository.retrieveUser(true, true)
-                .flatMap<List<ShopItem>> { inventoryRepository.retrieveInAppRewards() }
+                .flatMap { inventoryRepository.retrieveInAppRewards() }
                 .doOnTerminate {
-                    refreshLayout?.isRefreshing = false
-                }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+                    binding?.refreshLayout?.isRefreshing = false
+                }.subscribe({ }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun setGridSpanCount(width: Int) {
@@ -97,7 +103,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
             when (requestCode) {
                 11 -> {
                     if (resultCode == Activity.RESULT_OK) {
-                        userRepository.useSkill(user,
+                        userRepository.useSkill(null,
                                 selectedCard?.key ?: "",
                                 "member",
                                 data.getStringExtra("member_id") ?: "")
@@ -115,11 +121,11 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
     companion object {
 
-        fun newInstance(context: Context?, user: User?, classType: String): RewardsRecyclerviewFragment {
+        fun newInstance(context: Context?, classType: String, showCustomRewards: Boolean): RewardsRecyclerviewFragment {
             val fragment = RewardsRecyclerviewFragment()
             fragment.retainInstance = true
-            fragment.user = user
             fragment.classType = classType
+            fragment.showCustomRewards = showCustomRewards
 
             if (context != null) {
                 fragment.tutorialStepIdentifier = "rewards"
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..26c438e73 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
@@ -32,6 +32,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.tasks.*
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
@@ -39,19 +40,24 @@ import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Named
 
-open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
-    lateinit var binding: FragmentRefreshRecyclerviewBinding
+open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+    internal var canEditTasks: Boolean = true
+    internal var canScoreTaks: Boolean = true
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
     var recyclerAdapter: TaskRecyclerViewAdapter? = null
     var itemAnimator = SafeDefaultItemAnimator()
-    @field:[Inject Named(AppModule.NAMED_USER_ID)]
-    lateinit var userID: String
+    var ownerID: String = ""
     @Inject
     lateinit var apiClient: ApiClient
     @Inject
@@ -70,15 +76,16 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
     internal var layoutManager: RecyclerView.LayoutManager? = null
 
     internal var classType: String? = null
-    internal var user: User? = null
     private var itemTouchCallback: ItemTouchHelper.Callback? = null
 
+    var refreshAction: ((() -> Unit) -> Unit)? = null
+
     internal val className: String
         get() = this.classType ?: ""
 
     // TODO needs a bit of cleanup
     private fun setInnerAdapter() {
-        val adapter: RecyclerView.Adapter<*>? = when (this.classType) {
+        val adapter: BaseRecyclerViewAdapter<*, *>? = when (this.classType) {
             Task.TYPE_HABIT -> {
                 HabitsRecyclerViewAdapter(null, true, R.layout.habit_item_card, taskFilterHelper)
             }
@@ -89,20 +96,14 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
                 TodosRecyclerViewAdapter(null, true, R.layout.todo_item_card, taskFilterHelper)
             }
             Task.TYPE_REWARD -> {
-                RewardsRecyclerViewAdapter(null, R.layout.reward_item_card, user, configManager)
+                RewardsRecyclerViewAdapter(null, R.layout.reward_item_card)
             }
             else -> null
         }
 
         recyclerAdapter = adapter as? TaskRecyclerViewAdapter
-        binding.recyclerView.adapter = adapter
-
-        if (this.classType != null) {
-            compositeSubscription.add(taskRepository.getTasks(this.classType ?: "", userID).firstElement().subscribe(Consumer {
-                this.recyclerAdapter?.updateUnfilteredData(it)
-                this.recyclerAdapter?.filter()
-            }, RxErrorHandler.handleEmptyError()))
-        }
+        recyclerAdapter?.canScoreTasks = canScoreTaks
+        binding?.recyclerView?.adapter = adapter
 
         context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
     }
@@ -134,18 +135,40 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
 
     private fun allowReordering() {
         val itemTouchHelper = itemTouchCallback?.let { ItemTouchHelper(it) }
-        itemTouchHelper?.attachToRecyclerView(binding.recyclerView)
+        itemTouchHelper?.attachToRecyclerView(binding?.recyclerView)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
+    protected open fun getLayoutManager(context: Context?): androidx.recyclerview.widget.LinearLayoutManager {
+        return androidx.recyclerview.widget.LinearLayoutManager(context)
+    }
 
-        if (Task.TYPE_DAILY == classType) {
-            if (user?.isValid == true && user?.preferences?.dailyDueDefaultView == true) {
-                taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE)
+    override fun onDestroyView() {
+        super.onDestroyView()
+        itemTouchCallback = null
+    }
+
+    override fun onDestroy() {
+        userRepository.close()
+        inventoryRepository.close()
+        super.onDestroy()
+    }
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        context?.let { binding?.recyclerView?.setBackgroundColor(ContextCompat.getColor(it, R.color.content_background)) }
+        savedInstanceState?.let { this.classType = savedInstanceState.getString(CLASS_TYPE_KEY, "") }
+
+        when (classType) {
+            Task.TYPE_TODO -> taskFilterHelper.setActiveFilter(Task.TYPE_TODO, Task.FILTER_ACTIVE)
+            Task.TYPE_DAILY -> {
+                /*if (user?.isValid == true && user?.preferences?.dailyDueDefaultView == true) {
+                    taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE)
+                }*/
             }
-        } else if (Task.TYPE_TODO == classType) {
-            taskFilterHelper.setActiveFilter(Task.TYPE_TODO, Task.FILTER_ACTIVE)
         }
 
         itemTouchCallback = object : ItemTouchHelper.Callback() {
@@ -156,7 +179,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
                 if (taskViewHolder != null) {
                     taskViewHolder.movingFromPosition = viewHolder.adapterPosition
                 }
-                binding.refreshLayout.isEnabled = false
+                binding?.refreshLayout?.isEnabled = false
             }
 
             override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
@@ -182,7 +205,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
 
             override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
                 super.clearView(recyclerView, viewHolder)
-                binding.refreshLayout.isEnabled = true
+                binding?.refreshLayout?.isEnabled = true
 
                 if (viewHolder.adapterPosition == NO_POSITION) return
                 val taskViewHolder = viewHolder as? BaseTaskViewHolder
@@ -201,82 +224,59 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
                     )
                             .delay(1, TimeUnit.SECONDS)
                             .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(Consumer {
+                            .subscribe({
                                 recyclerAdapter?.ignoreUpdates = false
                             }, RxErrorHandler.handleEmptyError()))
                 }
             }
         }
-        if (savedInstanceState != null) {
-            this.classType = savedInstanceState.getString(CLASS_TYPE_KEY, "")
-        }
 
-        binding = FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    protected open fun getLayoutManager(context: Context?): androidx.recyclerview.widget.LinearLayoutManager {
-        return androidx.recyclerview.widget.LinearLayoutManager(context)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        itemTouchCallback = null
-    }
-
-    override fun onDestroy() {
-        userRepository.close()
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding.recyclerView.setScaledPadding(context, 0, 0, 0, 48)
-        binding.recyclerView.adapter = recyclerAdapter as? RecyclerView.Adapter<*>
+        binding?.recyclerView?.setScaledPadding(context, 0, 0, 0, 48)
+        binding?.recyclerView?.adapter = recyclerAdapter as? RecyclerView.Adapter<*>
         recyclerAdapter?.filter()
 
         layoutManager = getLayoutManager(context)
         layoutManager?.isItemPrefetchEnabled = false
-        binding.recyclerView.layoutManager = layoutManager
+        binding?.recyclerView?.layoutManager = layoutManager
 
-        if (binding.recyclerView.adapter == null) {
+        if (binding?.recyclerView?.adapter == null) {
             this.setInnerAdapter()
         }
 
         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) }
+            }?.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) }
+
+            compositeSubscription.add(taskRepository.getTasks(this.classType ?: "", ownerID).subscribe({
+                this.recyclerAdapter?.updateUnfilteredData(it)
+                this.recyclerAdapter?.filter()
+            }, RxErrorHandler.handleEmptyError()))
         }
 
-        val bottomPadding = (binding.recyclerView.paddingBottom + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 60f, resources.displayMetrics)).toInt()
-        binding.recyclerView.setPadding(0, 0, 0, bottomPadding)
-        binding.recyclerView.itemAnimator = itemAnimator
+        val bottomPadding = ((binding?.recyclerView?.paddingBottom ?: 0) + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 60f, resources.displayMetrics)).toInt()
+        binding?.recyclerView?.setPadding(0, 0, 0, bottomPadding)
+        binding?.recyclerView?.itemAnimator = itemAnimator
 
-        binding.refreshLayout.setOnRefreshListener(this)
+        binding?.refreshLayout?.setOnRefreshListener(this)
 
-        binding.recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+        binding?.recyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                 super.onScrollStateChanged(recyclerView, newState)
                 if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    binding.refreshLayout.isEnabled = (activity as? MainActivity)?.isAppBarExpanded ?: false
+                    binding?.refreshLayout?.isEnabled = (activity as? MainActivity)?.isAppBarExpanded ?: false
                 }
             }
         })
@@ -284,8 +284,8 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         setEmptyLabels()
 
         if (Task.TYPE_REWARD == className) {
-            compositeSubscription.add(taskRepository.getTasks(this.className, userID)
-                    .subscribe(Consumer { recyclerAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(taskRepository.getTasks(this.className, ownerID)
+                    .subscribe({ recyclerAdapter?.data = it }, RxErrorHandler.handleEmptyError()))
         }
     }
 
@@ -294,16 +294,22 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
             if (!task.isValid) {
                 return
             }
-            taskRepository.getTasksForChallenge(task.challengeID).subscribe(Consumer { tasks ->
+            taskRepository.getTasksForChallenge(task.challengeID).firstElement().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())
+                    if (!task.isValid) return@addButton
+                    taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
+                            .flatMap { userRepository.retrieveUser(true, forced = true) }
+                            .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())
+                    if (!task.isValid) return@addButton
+                    taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
+                            .flatMap { userRepository.retrieveUser(true, forced = true) }
+                            .subscribe({}, RxErrorHandler.handleEmptyError())
                 }
                 dialog.setExtraCloseButtonVisibility(View.VISIBLE)
                 dialog.show()
@@ -313,50 +319,50 @@ 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) }
+            binding?.recyclerView?.setEmptyView(binding?.emptyView)
+            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 -> {
-                        binding.emptyIconView.setImageResource(R.drawable.icon_habits_selected)
-                        binding.emptyViewTitle.setText(R.string.empty_title_habits_filtered)
-                        binding.emptyViewDescription.setText(R.string.empty_description_habits_filtered)
+                        binding?.emptyIconView?.setImageResource(R.drawable.icon_habits)
+                        binding?.emptyViewTitle?.setText(R.string.empty_title_habits_filtered)
+                        binding?.emptyViewDescription?.setText(R.string.empty_description_habits_filtered)
                     }
                     Task.TYPE_DAILY -> {
-                        binding.emptyIconView.setImageResource(R.drawable.icon_dailies_selected)
-                        binding.emptyViewTitle.setText(R.string.empty_title_dailies_filtered)
-                        binding.emptyViewDescription.setText(R.string.empty_description_dailies_filtered)
+                        binding?.emptyIconView?.setImageResource(R.drawable.icon_dailies)
+                        binding?.emptyViewTitle?.setText(R.string.empty_title_dailies_filtered)
+                        binding?.emptyViewDescription?.setText(R.string.empty_description_dailies_filtered)
                     }
                     Task.TYPE_TODO -> {
-                        binding.emptyIconView.setImageResource(R.drawable.icon_todos_selected)
-                        binding.emptyViewTitle.setText(R.string.empty_title_todos_filtered)
-                        binding.emptyViewDescription.setText(R.string.empty_description_todos_filtered)
+                        binding?.emptyIconView?.setImageResource(R.drawable.icon_todos)
+                        binding?.emptyViewTitle?.setText(R.string.empty_title_todos_filtered)
+                        binding?.emptyViewDescription?.setText(R.string.empty_description_todos_filtered)
                     }
                     Task.TYPE_REWARD -> {
-                        binding.emptyIconView.setImageResource(R.drawable.icon_rewards_selected)
-                        binding.emptyViewTitle.setText(R.string.empty_title_rewards)
+                        binding?.emptyIconView?.setImageResource(R.drawable.icon_rewards)
+                        binding?.emptyViewTitle?.setText(R.string.empty_title_rewards)
                     }
                 }
             } else {
                 when (this.classType) {
                     Task.TYPE_HABIT -> {
-                        binding.emptyIconView.setImageResource(R.drawable.icon_habits_selected)
-                        binding.emptyViewTitle.setText(R.string.empty_title_habits)
-                        binding.emptyViewDescription.setText(R.string.empty_description_habits)
+                        binding?.emptyIconView?.setImageResource(R.drawable.icon_habits)
+                        binding?.emptyViewTitle?.setText(R.string.empty_title_habits)
+                        binding?.emptyViewDescription?.setText(R.string.empty_description_habits)
                     }
                     Task.TYPE_DAILY -> {
-                        binding.emptyIconView.setImageResource(R.drawable.icon_dailies_selected)
-                        binding.emptyViewTitle.setText(R.string.empty_title_dailies)
-                        binding.emptyViewDescription.setText(R.string.empty_description_dailies)
+                        binding?.emptyIconView?.setImageResource(R.drawable.icon_dailies)
+                        binding?.emptyViewTitle?.setText(R.string.empty_title_dailies)
+                        binding?.emptyViewDescription?.setText(R.string.empty_description_dailies)
                     }
                     Task.TYPE_TODO -> {
-                        binding.emptyIconView.setImageResource(R.drawable.icon_todos_selected)
-                        binding.emptyViewTitle.setText(R.string.empty_title_todos)
-                        binding.emptyViewDescription.setText(R.string.empty_description_todos)
+                        binding?.emptyIconView?.setImageResource(R.drawable.icon_todos)
+                        binding?.emptyViewTitle?.setText(R.string.empty_title_todos)
+                        binding?.emptyViewDescription?.setText(R.string.empty_description_todos)
                     }
                     Task.TYPE_REWARD -> {
-                        binding.emptyIconView.setImageResource(R.drawable.icon_rewards_selected)
-                        binding.emptyViewTitle.setText(R.string.empty_title_rewards)
+                        binding?.emptyIconView?.setImageResource(R.drawable.icon_rewards)
+                        binding?.emptyViewTitle?.setText(R.string.empty_title_rewards)
                     }
                 }
             }
@@ -364,9 +370,9 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
     }
 
     private fun scoreTask(task: Task, direction: TaskDirection) {
-        compositeSubscription.add(taskRepository.taskChecked(user, task, direction == TaskDirection.UP, false) { result ->
+        compositeSubscription.add(taskRepository.taskChecked(null, task, direction == TaskDirection.UP, false) { result ->
             handleTaskResult(result, task.value.toInt())
-        }.subscribeWithErrorHandler(Consumer {}))
+        }.subscribeWithErrorHandler {})
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -378,11 +384,10 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         get() = this.classType + super.displayedClassName
 
     override fun onRefresh() {
-        binding.refreshLayout.isRefreshing = true
-        compositeSubscription.add(userRepository.retrieveUser(true, true)
-                .doOnTerminate {
-                    binding.refreshLayout.isRefreshing = false
-                }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        binding?.refreshLayout?.isRefreshing = true
+        refreshAction?.invoke {
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     override fun onResume() {
@@ -397,12 +402,12 @@ 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(ownerID).subscribe({}, RxErrorHandler.handleEmptyError()))
         }
     }
 
     private fun openTaskForm(task: Task) {
-        if (Date().time - (TasksFragment.lastTaskFormOpen?.time ?: 0) < 2000 || !task.isValid) {
+        if (Date().time - (TasksFragment.lastTaskFormOpen?.time ?: 0) < 2000 || !task.isValid || !canEditTasks) {
             return
         }
 
@@ -422,10 +427,9 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
     companion object {
         private const val CLASS_TYPE_KEY = "CLASS_TYPE_KEY"
 
-        fun newInstance(context: Context?, user: User?, classType: String): TaskRecyclerViewFragment {
+        fun newInstance(context: Context?, classType: String): TaskRecyclerViewFragment {
             val fragment = TaskRecyclerViewFragment()
             fragment.retainInstance = true
-            fragment.user = user
             fragment.classType = classType
             var tutorialTexts: List<String>? = null
             if (context != null) {
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..7aba7f64b 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
@@ -12,26 +12,37 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.views.navigation.HabiticaBottomNavigationViewListener
 import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.disposables.Disposable
 import java.util.*
 import javax.inject.Inject
+import javax.inject.Named
 import kotlin.collections.ArrayList
 
 
-class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
+class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.OnQueryTextListener, HabiticaBottomNavigationViewListener {
 
-    var viewPager: androidx.viewpager.widget.ViewPager? = null
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
+    @field:[Inject Named(AppModule.NAMED_USER_ID)]
+    lateinit var userID: String
     @Inject
     lateinit var taskFilterHelper: TaskFilterHelper
     @Inject
@@ -44,19 +55,12 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
 
     private var filterMenuItem: MenuItem? = null
 
-    override var user: User?
-        get() = super.user
-        set(value) {
-            super.user = value
-            viewFragmentsDictionary?.values?.forEach { it.user = value }
-        }
-
     private val activeFragment: TaskRecyclerViewFragment?
         get() {
-            var fragment = viewFragmentsDictionary?.get(viewPager?.currentItem)
+            var fragment = viewFragmentsDictionary?.get(binding?.viewPager?.currentItem)
             if (fragment == null) {
                 if (isAdded) {
-                    fragment = (childFragmentManager.findFragmentByTag("android:switcher:" + R.id.viewPager + ":" + viewPager?.currentItem) as? TaskRecyclerViewFragment)
+                    fragment = (childFragmentManager.findFragmentByTag("android:switcher:" + R.id.viewPager + ":" + binding?.viewPager?.currentItem) as? TaskRecyclerViewFragment)
                 }
             }
             return fragment
@@ -66,42 +70,31 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
                               savedInstanceState: Bundle?): View? {
         this.usesTabLayout = false
         this.usesBottomNavigation = true
-        super.onCreateView(inflater, container, savedInstanceState)
-        val v = inflater.inflate(R.layout.fragment_viewpager, container, false)
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
 
-        viewPager = v.findViewById(R.id.viewPager)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         loadTaskLists()
-
-        return v
     }
 
     override fun onResume() {
         super.onResume()
-
-        bottomNavigation?.onTabSelectedListener = {
-            val newItem = when (it) {
-                Task.TYPE_HABIT -> 0
-                Task.TYPE_DAILY -> 1
-                Task.TYPE_TODO -> 2
-                Task.TYPE_REWARD -> 3
-                else -> 0
-            }
-            if (newItem == viewPager?.currentItem) {
-                refresh()
-            } else {
-                viewPager?.currentItem = newItem
-            }
-            updateBottomBarBadges()
+        bottomNavigation?.activeTaskType = when (binding?.viewPager?.currentItem) {
+            0 -> Task.TYPE_HABIT
+            1 -> Task.TYPE_DAILY
+            2 -> Task.TYPE_TODO
+            3 -> Task.TYPE_REWARD
+            else -> Task.TYPE_HABIT
         }
-        bottomNavigation?.onAddListener = { type ->
-            openNewTaskActivity(type)
-        }
-        bottomNavigation?.flipAddBehaviour = appConfigManager.flipAddTaskBehaviour()
+        bottomNavigation?.listener = this
+        bottomNavigation?.canAddTasks = true
     }
 
     override fun onPause() {
-        bottomNavigation?.onTabSelectedListener = null
-        bottomNavigation?.onAddListener = null
+        if (bottomNavigation?.listener == this) {
+            bottomNavigation?.listener = null
+        }
 
         super.onPause()
     }
@@ -169,10 +162,7 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
         context?.let {
             var disposable: Disposable? = null
             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().subscribe({ tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
             dialog.setActiveTags(taskFilterHelper.tags)
             if (activeFragment != null) {
                 val taskType = activeFragment?.classType
@@ -195,7 +185,7 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
             })
             dialog.setOnDismissListener {
                 if (disposable?.isDisposed == false) {
-                    disposable?.dispose()
+                    disposable.dispose()
                 }
             }
             dialog.show()
@@ -209,16 +199,22 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
     private fun loadTaskLists() {
         val fragmentManager = childFragmentManager
 
-        viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): androidx.fragment.app.Fragment {
                 val fragment: TaskRecyclerViewFragment = when (position) {
-                    0 -> TaskRecyclerViewFragment.newInstance(context, user, Task.TYPE_HABIT)
-                    1 -> TaskRecyclerViewFragment.newInstance(context, user, Task.TYPE_DAILY)
-                    3 -> RewardsRecyclerviewFragment.newInstance(context, user, Task.TYPE_REWARD)
-                    else -> TaskRecyclerViewFragment.newInstance(context, user, Task.TYPE_TODO)
+                    0 -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_HABIT)
+                    1 -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_DAILY)
+                    3 -> RewardsRecyclerviewFragment.newInstance(context, Task.TYPE_REWARD, true)
+                    else -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_TODO)
+                }
+                fragment.ownerID = userID
+                fragment.refreshAction = {
+                    compositeSubscription.add(userRepository.retrieveUser(true, true)
+                            .doOnTerminate {
+                                it()
+                            }.subscribe({ }, RxErrorHandler.handleEmptyError()))
                 }
-
                 viewFragmentsDictionary?.put(position, fragment)
 
                 return fragment
@@ -235,7 +231,7 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
             }
         }
 
-        viewPager?.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
+        binding?.viewPager?.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { /* no-op */ }
 
             override fun onPageSelected(position: Int) {
@@ -258,14 +254,14 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
         if (filterCount == 0) {
             filterMenuItem?.setIcon(R.drawable.ic_action_filter_list)
             context?.let {
-                val filterIcon = it.getDrawable(R.drawable.ic_action_filter_list)
-                filterIcon?.setColorFilter(it.getThemeColor(R.attr.headerTextColor), PorterDuff.Mode.MULTIPLY)
+                val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_action_filter_list)
+                filterIcon?.setTintWith(it.getThemeColor(R.attr.headerTextColor), PorterDuff.Mode.MULTIPLY)
                 filterMenuItem?.setIcon(filterIcon)
             }
         } else {
             context?.let {
-                val filterIcon = it.getDrawable(R.drawable.ic_filters_active)
-                filterIcon?.setColorFilter(it.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY)
+                val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_filters_active)
+                filterIcon?.setTintWith(it.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY)
                 filterMenuItem?.setIcon(filterIcon)
             }
         }
@@ -275,25 +271,25 @@ 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
                 val taskType = when (step.identifier) {
                     "habits" -> {
-                        id = R.id.tab_habits
+                        id = R.id.habits_tab
                         Task.TYPE_HABIT
                     }
                     "dailies" -> {
-                        id = R.id.tab_dailies
+                        id = R.id.dailies_tab
                         Task.TYPE_DAILY
                     }
                     "todos" -> {
-                        id = R.id.tab_todos
+                        id = R.id.todos_tab
                         Task.TYPE_TODO
                     }
                     "rewards" -> {
-                        id = R.id.tab_rewards
+                        id = R.id.rewards_tab
                         Task.TYPE_REWARD
                     }
                     else -> ""
@@ -326,7 +322,7 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
 
         val additionalData = HashMap<String, Any>()
         additionalData["created task type"] = type
-        additionalData["viewed task type"] = when (viewPager?.currentItem) {
+        additionalData["viewed task type"] = when (binding?.viewPager?.currentItem) {
             0 -> Task.TYPE_HABIT
             1 -> Task.TYPE_DAILY
             2 -> Task.TYPE_TODO
@@ -365,14 +361,20 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
             val taskType = data?.getStringExtra(TaskFormActivity.TASK_TYPE_KEY)
             if (taskType != null) {
                 switchToTaskTab(taskType)
+
+                val index = indexForTaskType(taskType)
+                if (index != -1) {
+                    val fragment = viewFragmentsDictionary?.get(index)
+                    fragment?.binding?.recyclerView?.scrollToPosition(0)
+                }
             }
         }
     }
 
     private fun switchToTaskTab(taskType: String) {
         val index = indexForTaskType(taskType)
-        if (viewPager != null && index != -1) {
-            viewPager?.currentItem = index
+        if (binding?.viewPager != null && index != -1) {
+            binding?.viewPager?.currentItem = index
             updateBottomBarBadges()
         }
     }
@@ -399,4 +401,21 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
         internal const val TASK_CREATED_RESULT = 1
         const val TASK_UPDATED_RESULT = 2
     }
+
+
+    override fun onTabSelected(taskType: String) {
+        val newItem = when (taskType) {
+            Task.TYPE_HABIT -> 0
+            Task.TYPE_DAILY -> 1
+            Task.TYPE_TODO -> 2
+            Task.TYPE_REWARD -> 3
+            else -> 0
+        }
+        binding?.viewPager?.currentItem = newItem
+        updateBottomBarBadges()
+    }
+
+    override fun onAdd(taskType: String) {
+        openNewTaskActivity(taskType)
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt
new file mode 100644
index 000000000..e06687468
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt
@@ -0,0 +1,436 @@
+package com.habitrpg.android.habitica.ui.fragments.tasks
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.view.*
+import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentPagerAdapter
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
+import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.setTintWith
+import com.habitrpg.android.habitica.helpers.*
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.views.navigation.HabiticaBottomNavigationViewListener
+import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
+import io.reactivex.rxjava3.disposables.Disposable
+import java.util.*
+import javax.inject.Inject
+import kotlin.collections.ArrayList
+
+
+class TeamBoardFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.OnQueryTextListener, HabiticaBottomNavigationViewListener {
+
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
+    var teamID: String = ""
+
+    @Inject
+    lateinit var taskFilterHelper: TaskFilterHelper
+    @Inject
+    lateinit var tagRepository: TagRepository
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
+    private var refreshItem: MenuItem? = null
+    internal var viewFragmentsDictionary: MutableMap<Int, TaskRecyclerViewFragment>? = WeakHashMap()
+
+    private var filterMenuItem: MenuItem? = null
+
+    private val activeFragment: TaskRecyclerViewFragment?
+        get() {
+            var fragment = viewFragmentsDictionary?.get(binding?.viewPager?.currentItem)
+            if (fragment == null) {
+                if (isAdded) {
+                    fragment = (childFragmentManager.findFragmentByTag("android:switcher:" + R.id.viewPager + ":" + binding?.viewPager?.currentItem) as? TaskRecyclerViewFragment)
+                }
+            }
+            return fragment
+        }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        this.usesTabLayout = false
+        this.hidesToolbar = true
+        this.usesBottomNavigation = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        arguments?.let {
+            val args = TeamBoardFragmentArgs.fromBundle(it)
+            teamID = args.teamID
+        }
+
+        compositeSubscription.add(userRepository.getTeamPlan(teamID)
+                .subscribe( {
+                    activity?.title = it.name
+                }, RxErrorHandler.handleEmptyError()))
+
+        compositeSubscription.add(userRepository.retrieveTeamPlan(teamID).subscribe({ }, RxErrorHandler.handleEmptyError()))
+
+        loadTaskLists()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        bottomNavigation?.activeTaskType = when (binding?.viewPager?.currentItem) {
+            0 -> Task.TYPE_HABIT
+            1 -> Task.TYPE_DAILY
+            2 -> Task.TYPE_TODO
+            3 -> Task.TYPE_REWARD
+            else -> Task.TYPE_HABIT
+        }
+        bottomNavigation?.listener = this
+        bottomNavigation?.canAddTasks = false
+    }
+
+    override fun onPause() {
+        if (bottomNavigation?.listener == this) {
+            bottomNavigation?.listener = null
+        }
+
+        super.onPause()
+    }
+
+    override fun onDestroy() {
+        tagRepository.close()
+        super.onDestroy()
+    }
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_team_board, menu)
+
+        filterMenuItem = menu.findItem(R.id.action_filter)
+        updateFilterIcon()
+
+        val item = menu.findItem(R.id.action_search)
+        tintMenuIcon(item)
+        val sv = item.actionView as? SearchView
+        sv?.setOnQueryTextListener(this)
+        sv?.setIconifiedByDefault(false)
+        item.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+                return true
+            }
+
+            override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                // Do something when expanded
+                filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+                return true
+            }
+        })
+    }
+
+    override fun onQueryTextSubmit(query: String?): Boolean {
+        return true
+    }
+
+    override fun onQueryTextChange(newText: String?): Boolean {
+        taskFilterHelper.searchQuery = newText
+        viewFragmentsDictionary?.values?.forEach { values -> values.recyclerAdapter?.filter() }
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.action_filter -> {
+                showFilterDialog()
+                true
+            }
+            R.id.action_reload -> {
+                refreshItem = item
+                refresh()
+                true
+            }
+            R.id.action_team_info -> {
+                MainNavigationController.navigate(R.id.guildFragment, bundleOf(Pair("groupID", teamID)))
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun showFilterDialog() {
+        context?.let {
+            var disposable: Disposable? = null
+            val dialog = TaskFilterDialog(it, HabiticaBaseApplication.userComponent)
+            disposable = tagRepository.getTags().subscribe({ tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
+            dialog.setActiveTags(taskFilterHelper.tags)
+            if (activeFragment != null) {
+                val taskType = activeFragment?.classType
+                if (taskType != null) {
+                    dialog.setTaskType(taskType, taskFilterHelper.getActiveFilter(taskType))
+                }
+            }
+            dialog.setListener(object : TaskFilterDialog.OnFilterCompletedListener {
+                override fun onFilterCompleted(activeTaskFilter: String?, activeTags: MutableList<String>) {
+                    if (viewFragmentsDictionary == null) {
+                        return
+                    }
+                    taskFilterHelper.tags = activeTags
+                    if (activeTaskFilter != null) {
+                        activeFragment?.setActiveFilter(activeTaskFilter)
+                    }
+                    viewFragmentsDictionary?.values?.forEach { values -> values.recyclerAdapter?.filter() }
+                    updateFilterIcon()
+                }
+            })
+            dialog.setOnDismissListener {
+                if (disposable?.isDisposed == false) {
+                    disposable.dispose()
+                }
+            }
+            dialog.show()
+        }
+    }
+
+    private fun refresh() {
+        activeFragment?.onRefresh()
+    }
+
+    private fun loadTaskLists() {
+        val fragmentManager = childFragmentManager
+
+        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+
+            override fun getItem(position: Int): androidx.fragment.app.Fragment {
+                val fragment: TaskRecyclerViewFragment = when (position) {
+                    0 -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_HABIT)
+                    1 -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_DAILY)
+                    3 -> RewardsRecyclerviewFragment.newInstance(context, Task.TYPE_REWARD, false)
+                    else -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_TODO)
+                }
+                fragment.ownerID = teamID
+                fragment.canEditTasks = false
+                fragment.canScoreTaks = false
+                fragment.refreshAction = {
+                    compositeSubscription.add(userRepository.retrieveTeamPlan(teamID)
+                            .doOnTerminate {
+                                it()
+                            }.subscribe({ }, RxErrorHandler.handleEmptyError()))
+                }
+
+                viewFragmentsDictionary?.put(position, fragment)
+
+                return fragment
+            }
+
+            override fun getCount(): Int = 4
+
+            override fun getPageTitle(position: Int): CharSequence? = when (position) {
+                0 -> activity?.getString(R.string.habits)
+                1 -> activity?.getString(R.string.dailies)
+                2 -> activity?.getString(R.string.todos)
+                3 -> activity?.getString(R.string.rewards)
+                else -> ""
+            }
+        }
+
+        binding?.viewPager?.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
+            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { /* no-op */ }
+
+            override fun onPageSelected(position: Int) {
+                bottomNavigation?.selectedPosition = position
+                updateFilterIcon()
+            }
+
+            override fun onPageScrollStateChanged(state: Int) { /* no-op */ }
+        })
+    }
+
+    private fun updateFilterIcon() {
+        if (filterMenuItem == null) {
+            return
+        }
+        var filterCount = 0
+        if (activeFragment != null) {
+            filterCount = taskFilterHelper.howMany(activeFragment?.classType)
+        }
+        if (filterCount == 0) {
+            filterMenuItem?.setIcon(R.drawable.ic_action_filter_list)
+            context?.let {
+                val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_action_filter_list)
+                filterIcon?.setTintWith(it.getThemeColor(R.attr.headerTextColor), PorterDuff.Mode.MULTIPLY)
+                filterMenuItem?.setIcon(filterIcon)
+            }
+        } else {
+            context?.let {
+                val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_filters_active)
+                filterIcon?.setTintWith(it.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY)
+                filterMenuItem?.setIcon(filterIcon)
+            }
+        }
+    }
+
+    private fun updateBottomBarBadges() {
+        if (bottomNavigation == null) {
+            return
+        }
+        compositeSubscription.add(tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards")).subscribe({ tutorialSteps ->
+            val activeTutorialFragments = ArrayList<String>()
+            for (step in tutorialSteps) {
+                var id = -1
+                val taskType = when (step.identifier) {
+                    "habits" -> {
+                        id = R.id.habits_tab
+                        Task.TYPE_HABIT
+                    }
+                    "dailies" -> {
+                        id = R.id.dailies_tab
+                        Task.TYPE_DAILY
+                    }
+                    "todos" -> {
+                        id = R.id.todos_tab
+                        Task.TYPE_TODO
+                    }
+                    "rewards" -> {
+                        id = R.id.rewards_tab
+                        Task.TYPE_REWARD
+                    }
+                    else -> ""
+                }
+                val tab = bottomNavigation?.tabWithId(id)
+                if (step.shouldDisplay()) {
+                    tab?.badgeCount = 1
+                    activeTutorialFragments.add(taskType)
+                } else {
+                    tab?.badgeCount = 0
+                }
+            }
+            if (activeTutorialFragments.size == 1) {
+                val fragment = viewFragmentsDictionary?.get(indexForTaskType(activeTutorialFragments[0]))
+                if (fragment?.tutorialTexts != null && context != null) {
+                    val finalText = context?.getString(R.string.tutorial_tasks_complete)
+                    if (!fragment.tutorialTexts.contains(finalText) && finalText != null) {
+                        fragment.tutorialTexts.add(finalText)
+                    }
+                }
+            }
+        }, RxErrorHandler.handleEmptyError()))
+    }
+    // endregion
+
+    private fun openNewTaskActivity(type: String) {
+        if (Date().time - (lastTaskFormOpen?.time ?: 0) < 2000) {
+            return
+        }
+
+        val additionalData = HashMap<String, Any>()
+        additionalData["created task type"] = type
+        additionalData["viewed task type"] = when (binding?.viewPager?.currentItem) {
+            0 -> Task.TYPE_HABIT
+            1 -> Task.TYPE_DAILY
+            2 -> Task.TYPE_TODO
+            3 -> Task.TYPE_REWARD
+            else -> ""
+        }
+        AmplitudeManager.sendEvent("open create task form", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
+
+        val bundle = Bundle()
+        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type)
+        bundle.putStringArrayList(TaskFormActivity.SELECTED_TAGS_KEY, ArrayList(taskFilterHelper.tags))
+
+        val intent = Intent(activity, TaskFormActivity::class.java)
+        intent.putExtras(bundle)
+        intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+        if (this.isAdded) {
+            lastTaskFormOpen = Date()
+            startActivityForResult(intent, TASK_CREATED_RESULT)
+        }
+    }
+
+    //endregion Events
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        when (requestCode) {
+            TASK_CREATED_RESULT -> {
+                onTaskCreatedResult(resultCode, data)
+            }
+        }
+    }
+
+    private fun onTaskCreatedResult(resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK) {
+            val taskType = data?.getStringExtra(TaskFormActivity.TASK_TYPE_KEY)
+            if (taskType != null) {
+                switchToTaskTab(taskType)
+
+                val index = indexForTaskType(taskType)
+                if (index != -1) {
+                    val fragment = viewFragmentsDictionary?.get(index)
+                    fragment?.binding?.recyclerView?.scrollToPosition(0)
+                }
+            }
+        }
+    }
+
+    private fun switchToTaskTab(taskType: String) {
+        val index = indexForTaskType(taskType)
+        if (binding?.viewPager != null && index != -1) {
+            binding?.viewPager?.currentItem = index
+            updateBottomBarBadges()
+        }
+    }
+
+    private fun indexForTaskType(taskType: String?): Int {
+        if (taskType != null) {
+            for (index in 0 until (viewFragmentsDictionary?.size ?: 0)) {
+                val fragment = viewFragmentsDictionary?.get(index)
+                if (fragment != null && taskType == fragment.className) {
+                    return index
+                }
+            }
+        }
+        return -1
+    }
+
+    override val displayedClassName: String?
+        get() = null
+
+    override fun addToBackStack(): Boolean = false
+
+    companion object {
+        var lastTaskFormOpen: Date? = null
+        internal const val TASK_CREATED_RESULT = 1
+        const val TASK_UPDATED_RESULT = 2
+    }
+
+    override fun onTabSelected(taskType: String) {
+        val newItem = when (taskType) {
+            Task.TYPE_HABIT -> 0
+            Task.TYPE_DAILY -> 1
+            Task.TYPE_TODO -> 2
+            Task.TYPE_REWARD -> 3
+            else -> 0
+        }
+        binding?.viewPager?.currentItem = newItem
+        updateBottomBarBadges()
+    }
+
+    override fun onAdd(taskType: String) {
+        openNewTaskActivity(taskType)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
index 56a19654b..5b7916fbc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
@@ -17,8 +17,8 @@ import com.habitrpg.android.habitica.models.user.Authentication
 import com.habitrpg.android.habitica.models.user.Profile
 import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
 import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-import net.pherth.android.emoji_library.EmojiMap
-import net.pherth.android.emoji_library.EmojiParser
+import com.habitrpg.android.habitica.ui.helpers.EmojiMap
+import com.habitrpg.android.habitica.ui.helpers.EmojiParser
 import java.util.*
 
 class AutocompleteAdapter(val context: Context, val socialRepository: SocialRepository? = null, var autocompleteContext: String? = null, var groupID: String? = null, val remoteAutocomplete: Boolean = false) : BaseAdapter(), Filterable {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
index 87bc4edd3..f37c21136 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
@@ -8,8 +8,6 @@ import android.view.ViewGroup
 import android.view.animation.Animation
 import android.view.animation.Transformation
 import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.net.toUri
 import com.facebook.common.executors.CallerThreadExecutor
@@ -24,6 +22,7 @@ import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.image.ImageInfo
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import java.util.*
 import kotlin.collections.HashMap
@@ -76,16 +75,16 @@ object DataBindingUtils {
         val dataSource = imagePipeline.fetchDecodedImage(imageRequest, this)
 
         dataSource.subscribe(object : BaseBitmapDataSubscriber() {
-            override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>?) {
-                dataSource?.close()
-            }
-
             public override fun onNewResultImpl(bitmap: Bitmap?) {
                 if (dataSource.isFinished && bitmap != null) {
                     imageResult(bitmap)
                     dataSource.close()
                 }
             }
+
+            override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
+                dataSource?.close()
+            }
         }, CallerThreadExecutor.getInstance())
     }
 
@@ -103,26 +102,12 @@ object DataBindingUtils {
         }
     }
 
-    fun setForegroundTintColor(view: TextView, color: Int) {
-        var thisColor = color
-        if (thisColor > 0) {
-            thisColor = ContextCompat.getColor(view.context, thisColor)
-        }
-        view.setTextColor(thisColor)
-    }
-
     fun setRoundedBackground(view: View, color: Int) {
         val drawable = ResourcesCompat.getDrawable(view.resources, R.drawable.layout_rounded_bg, null)
-        drawable?.setColorFilter(color, PorterDuff.Mode.MULTIPLY)
+        drawable?.setTintWith(color, PorterDuff.Mode.MULTIPLY)
         view.background = drawable
     }
 
-    fun setRoundedBackgroundInt(view: View, color: Int) {
-        if (color != 0) {
-            setRoundedBackground(view, ContextCompat.getColor(view.context, color))
-        }
-    }
-
     class LayoutWeightAnimation(internal var view: View, internal var targetWeight: Float) : Animation() {
         private var initializeWeight: Float = 0.toFloat()
 
@@ -178,7 +163,7 @@ object DataBindingUtils {
         tempMap["Mount_Body_Gryphon-Gryphatrice"] = "gif"
         tempMap["background_clocktower"] = "gif"
         tempMap["background_airship"] = "gif"
-        tempMap["background_steamwork"] = "gif"
+        tempMap["background_steamworks"] = "gif"
         tempMap["Pet_HatchingPotion_Veggie"] = "gif"
         tempMap["Pet_HatchingPotion_Dessert"] = "gif"
         tempMap["Pet-HatchingPotion-Dessert"] = "gif"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiMap.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiMap.java
new file mode 100644
index 000000000..ed6f3dbf3
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiMap.java
@@ -0,0 +1,1702 @@
+package com.habitrpg.android.habitica.ui.helpers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class EmojiMap {
+    public static final Map<Integer, String> emojiMap = new HashMap<>();
+    public static final Map<String, Integer> invertedEmojiMap = new HashMap<>();
+    static {
+        emojiMap.put(128077, ":+1:");
+        emojiMap.put(128078, ":-1:");
+        emojiMap.put(128175, ":100:");
+        emojiMap.put(128290, ":1234:");
+        emojiMap.put(127921, ":8ball:");
+        emojiMap.put(127344, ":a:");
+        emojiMap.put(127374, ":ab:");
+        emojiMap.put(128292, ":abc:");
+        emojiMap.put(128289, ":abcd:");
+        emojiMap.put(127569, ":accept:");
+        emojiMap.put(128673, ":aerial_tramway:");
+        emojiMap.put(9992, ":airplane:");
+        emojiMap.put(9200, ":alarm_clock:");
+        emojiMap.put(128125, ":alien:");
+        emojiMap.put(128657, ":ambulance:");
+        emojiMap.put(9875, ":anchor:");
+        emojiMap.put(128124, ":angel:");
+        emojiMap.put(128162, ":anger:");
+        emojiMap.put(128544, ":angry:");
+        emojiMap.put(128551, ":anguished:");
+        emojiMap.put(128028, ":ant:");
+        emojiMap.put(127822, ":apple:");
+        emojiMap.put(9810, ":aquarius:");
+        emojiMap.put(9800, ":aries:");
+        emojiMap.put(9664, ":arrow_backward:");
+        emojiMap.put(9196, ":arrow_double_down:");
+        emojiMap.put(9195, ":arrow_double_up:");
+        emojiMap.put(11015, ":arrow_down:");
+        emojiMap.put(128317, ":arrow_down_small:");
+        emojiMap.put(9654, ":arrow_forward:");
+        emojiMap.put(10549, ":arrow_heading_down:");
+        emojiMap.put(10548, ":arrow_heading_up:");
+        emojiMap.put(11013, ":arrow_left:");
+        emojiMap.put(8601, ":arrow_lower_left:");
+        emojiMap.put(8600, ":arrow_lower_right:");
+        emojiMap.put(10145, ":arrow_right:");
+        emojiMap.put(8618, ":arrow_right_hook:");
+        emojiMap.put(11014, ":arrow_up:");
+        emojiMap.put(8597, ":arrow_up_down:");
+        emojiMap.put(128316, ":arrow_up_small:");
+        emojiMap.put(8598, ":arrow_upper_left:");
+        emojiMap.put(8599, ":arrow_upper_right:");
+        emojiMap.put(128259, ":arrows_clockwise:");
+        emojiMap.put(128260, ":arrows_counterclockwise:");
+        emojiMap.put(127912, ":art:");
+        emojiMap.put(128667, ":articulated_lorry:");
+        emojiMap.put(128562, ":astonished:");
+        emojiMap.put(128095, ":athletic_shoe:");
+        emojiMap.put(127975, ":atm:");
+        emojiMap.put(127345, ":b:");
+        emojiMap.put(128118, ":baby:");
+        emojiMap.put(127868, ":baby_bottle:");
+        emojiMap.put(128036, ":baby_chick:");
+        emojiMap.put(128700, ":baby_symbol:");
+        emojiMap.put(128281, ":back:");
+        emojiMap.put(128708, ":baggage_claim:");
+        emojiMap.put(127880, ":balloon:");
+        emojiMap.put(9745, ":ballot_box_with_check:");
+        emojiMap.put(127885, ":bamboo:");
+        emojiMap.put(127820, ":banana:");
+        emojiMap.put(8252, ":bangbang:");
+        emojiMap.put(127974, ":bank:");
+        emojiMap.put(128202, ":bar_chart:");
+        emojiMap.put(128136, ":barber:");
+        emojiMap.put(9918, ":baseball:");
+        emojiMap.put(127936, ":basketball:");
+        emojiMap.put(128704, ":bath:");
+        emojiMap.put(128705, ":bathtub:");
+        emojiMap.put(128267, ":battery:");
+        emojiMap.put(128059, ":bear:");
+        emojiMap.put(128029, ":bee:");
+        emojiMap.put(127866, ":beer:");
+        emojiMap.put(127867, ":beers:");
+        emojiMap.put(128030, ":beetle:");
+        emojiMap.put(128304, ":beginner:");
+        emojiMap.put(128276, ":bell:");
+        emojiMap.put(127857, ":bento:");
+        emojiMap.put(128692, ":bicyclist:");
+        emojiMap.put(128690, ":bike:");
+        emojiMap.put(128089, ":bikini:");
+        emojiMap.put(128038, ":bird:");
+        emojiMap.put(127874, ":birthday:");
+        emojiMap.put(9899, ":black_circle:");
+        emojiMap.put(127183, ":black_joker:");
+        emojiMap.put(11035, ":black_large_square:");
+        emojiMap.put(9726, ":black_medium_small_square:");
+        emojiMap.put(9724, ":black_medium_square:");
+        emojiMap.put(10002, ":black_nib:");
+        emojiMap.put(9642, ":black_small_square:");
+        emojiMap.put(128306, ":black_square_button:");
+        emojiMap.put(127804, ":blossom:");
+        emojiMap.put(128033, ":blowfish:");
+        emojiMap.put(128216, ":blue_book:");
+        emojiMap.put(128665, ":blue_car:");
+        emojiMap.put(128153, ":blue_heart:");
+        emojiMap.put(128522, ":blush:");
+        emojiMap.put(128023, ":boar:");
+        emojiMap.put(9973, ":boat:");
+        emojiMap.put(128163, ":bomb:");
+        emojiMap.put(128214, ":book:");
+        emojiMap.put(128278, ":bookmark:");
+        emojiMap.put(128209, ":bookmark_tabs:");
+        emojiMap.put(128218, ":books:");
+        emojiMap.put(128165, ":boom:");
+        emojiMap.put(128098, ":boot:");
+        emojiMap.put(128144, ":bouquet:");
+        emojiMap.put(128583, ":bow:");
+        emojiMap.put(127923, ":bowling:");
+        emojiMap.put(128102, ":boy:");
+        emojiMap.put(127838, ":bread:");
+        emojiMap.put(128112, ":bride_with_veil:");
+        emojiMap.put(127753, ":bridge_at_night:");
+        emojiMap.put(128188, ":briefcase:");
+        emojiMap.put(128148, ":broken_heart:");
+        emojiMap.put(128027, ":bug:");
+        emojiMap.put(128161, ":bulb:");
+        emojiMap.put(128645, ":bullettrain_front:");
+        emojiMap.put(128644, ":bullettrain_side:");
+        emojiMap.put(128652, ":bus:");
+        emojiMap.put(128655, ":busstop:");
+        emojiMap.put(128100, ":bust_in_silhouette:");
+        emojiMap.put(128101, ":busts_in_silhouette:");
+        emojiMap.put(127797, ":cactus:");
+        emojiMap.put(127856, ":cake:");
+        emojiMap.put(128198, ":calendar:");
+        emojiMap.put(128242, ":calling:");
+        emojiMap.put(128043, ":camel:");
+        emojiMap.put(128247, ":camera:");
+        emojiMap.put(9803, ":cancer:");
+        emojiMap.put(127852, ":candy:");
+        emojiMap.put(128288, ":capital_abcd:");
+        emojiMap.put(9809, ":capricorn:");
+        emojiMap.put(128663, ":car:");
+        emojiMap.put(128199, ":card_index:");
+        emojiMap.put(127904, ":carousel_horse:");
+        emojiMap.put(128049, ":cat:");
+        emojiMap.put(128008, ":cat2:");
+        emojiMap.put(128191, ":cd:");
+        emojiMap.put(128185, ":chart:");
+        emojiMap.put(128201, ":chart_with_downwards_trend:");
+        emojiMap.put(128200, ":chart_with_upwards_trend:");
+        emojiMap.put(127937, ":checkered_flag:");
+        emojiMap.put(127826, ":cherries:");
+        emojiMap.put(127800, ":cherry_blossom:");
+        emojiMap.put(127792, ":chestnut:");
+        emojiMap.put(128020, ":chicken:");
+        emojiMap.put(128696, ":children_crossing:");
+        emojiMap.put(127851, ":chocolate_bar:");
+        emojiMap.put(127876, ":christmas_tree:");
+        emojiMap.put(9962, ":church:");
+        emojiMap.put(127910, ":cinema:");
+        emojiMap.put(127914, ":circus_tent:");
+        emojiMap.put(127751, ":city_sunrise:");
+        emojiMap.put(127750, ":city_sunset:");
+        emojiMap.put(127377, ":cl:");
+        emojiMap.put(128079, ":clap:");
+        emojiMap.put(127916, ":clapper:");
+        emojiMap.put(128203, ":clipboard:");
+        emojiMap.put(128336, ":clock1:");
+        emojiMap.put(128345, ":clock10:");
+        emojiMap.put(128357, ":clock1030:");
+        emojiMap.put(128346, ":clock11:");
+        emojiMap.put(128358, ":clock1130:");
+        emojiMap.put(128347, ":clock12:");
+        emojiMap.put(128359, ":clock1230:");
+        emojiMap.put(128348, ":clock130:");
+        emojiMap.put(128337, ":clock2:");
+        emojiMap.put(128349, ":clock230:");
+        emojiMap.put(128338, ":clock3:");
+        emojiMap.put(128350, ":clock330:");
+        emojiMap.put(128339, ":clock4:");
+        emojiMap.put(128351, ":clock430:");
+        emojiMap.put(128340, ":clock5:");
+        emojiMap.put(128352, ":clock530:");
+        emojiMap.put(128341, ":clock6:");
+        emojiMap.put(128353, ":clock630:");
+        emojiMap.put(128342, ":clock7:");
+        emojiMap.put(128354, ":clock730:");
+        emojiMap.put(128343, ":clock8:");
+        emojiMap.put(128355, ":clock830:");
+        emojiMap.put(128344, ":clock9:");
+        emojiMap.put(128356, ":clock930:");
+        emojiMap.put(128213, ":closed_book:");
+        emojiMap.put(128272, ":closed_lock_with_key:");
+        emojiMap.put(127746, ":closed_umbrella:");
+        emojiMap.put(9729, ":cloud:");
+        emojiMap.put(9827, ":clubs:");
+        emojiMap.put(127864, ":cocktail:");
+        emojiMap.put(9749, ":coffee:");
+        emojiMap.put(128560, ":cold_sweat:");
+        emojiMap.put(128165, ":collision:");
+        emojiMap.put(128187, ":computer:");
+        emojiMap.put(127882, ":confetti_ball:");
+        emojiMap.put(128534, ":confounded:");
+        emojiMap.put(128533, ":confused:");
+        emojiMap.put(12951, ":congratulations:");
+        emojiMap.put(128679, ":construction:");
+        emojiMap.put(128119, ":construction_worker:");
+        emojiMap.put(127978, ":convenience_store:");
+        emojiMap.put(127850, ":cookie:");
+        emojiMap.put(127378, ":cool:");
+        emojiMap.put(128110, ":cop:");
+        emojiMap.put(169, ":copyright:");
+        emojiMap.put(127805, ":corn:");
+        emojiMap.put(128107, ":couple:");
+        emojiMap.put(128145, ":couple_with_heart:");
+        emojiMap.put(128143, ":couplekiss:");
+        emojiMap.put(128046, ":cow:");
+        emojiMap.put(128004, ":cow2:");
+        emojiMap.put(128179, ":credit_card:");
+        emojiMap.put(127769, ":crescent_moon:");
+        emojiMap.put(128010, ":crocodile:");
+        emojiMap.put(127884, ":crossed_flags:");
+        emojiMap.put(128081, ":crown:");
+        emojiMap.put(128546, ":cry:");
+        emojiMap.put(128575, ":crying_cat_face:");
+        emojiMap.put(128302, ":crystal_ball:");
+        emojiMap.put(128152, ":cupid:");
+        emojiMap.put(10160, ":curly_loop:");
+        emojiMap.put(128177, ":currency_exchange:");
+        emojiMap.put(127835, ":curry:");
+        emojiMap.put(127854, ":custard:");
+        emojiMap.put(128707, ":customs:");
+        emojiMap.put(127744, ":cyclone:");
+        emojiMap.put(128131, ":dancer:");
+        emojiMap.put(128111, ":dancers:");
+        emojiMap.put(127841, ":dango:");
+        emojiMap.put(127919, ":dart:");
+        emojiMap.put(128168, ":dash:");
+        emojiMap.put(128197, ":date:");
+        emojiMap.put(127795, ":deciduous_tree:");
+        emojiMap.put(127980, ":department_store:");
+        emojiMap.put(128160, ":diamond_shape_with_a_dot_inside:");
+        emojiMap.put(9830, ":diamonds:");
+        emojiMap.put(128542, ":disappointed:");
+        emojiMap.put(128549, ":disappointed_relieved:");
+        emojiMap.put(128171, ":dizzy:");
+        emojiMap.put(128565, ":dizzy_face:");
+        emojiMap.put(128687, ":do_not_litter:");
+        emojiMap.put(128054, ":dog:");
+        emojiMap.put(128021, ":dog2:");
+        emojiMap.put(128181, ":dollar:");
+        emojiMap.put(127886, ":dolls:");
+        emojiMap.put(128044, ":dolphin:");
+        emojiMap.put(128682, ":door:");
+        emojiMap.put(127849, ":doughnut:");
+        emojiMap.put(128009, ":dragon:");
+        emojiMap.put(128050, ":dragon_face:");
+        emojiMap.put(128087, ":dress:");
+        emojiMap.put(128042, ":dromedary_camel:");
+        emojiMap.put(128167, ":droplet:");
+        emojiMap.put(128192, ":dvd:");
+        emojiMap.put(128231, ":e-mail:");
+        emojiMap.put(128066, ":ear:");
+        emojiMap.put(127806, ":ear_of_rice:");
+        emojiMap.put(127757, ":earth_africa:");
+        emojiMap.put(127758, ":earth_americas:");
+        emojiMap.put(127759, ":earth_asia:");
+        emojiMap.put(127859, ":egg:");
+        emojiMap.put(127814, ":eggplant:");
+        emojiMap.put(10036, ":eight_pointed_black_star:");
+        emojiMap.put(10035, ":eight_spoked_asterisk:");
+        emojiMap.put(128268, ":electric_plug:");
+        emojiMap.put(128024, ":elephant:");
+        emojiMap.put(9993, ":email:");
+        emojiMap.put(128282, ":end:");
+        emojiMap.put(9993, ":envelope:");
+        emojiMap.put(128233, ":envelope_with_arrow:");
+        emojiMap.put(128182, ":euro:");
+        emojiMap.put(127984, ":european_castle:");
+        emojiMap.put(127972, ":european_post_office:");
+        emojiMap.put(127794, ":evergreen_tree:");
+        emojiMap.put(10071, ":exclamation:");
+        emojiMap.put(128529, ":expressionless:");
+        emojiMap.put(128083, ":eyeglasses:");
+        emojiMap.put(128064, ":eyes:");
+        emojiMap.put(128074, ":facepunch:");
+        emojiMap.put(127981, ":factory:");
+        emojiMap.put(127810, ":fallen_leaf:");
+        emojiMap.put(128106, ":family:");
+        emojiMap.put(9193, ":fast_forward:");
+        emojiMap.put(128224, ":fax:");
+        emojiMap.put(128552, ":fearful:");
+        emojiMap.put(128062, ":feet:");
+        emojiMap.put(127905, ":ferris_wheel:");
+        emojiMap.put(128193, ":file_folder:");
+        emojiMap.put(128293, ":fire:");
+        emojiMap.put(128658, ":fire_engine:");
+        emojiMap.put(127878, ":fireworks:");
+        emojiMap.put(127763, ":first_quarter_moon:");
+        emojiMap.put(127771, ":first_quarter_moon_with_face:");
+        emojiMap.put(128031, ":fish:");
+        emojiMap.put(127845, ":fish_cake:");
+        emojiMap.put(127907, ":fishing_pole_and_fish:");
+        emojiMap.put(9994, ":fist:");
+        emojiMap.put(127887, ":flags:");
+        emojiMap.put(128294, ":flashlight:");
+        emojiMap.put(128044, ":flipper:");
+        emojiMap.put(128190, ":floppy_disk:");
+        emojiMap.put(127924, ":flower_playing_cards:");
+        emojiMap.put(128563, ":flushed:");
+        emojiMap.put(127745, ":foggy:");
+        emojiMap.put(127944, ":football:");
+        emojiMap.put(128099, ":footprints:");
+        emojiMap.put(127860, ":fork_and_knife:");
+        emojiMap.put(9970, ":fountain:");
+        emojiMap.put(127808, ":four_leaf_clover:");
+        emojiMap.put(127379, ":free:");
+        emojiMap.put(127844, ":fried_shrimp:");
+        emojiMap.put(127839, ":fries:");
+        emojiMap.put(128056, ":frog:");
+        emojiMap.put(128550, ":frowning:");
+        emojiMap.put(9981, ":fuelpump:");
+        emojiMap.put(127765, ":full_moon:");
+        emojiMap.put(127773, ":full_moon_with_face:");
+        emojiMap.put(127922, ":game_die:");
+        emojiMap.put(128142, ":gem:");
+        emojiMap.put(9802, ":gemini:");
+        emojiMap.put(128123, ":ghost:");
+        emojiMap.put(127873, ":gift:");
+        emojiMap.put(128157, ":gift_heart:");
+        emojiMap.put(128103, ":girl:");
+        emojiMap.put(127760, ":globe_with_meridians:");
+        emojiMap.put(128016, ":goat:");
+        emojiMap.put(9971, ":golf:");
+        emojiMap.put(127815, ":grapes:");
+        emojiMap.put(127823, ":green_apple:");
+        emojiMap.put(128215, ":green_book:");
+        emojiMap.put(128154, ":green_heart:");
+        emojiMap.put(10069, ":grey_exclamation:");
+        emojiMap.put(10068, ":grey_question:");
+        emojiMap.put(128556, ":grimacing:");
+        emojiMap.put(128513, ":grin:");
+        emojiMap.put(128512, ":grinning:");
+        emojiMap.put(128130, ":guardsman:");
+        emojiMap.put(127928, ":guitar:");
+        emojiMap.put(128299, ":gun:");
+        emojiMap.put(128135, ":haircut:");
+        emojiMap.put(127828, ":hamburger:");
+        emojiMap.put(128296, ":hammer:");
+        emojiMap.put(128057, ":hamster:");
+        emojiMap.put(9995, ":hand:");
+        emojiMap.put(128092, ":handbag:");
+        emojiMap.put(128169, ":hankey:");
+        emojiMap.put(128037, ":hatched_chick:");
+        emojiMap.put(128035, ":hatching_chick:");
+        emojiMap.put(127911, ":headphones:");
+        emojiMap.put(128585, ":hear_no_evil:");
+        emojiMap.put(10084, ":heart:");
+        emojiMap.put(128159, ":heart_decoration:");
+        emojiMap.put(128525, ":heart_eyes:");
+        emojiMap.put(128571, ":heart_eyes_cat:");
+        emojiMap.put(128147, ":heartbeat:");
+        emojiMap.put(128151, ":heartpulse:");
+        emojiMap.put(9829, ":hearts:");
+        emojiMap.put(10004, ":heavy_check_mark:");
+        emojiMap.put(10135, ":heavy_division_sign:");
+        emojiMap.put(128178, ":heavy_dollar_sign:");
+        emojiMap.put(10071, ":heavy_exclamation_mark:");
+        emojiMap.put(10134, ":heavy_minus_sign:");
+        emojiMap.put(10006, ":heavy_multiplication_x:");
+        emojiMap.put(10133, ":heavy_plus_sign:");
+        emojiMap.put(128641, ":helicopter:");
+        emojiMap.put(127807, ":herb:");
+        emojiMap.put(127802, ":hibiscus:");
+        emojiMap.put(128262, ":high_brightness:");
+        emojiMap.put(128096, ":high_heel:");
+        emojiMap.put(128298, ":hocho:");
+        emojiMap.put(127855, ":honey_pot:");
+        emojiMap.put(128029, ":honeybee:");
+        emojiMap.put(128052, ":horse:");
+        emojiMap.put(127943, ":horse_racing:");
+        emojiMap.put(127973, ":hospital:");
+        emojiMap.put(127976, ":hotel:");
+        emojiMap.put(9832, ":hotsprings:");
+        emojiMap.put(8987, ":hourglass:");
+        emojiMap.put(9203, ":hourglass_flowing_sand:");
+        emojiMap.put(127968, ":house:");
+        emojiMap.put(127969, ":house_with_garden:");
+        emojiMap.put(128559, ":hushed:");
+        emojiMap.put(127848, ":ice_cream:");
+        emojiMap.put(127846, ":icecream:");
+        emojiMap.put(127380, ":id:");
+        emojiMap.put(127568, ":ideograph_advantage:");
+        emojiMap.put(128127, ":imp:");
+        emojiMap.put(128229, ":inbox_tray:");
+        emojiMap.put(128232, ":incoming_envelope:");
+        emojiMap.put(128129, ":information_desk_person:");
+        emojiMap.put(8505, ":information_source:");
+        emojiMap.put(128519, ":innocent:");
+        emojiMap.put(8265, ":interrobang:");
+        emojiMap.put(128241, ":iphone:");
+        emojiMap.put(127982, ":izakaya_lantern:");
+        emojiMap.put(127875, ":jack_o_lantern:");
+        emojiMap.put(128510, ":japan:");
+        emojiMap.put(127983, ":japanese_castle:");
+        emojiMap.put(128122, ":japanese_goblin:");
+        emojiMap.put(128121, ":japanese_ogre:");
+        emojiMap.put(128086, ":jeans:");
+        emojiMap.put(128514, ":joy:");
+        emojiMap.put(128569, ":joy_cat:");
+        emojiMap.put(128273, ":key:");
+        emojiMap.put(128287, ":keycap_ten:");
+        emojiMap.put(128088, ":kimono:");
+        emojiMap.put(128139, ":kiss:");
+        emojiMap.put(128535, ":kissing:");
+        emojiMap.put(128573, ":kissing_cat:");
+        emojiMap.put(128538, ":kissing_closed_eyes:");
+        emojiMap.put(128536, ":kissing_heart:");
+        emojiMap.put(128537, ":kissing_smiling_eyes:");
+        emojiMap.put(128040, ":koala:");
+        emojiMap.put(127489, ":koko:");
+        emojiMap.put(127982, ":lantern:");
+        emojiMap.put(128309, ":large_blue_circle:");
+        emojiMap.put(128311, ":large_blue_diamond:");
+        emojiMap.put(128310, ":large_orange_diamond:");
+        emojiMap.put(127767, ":last_quarter_moon:");
+        emojiMap.put(127772, ":last_quarter_moon_with_face:");
+        emojiMap.put(128518, ":laughing:");
+        emojiMap.put(127811, ":leaves:");
+        emojiMap.put(128210, ":ledger:");
+        emojiMap.put(128709, ":left_luggage:");
+        emojiMap.put(8596, ":left_right_arrow:");
+        emojiMap.put(8617, ":leftwards_arrow_with_hook:");
+        emojiMap.put(127819, ":lemon:");
+        emojiMap.put(9804, ":leo:");
+        emojiMap.put(128006, ":leopard:");
+        emojiMap.put(9806, ":libra:");
+        emojiMap.put(128648, ":light_rail:");
+        emojiMap.put(128279, ":link:");
+        emojiMap.put(128068, ":lips:");
+        emojiMap.put(128132, ":lipstick:");
+        emojiMap.put(128274, ":lock:");
+        emojiMap.put(128271, ":lock_with_ink_pen:");
+        emojiMap.put(127853, ":lollipop:");
+        emojiMap.put(10175, ":loop:");
+        emojiMap.put(128226, ":loudspeaker:");
+        emojiMap.put(127977, ":love_hotel:");
+        emojiMap.put(128140, ":love_letter:");
+        emojiMap.put(128261, ":low_brightness:");
+        emojiMap.put(9410, ":m:");
+        emojiMap.put(128269, ":mag:");
+        emojiMap.put(128270, ":mag_right:");
+        emojiMap.put(126980, ":mahjong:");
+        emojiMap.put(128235, ":mailbox:");
+        emojiMap.put(128234, ":mailbox_closed:");
+        emojiMap.put(128236, ":mailbox_with_mail:");
+        emojiMap.put(128237, ":mailbox_with_no_mail:");
+        emojiMap.put(128104, ":man:");
+        emojiMap.put(128114, ":man_with_gua_pi_mao:");
+        emojiMap.put(128115, ":man_with_turban:");
+        emojiMap.put(128094, ":mans_shoe:");
+        emojiMap.put(127809, ":maple_leaf:");
+        emojiMap.put(128567, ":mask:");
+        emojiMap.put(128134, ":massage:");
+        emojiMap.put(127830, ":meat_on_bone:");
+        emojiMap.put(128227, ":mega:");
+        emojiMap.put(127816, ":melon:");
+        emojiMap.put(128221, ":memo:");
+        emojiMap.put(128697, ":mens:");
+        emojiMap.put(128647, ":metro:");
+        emojiMap.put(127908, ":microphone:");
+        emojiMap.put(128300, ":microscope:");
+        emojiMap.put(127756, ":milky_way:");
+        emojiMap.put(128656, ":minibus:");
+        emojiMap.put(128189, ":minidisc:");
+        emojiMap.put(128244, ":mobile_phone_off:");
+        emojiMap.put(128184, ":money_with_wings:");
+        emojiMap.put(128176, ":moneybag:");
+        emojiMap.put(128018, ":monkey:");
+        emojiMap.put(128053, ":monkey_face:");
+        emojiMap.put(128669, ":monorail:");
+        emojiMap.put(127764, ":moon:");
+        emojiMap.put(127891, ":mortar_board:");
+        emojiMap.put(128507, ":mount_fuji:");
+        emojiMap.put(128693, ":mountain_bicyclist:");
+        emojiMap.put(128672, ":mountain_cableway:");
+        emojiMap.put(128670, ":mountain_railway:");
+        emojiMap.put(128045, ":mouse:");
+        emojiMap.put(128001, ":mouse2:");
+        emojiMap.put(127909, ":movie_camera:");
+        emojiMap.put(128511, ":moyai:");
+        emojiMap.put(128170, ":muscle:");
+        emojiMap.put(127812, ":mushroom:");
+        emojiMap.put(127929, ":musical_keyboard:");
+        emojiMap.put(127925, ":musical_note:");
+        emojiMap.put(127932, ":musical_score:");
+        emojiMap.put(128263, ":mute:");
+        emojiMap.put(128133, ":nail_care:");
+        emojiMap.put(128219, ":name_badge:");
+        emojiMap.put(128084, ":necktie:");
+        emojiMap.put(10062, ":negative_squared_cross_mark:");
+        emojiMap.put(128528, ":neutral_face:");
+        emojiMap.put(127381, ":new:");
+        emojiMap.put(127761, ":new_moon:");
+        emojiMap.put(127770, ":new_moon_with_face:");
+        emojiMap.put(128240, ":newspaper:");
+        emojiMap.put(127382, ":ng:");
+        emojiMap.put(128277, ":no_bell:");
+        emojiMap.put(128691, ":no_bicycles:");
+        emojiMap.put(9940, ":no_entry:");
+        emojiMap.put(128683, ":no_entry_sign:");
+        emojiMap.put(128581, ":no_good:");
+        emojiMap.put(128245, ":no_mobile_phones:");
+        emojiMap.put(128566, ":no_mouth:");
+        emojiMap.put(128695, ":no_pedestrians:");
+        emojiMap.put(128685, ":no_smoking:");
+        emojiMap.put(128689, ":non-potable_water:");
+        emojiMap.put(128067, ":nose:");
+        emojiMap.put(128211, ":notebook:");
+        emojiMap.put(128212, ":notebook_with_decorative_cover:");
+        emojiMap.put(127926, ":notes:");
+        emojiMap.put(128297, ":nut_and_bolt:");
+        emojiMap.put(11093, ":o:");
+        emojiMap.put(127358, ":o2:");
+        emojiMap.put(127754, ":ocean:");
+        emojiMap.put(128025, ":octopus:");
+        emojiMap.put(127842, ":oden:");
+        emojiMap.put(127970, ":office:");
+        emojiMap.put(127383, ":ok:");
+        emojiMap.put(128076, ":ok_hand:");
+        emojiMap.put(128582, ":ok_woman:");
+        emojiMap.put(128116, ":older_man:");
+        emojiMap.put(128117, ":older_woman:");
+        emojiMap.put(128283, ":on:");
+        emojiMap.put(128664, ":oncoming_automobile:");
+        emojiMap.put(128653, ":oncoming_bus:");
+        emojiMap.put(128660, ":oncoming_police_car:");
+        emojiMap.put(128662, ":oncoming_taxi:");
+        emojiMap.put(128214, ":open_book:");
+        emojiMap.put(128194, ":open_file_folder:");
+        emojiMap.put(128080, ":open_hands:");
+        emojiMap.put(128558, ":open_mouth:");
+        emojiMap.put(9934, ":ophiuchus:");
+        emojiMap.put(128217, ":orange_book:");
+        emojiMap.put(128228, ":outbox_tray:");
+        emojiMap.put(128002, ":ox:");
+        emojiMap.put(128230, ":package:");
+        emojiMap.put(128196, ":page_facing_up:");
+        emojiMap.put(128195, ":page_with_curl:");
+        emojiMap.put(128223, ":pager:");
+        emojiMap.put(127796, ":palm_tree:");
+        emojiMap.put(128060, ":panda_face:");
+        emojiMap.put(128206, ":paperclip:");
+        emojiMap.put(127359, ":parking:");
+        emojiMap.put(12349, ":part_alternation_mark:");
+        emojiMap.put(9925, ":partly_sunny:");
+        emojiMap.put(128706, ":passport_control:");
+        emojiMap.put(128062, ":paw_prints:");
+        emojiMap.put(127825, ":peach:");
+        emojiMap.put(127824, ":pear:");
+        emojiMap.put(128221, ":pencil:");
+        emojiMap.put(9999, ":pencil2:");
+        emojiMap.put(128039, ":penguin:");
+        emojiMap.put(128532, ":pensive:");
+        emojiMap.put(127917, ":performing_arts:");
+        emojiMap.put(128547, ":persevere:");
+        emojiMap.put(128589, ":person_frowning:");
+        emojiMap.put(128113, ":person_with_blond_hair:");
+        emojiMap.put(128590, ":person_with_pouting_face:");
+        emojiMap.put(9742, ":phone:");
+        emojiMap.put(128055, ":pig:");
+        emojiMap.put(128022, ":pig2:");
+        emojiMap.put(128061, ":pig_nose:");
+        emojiMap.put(128138, ":pill:");
+        emojiMap.put(127821, ":pineapple:");
+        emojiMap.put(9811, ":pisces:");
+        emojiMap.put(127829, ":pizza:");
+        emojiMap.put(128071, ":point_down:");
+        emojiMap.put(128072, ":point_left:");
+        emojiMap.put(128073, ":point_right:");
+        emojiMap.put(9757, ":point_up:");
+        emojiMap.put(128070, ":point_up_2:");
+        emojiMap.put(128659, ":police_car:");
+        emojiMap.put(128041, ":poodle:");
+        emojiMap.put(128169, ":poop:");
+        emojiMap.put(127971, ":post_office:");
+        emojiMap.put(128239, ":postal_horn:");
+        emojiMap.put(128238, ":postbox:");
+        emojiMap.put(128688, ":potable_water:");
+        emojiMap.put(128093, ":pouch:");
+        emojiMap.put(127831, ":poultry_leg:");
+        emojiMap.put(128183, ":pound:");
+        emojiMap.put(128574, ":pouting_cat:");
+        emojiMap.put(128591, ":pray:");
+        emojiMap.put(128120, ":princess:");
+        emojiMap.put(128074, ":punch:");
+        emojiMap.put(128156, ":purple_heart:");
+        emojiMap.put(128091, ":purse:");
+        emojiMap.put(128204, ":pushpin:");
+        emojiMap.put(128686, ":put_litter_in_its_place:");
+        emojiMap.put(10067, ":question:");
+        emojiMap.put(128048, ":rabbit:");
+        emojiMap.put(128007, ":rabbit2:");
+        emojiMap.put(128014, ":racehorse:");
+        emojiMap.put(128251, ":radio:");
+        emojiMap.put(128280, ":radio_button:");
+        emojiMap.put(128545, ":rage:");
+        emojiMap.put(128643, ":railway_car:");
+        emojiMap.put(127752, ":rainbow:");
+        emojiMap.put(9995, ":raised_hand:");
+        emojiMap.put(128588, ":raised_hands:");
+        emojiMap.put(128587, ":raising_hand:");
+        emojiMap.put(128015, ":ram:");
+        emojiMap.put(127836, ":ramen:");
+        emojiMap.put(128000, ":rat:");
+        emojiMap.put(9851, ":recycle:");
+        emojiMap.put(128663, ":red_car:");
+        emojiMap.put(128308, ":red_circle:");
+        emojiMap.put(174, ":registered:");
+        emojiMap.put(9786, ":relaxed:");
+        emojiMap.put(128524, ":relieved:");
+        emojiMap.put(128257, ":repeat:");
+        emojiMap.put(128258, ":repeat_one:");
+        emojiMap.put(128699, ":restroom:");
+        emojiMap.put(128158, ":revolving_hearts:");
+        emojiMap.put(9194, ":rewind:");
+        emojiMap.put(127872, ":ribbon:");
+        emojiMap.put(127834, ":rice:");
+        emojiMap.put(127833, ":rice_ball:");
+        emojiMap.put(127832, ":rice_cracker:");
+        emojiMap.put(127889, ":rice_scene:");
+        emojiMap.put(128141, ":ring:");
+        emojiMap.put(128640, ":rocket:");
+        emojiMap.put(127906, ":roller_coaster:");
+        emojiMap.put(128019, ":rooster:");
+        emojiMap.put(127801, ":rose:");
+        emojiMap.put(128680, ":rotating_light:");
+        emojiMap.put(128205, ":round_pushpin:");
+        emojiMap.put(128675, ":rowboat:");
+        emojiMap.put(127945, ":rugby_football:");
+        emojiMap.put(127939, ":runner:");
+        emojiMap.put(127939, ":running:");
+        emojiMap.put(127933, ":running_shirt_with_sash:");
+        emojiMap.put(127490, ":sa:");
+        emojiMap.put(9808, ":sagittarius:");
+        emojiMap.put(9973, ":sailboat:");
+        emojiMap.put(127862, ":sake:");
+        emojiMap.put(128097, ":sandal:");
+        emojiMap.put(127877, ":santa:");
+        emojiMap.put(128225, ":satellite:");
+        emojiMap.put(128518, ":satisfied:");
+        emojiMap.put(127927, ":saxophone:");
+        emojiMap.put(127979, ":school:");
+        emojiMap.put(127890, ":school_satchel:");
+        emojiMap.put(9986, ":scissors:");
+        emojiMap.put(9807, ":scorpius:");
+        emojiMap.put(128561, ":scream:");
+        emojiMap.put(128576, ":scream_cat:");
+        emojiMap.put(128220, ":scroll:");
+        emojiMap.put(128186, ":seat:");
+        emojiMap.put(12953, ":secret:");
+        emojiMap.put(128584, ":see_no_evil:");
+        emojiMap.put(127793, ":seedling:");
+        emojiMap.put(127847, ":shaved_ice:");
+        emojiMap.put(128017, ":sheep:");
+        emojiMap.put(128026, ":shell:");
+        emojiMap.put(128674, ":ship:");
+        emojiMap.put(128085, ":shirt:");
+        emojiMap.put(128169, ":shit:");
+        emojiMap.put(128094, ":shoe:");
+        emojiMap.put(128703, ":shower:");
+        emojiMap.put(128246, ":signal_strength:");
+        emojiMap.put(128303, ":six_pointed_star:");
+        emojiMap.put(127935, ":ski:");
+        emojiMap.put(128128, ":skull:");
+        emojiMap.put(128564, ":sleeping:");
+        emojiMap.put(128554, ":sleepy:");
+        emojiMap.put(127920, ":slot_machine:");
+        emojiMap.put(128313, ":small_blue_diamond:");
+        emojiMap.put(128312, ":small_orange_diamond:");
+        emojiMap.put(128314, ":small_red_triangle:");
+        emojiMap.put(128315, ":small_red_triangle_down:");
+        emojiMap.put(128516, ":smile:");
+        emojiMap.put(128568, ":smile_cat:");
+        emojiMap.put(128515, ":smiley:");
+        emojiMap.put(128570, ":smiley_cat:");
+        emojiMap.put(128520, ":smiling_imp:");
+        emojiMap.put(128527, ":smirk:");
+        emojiMap.put(128572, ":smirk_cat:");
+        emojiMap.put(128684, ":smoking:");
+        emojiMap.put(128012, ":snail:");
+        emojiMap.put(128013, ":snake:");
+        emojiMap.put(127938, ":snowboarder:");
+        emojiMap.put(10052, ":snowflake:");
+        emojiMap.put(9924, ":snowman:");
+        emojiMap.put(128557, ":sob:");
+        emojiMap.put(9917, ":soccer:");
+        emojiMap.put(128284, ":soon:");
+        emojiMap.put(127384, ":sos:");
+        emojiMap.put(128265, ":sound:");
+        emojiMap.put(128126, ":space_invader:");
+        emojiMap.put(9824, ":spades:");
+        emojiMap.put(127837, ":spaghetti:");
+        emojiMap.put(10055, ":sparkle:");
+        emojiMap.put(127879, ":sparkler:");
+        emojiMap.put(10024, ":sparkles:");
+        emojiMap.put(128150, ":sparkling_heart:");
+        emojiMap.put(128586, ":speak_no_evil:");
+        emojiMap.put(128266, ":speaker:");
+        emojiMap.put(128172, ":speech_balloon:");
+        emojiMap.put(128676, ":speedboat:");
+        emojiMap.put(11088, ":star:");
+        emojiMap.put(127775, ":star2:");
+        emojiMap.put(127747, ":stars:");
+        emojiMap.put(128649, ":station:");
+        emojiMap.put(128509, ":statue_of_liberty:");
+        emojiMap.put(128642, ":steam_locomotive:");
+        emojiMap.put(127858, ":stew:");
+        emojiMap.put(128207, ":straight_ruler:");
+        emojiMap.put(127827, ":strawberry:");
+        emojiMap.put(128539, ":stuck_out_tongue:");
+        emojiMap.put(128541, ":stuck_out_tongue_closed_eyes:");
+        emojiMap.put(128540, ":stuck_out_tongue_winking_eye:");
+        emojiMap.put(127774, ":sun_with_face:");
+        emojiMap.put(127803, ":sunflower:");
+        emojiMap.put(128526, ":sunglasses:");
+        emojiMap.put(9728, ":sunny:");
+        emojiMap.put(127749, ":sunrise:");
+        emojiMap.put(127748, ":sunrise_over_mountains:");
+        emojiMap.put(127940, ":surfer:");
+        emojiMap.put(127843, ":sushi:");
+        emojiMap.put(128671, ":suspension_railway:");
+        emojiMap.put(128531, ":sweat:");
+        emojiMap.put(128166, ":sweat_drops:");
+        emojiMap.put(128517, ":sweat_smile:");
+        emojiMap.put(127840, ":sweet_potato:");
+        emojiMap.put(127946, ":swimmer:");
+        emojiMap.put(128291, ":symbols:");
+        emojiMap.put(128137, ":syringe:");
+        emojiMap.put(127881, ":tada:");
+        emojiMap.put(127883, ":tanabata_tree:");
+        emojiMap.put(127818, ":tangerine:");
+        emojiMap.put(9801, ":taurus:");
+        emojiMap.put(128661, ":taxi:");
+        emojiMap.put(127861, ":tea:");
+        emojiMap.put(9742, ":telephone:");
+        emojiMap.put(128222, ":telephone_receiver:");
+        emojiMap.put(128301, ":telescope:");
+        emojiMap.put(127934, ":tennis:");
+        emojiMap.put(9978, ":tent:");
+        emojiMap.put(128173, ":thought_balloon:");
+        emojiMap.put(128078, ":thumbsdown:");
+        emojiMap.put(128077, ":thumbsup:");
+        emojiMap.put(127915, ":ticket:");
+        emojiMap.put(128047, ":tiger:");
+        emojiMap.put(128005, ":tiger2:");
+        emojiMap.put(128555, ":tired_face:");
+        emojiMap.put(8482, ":tm:");
+        emojiMap.put(128701, ":toilet:");
+        emojiMap.put(128508, ":tokyo_tower:");
+        emojiMap.put(127813, ":tomato:");
+        emojiMap.put(128069, ":tongue:");
+        emojiMap.put(128285, ":top:");
+        emojiMap.put(127913, ":tophat:");
+        emojiMap.put(128668, ":tractor:");
+        emojiMap.put(128677, ":traffic_light:");
+        emojiMap.put(128643, ":train:");
+        emojiMap.put(128646, ":train2:");
+        emojiMap.put(128650, ":tram:");
+        emojiMap.put(128681, ":triangular_flag_on_post:");
+        emojiMap.put(128208, ":triangular_ruler:");
+        emojiMap.put(128305, ":trident:");
+        emojiMap.put(128548, ":triumph:");
+        emojiMap.put(128654, ":trolleybus:");
+        emojiMap.put(127942, ":trophy:");
+        emojiMap.put(127865, ":tropical_drink:");
+        emojiMap.put(128032, ":tropical_fish:");
+        emojiMap.put(128666, ":truck:");
+        emojiMap.put(127930, ":trumpet:");
+        emojiMap.put(128085, ":tshirt:");
+        emojiMap.put(127799, ":tulip:");
+        emojiMap.put(128034, ":turtle:");
+        emojiMap.put(128250, ":tv:");
+        emojiMap.put(128256, ":twisted_rightwards_arrows:");
+        emojiMap.put(128149, ":two_hearts:");
+        emojiMap.put(128108, ":two_men_holding_hands:");
+        emojiMap.put(128109, ":two_women_holding_hands:");
+        emojiMap.put(127545, ":u5272:");
+        emojiMap.put(127540, ":u5408:");
+        emojiMap.put(127546, ":u55b6:");
+        emojiMap.put(127535, ":u6307:");
+        emojiMap.put(127543, ":u6708:");
+        emojiMap.put(127542, ":u6709:");
+        emojiMap.put(127541, ":u6e80:");
+        emojiMap.put(127514, ":u7121:");
+        emojiMap.put(127544, ":u7533:");
+        emojiMap.put(127538, ":u7981:");
+        emojiMap.put(127539, ":u7a7a:");
+        emojiMap.put(9748, ":umbrella:");
+        emojiMap.put(128530, ":unamused:");
+        emojiMap.put(128286, ":underage:");
+        emojiMap.put(128275, ":unlock:");
+        emojiMap.put(127385, ":up:");
+        emojiMap.put(9996, ":v:");
+        emojiMap.put(128678, ":vertical_traffic_light:");
+        emojiMap.put(128252, ":vhs:");
+        emojiMap.put(128243, ":vibration_mode:");
+        emojiMap.put(128249, ":video_camera:");
+        emojiMap.put(127918, ":video_game:");
+        emojiMap.put(127931, ":violin:");
+        emojiMap.put(9805, ":virgo:");
+        emojiMap.put(127755, ":volcano:");
+        emojiMap.put(127386, ":vs:");
+        emojiMap.put(128694, ":walking:");
+        emojiMap.put(127768, ":waning_crescent_moon:");
+        emojiMap.put(127766, ":waning_gibbous_moon:");
+        emojiMap.put(9888, ":warning:");
+        emojiMap.put(8986, ":watch:");
+        emojiMap.put(128003, ":water_buffalo:");
+        emojiMap.put(127817, ":watermelon:");
+        emojiMap.put(128075, ":wave:");
+        emojiMap.put(12336, ":wavy_dash:");
+        emojiMap.put(127762, ":waxing_crescent_moon:");
+        emojiMap.put(127764, ":waxing_gibbous_moon:");
+        emojiMap.put(128702, ":wc:");
+        emojiMap.put(128553, ":weary:");
+        emojiMap.put(128146, ":wedding:");
+        emojiMap.put(128051, ":whale:");
+        emojiMap.put(128011, ":whale2:");
+        emojiMap.put(9855, ":wheelchair:");
+        emojiMap.put(9989, ":white_check_mark:");
+        emojiMap.put(9898, ":white_circle:");
+        emojiMap.put(128174, ":white_flower:");
+        emojiMap.put(11036, ":white_large_square:");
+        emojiMap.put(9725, ":white_medium_small_square:");
+        emojiMap.put(9723, ":white_medium_square:");
+        emojiMap.put(9643, ":white_small_square:");
+        emojiMap.put(128307, ":white_square_button:");
+        emojiMap.put(127888, ":wind_chime:");
+        emojiMap.put(127863, ":wine_glass:");
+        emojiMap.put(128521, ":wink:");
+        emojiMap.put(128058, ":wolf:");
+        emojiMap.put(128105, ":woman:");
+        emojiMap.put(128090, ":womans_clothes:");
+        emojiMap.put(128082, ":womans_hat:");
+        emojiMap.put(128698, ":womens:");
+        emojiMap.put(128543, ":worried:");
+        emojiMap.put(128295, ":wrench:");
+        emojiMap.put(10060, ":x:");
+        emojiMap.put(128155, ":yellow_heart:");
+        emojiMap.put(128180, ":yen:");
+        emojiMap.put(128523, ":yum:");
+        emojiMap.put(9889, ":zap:");
+        emojiMap.put(128164, ":zzz:");
+
+        invertedEmojiMap.put(":+1:", 128077);
+        invertedEmojiMap.put(":-1:", 128078);
+        invertedEmojiMap.put(":100:", 128175);
+        invertedEmojiMap.put(":1234:", 128290);
+        invertedEmojiMap.put(":8ball:", 127921);
+        invertedEmojiMap.put(":a:", 127344);
+        invertedEmojiMap.put(":ab:", 127374);
+        invertedEmojiMap.put(":abc:", 128292);
+        invertedEmojiMap.put(":abcd:", 128289);
+        invertedEmojiMap.put(":accept:", 127569);
+        invertedEmojiMap.put(":aerial_tramway:", 128673);
+        invertedEmojiMap.put(":airplane:", 9992);
+        invertedEmojiMap.put(":alarm_clock:", 9200);
+        invertedEmojiMap.put(":alien:", 128125);
+        invertedEmojiMap.put(":ambulance:", 128657);
+        invertedEmojiMap.put(":anchor:", 9875);
+        invertedEmojiMap.put(":angel:", 128124);
+        invertedEmojiMap.put(":anger:", 128162);
+        invertedEmojiMap.put(":angry:", 128544);
+        invertedEmojiMap.put(":anguished:", 128551);
+        invertedEmojiMap.put(":ant:", 128028);
+        invertedEmojiMap.put(":apple:", 127822);
+        invertedEmojiMap.put(":aquarius:", 9810);
+        invertedEmojiMap.put(":aries:", 9800);
+        invertedEmojiMap.put(":arrow_backward:", 9664);
+        invertedEmojiMap.put(":arrow_double_down:", 9196);
+        invertedEmojiMap.put(":arrow_double_up:", 9195);
+        invertedEmojiMap.put(":arrow_down:", 11015);
+        invertedEmojiMap.put(":arrow_down_small:", 128317);
+        invertedEmojiMap.put(":arrow_forward:", 9654);
+        invertedEmojiMap.put(":arrow_heading_down:", 10549);
+        invertedEmojiMap.put(":arrow_heading_up:", 10548);
+        invertedEmojiMap.put(":arrow_left:", 11013);
+        invertedEmojiMap.put(":arrow_lower_left:", 8601);
+        invertedEmojiMap.put(":arrow_lower_right:", 8600);
+        invertedEmojiMap.put(":arrow_right:", 10145);
+        invertedEmojiMap.put(":arrow_right_hook:", 8618);
+        invertedEmojiMap.put(":arrow_up:", 11014);
+        invertedEmojiMap.put(":arrow_up_down:", 8597);
+        invertedEmojiMap.put(":arrow_up_small:", 128316);
+        invertedEmojiMap.put(":arrow_upper_left:", 8598);
+        invertedEmojiMap.put(":arrow_upper_right:", 8599);
+        invertedEmojiMap.put(":arrows_clockwise:", 128259);
+        invertedEmojiMap.put(":arrows_counterclockwise:", 128260);
+        invertedEmojiMap.put(":art:", 127912);
+        invertedEmojiMap.put(":articulated_lorry:", 128667);
+        invertedEmojiMap.put(":astonished:", 128562);
+        invertedEmojiMap.put(":athletic_shoe:", 128095);
+        invertedEmojiMap.put(":atm:", 127975);
+        invertedEmojiMap.put(":b:", 127345);
+        invertedEmojiMap.put(":baby:", 128118);
+        invertedEmojiMap.put(":baby_bottle:", 127868);
+        invertedEmojiMap.put(":baby_chick:", 128036);
+        invertedEmojiMap.put(":baby_symbol:", 128700);
+        invertedEmojiMap.put(":back:", 128281);
+        invertedEmojiMap.put(":baggage_claim:", 128708);
+        invertedEmojiMap.put(":balloon:", 127880);
+        invertedEmojiMap.put(":ballot_box_with_check:", 9745);
+        invertedEmojiMap.put(":bamboo:", 127885);
+        invertedEmojiMap.put(":banana:", 127820);
+        invertedEmojiMap.put(":bangbang:", 8252);
+        invertedEmojiMap.put(":bank:", 127974);
+        invertedEmojiMap.put(":bar_chart:", 128202);
+        invertedEmojiMap.put(":barber:", 128136);
+        invertedEmojiMap.put(":baseball:", 9918);
+        invertedEmojiMap.put(":basketball:", 127936);
+        invertedEmojiMap.put(":bath:", 128704);
+        invertedEmojiMap.put(":bathtub:", 128705);
+        invertedEmojiMap.put(":battery:", 128267);
+        invertedEmojiMap.put(":bear:", 128059);
+        invertedEmojiMap.put(":bee:", 128029);
+        invertedEmojiMap.put(":beer:", 127866);
+        invertedEmojiMap.put(":beers:", 127867);
+        invertedEmojiMap.put(":beetle:", 128030);
+        invertedEmojiMap.put(":beginner:", 128304);
+        invertedEmojiMap.put(":bell:", 128276);
+        invertedEmojiMap.put(":bento:", 127857);
+        invertedEmojiMap.put(":bicyclist:", 128692);
+        invertedEmojiMap.put(":bike:", 128690);
+        invertedEmojiMap.put(":bikini:", 128089);
+        invertedEmojiMap.put(":bird:", 128038);
+        invertedEmojiMap.put(":birthday:", 127874);
+        invertedEmojiMap.put(":black_circle:", 9899);
+        invertedEmojiMap.put(":black_joker:", 127183);
+        invertedEmojiMap.put(":black_large_square:", 11035);
+        invertedEmojiMap.put(":black_medium_small_square:", 9726);
+        invertedEmojiMap.put(":black_medium_square:", 9724);
+        invertedEmojiMap.put(":black_nib:", 10002);
+        invertedEmojiMap.put(":black_small_square:", 9642);
+        invertedEmojiMap.put(":black_square_button:", 128306);
+        invertedEmojiMap.put(":blossom:", 127804);
+        invertedEmojiMap.put(":blowfish:", 128033);
+        invertedEmojiMap.put(":blue_book:", 128216);
+        invertedEmojiMap.put(":blue_car:", 128665);
+        invertedEmojiMap.put(":blue_heart:", 128153);
+        invertedEmojiMap.put(":blush:", 128522);
+        invertedEmojiMap.put(":boar:", 128023);
+        invertedEmojiMap.put(":boat:", 9973);
+        invertedEmojiMap.put(":bomb:", 128163);
+        invertedEmojiMap.put(":book:", 128214);
+        invertedEmojiMap.put(":bookmark:", 128278);
+        invertedEmojiMap.put(":bookmark_tabs:", 128209);
+        invertedEmojiMap.put(":books:", 128218);
+        invertedEmojiMap.put(":boom:", 128165);
+        invertedEmojiMap.put(":boot:", 128098);
+        invertedEmojiMap.put(":bouquet:", 128144);
+        invertedEmojiMap.put(":bow:", 128583);
+        invertedEmojiMap.put(":bowling:", 127923);
+        invertedEmojiMap.put(":boy:", 128102);
+        invertedEmojiMap.put(":bread:", 127838);
+        invertedEmojiMap.put(":bride_with_veil:", 128112);
+        invertedEmojiMap.put(":bridge_at_night:", 127753);
+        invertedEmojiMap.put(":briefcase:", 128188);
+        invertedEmojiMap.put(":broken_heart:", 128148);
+        invertedEmojiMap.put(":bug:", 128027);
+        invertedEmojiMap.put(":bulb:", 128161);
+        invertedEmojiMap.put(":bullettrain_front:", 128645);
+        invertedEmojiMap.put(":bullettrain_side:", 128644);
+        invertedEmojiMap.put(":bus:", 128652);
+        invertedEmojiMap.put(":busstop:", 128655);
+        invertedEmojiMap.put(":bust_in_silhouette:", 128100);
+        invertedEmojiMap.put(":busts_in_silhouette:", 128101);
+        invertedEmojiMap.put(":cactus:", 127797);
+        invertedEmojiMap.put(":cake:", 127856);
+        invertedEmojiMap.put(":calendar:", 128198);
+        invertedEmojiMap.put(":calling:", 128242);
+        invertedEmojiMap.put(":camel:", 128043);
+        invertedEmojiMap.put(":camera:", 128247);
+        invertedEmojiMap.put(":cancer:", 9803);
+        invertedEmojiMap.put(":candy:", 127852);
+        invertedEmojiMap.put(":capital_abcd:", 128288);
+        invertedEmojiMap.put(":capricorn:", 9809);
+        invertedEmojiMap.put(":car:", 128663);
+        invertedEmojiMap.put(":card_index:", 128199);
+        invertedEmojiMap.put(":carousel_horse:", 127904);
+        invertedEmojiMap.put(":cat:", 128049);
+        invertedEmojiMap.put(":cat2:", 128008);
+        invertedEmojiMap.put(":cd:", 128191);
+        invertedEmojiMap.put(":chart:", 128185);
+        invertedEmojiMap.put(":chart_with_downwards_trend:", 128201);
+        invertedEmojiMap.put(":chart_with_upwards_trend:", 128200);
+        invertedEmojiMap.put(":checkered_flag:", 127937);
+        invertedEmojiMap.put(":cherries:", 127826);
+        invertedEmojiMap.put(":cherry_blossom:", 127800);
+        invertedEmojiMap.put(":chestnut:", 127792);
+        invertedEmojiMap.put(":chicken:", 128020);
+        invertedEmojiMap.put(":children_crossing:", 128696);
+        invertedEmojiMap.put(":chocolate_bar:", 127851);
+        invertedEmojiMap.put(":christmas_tree:", 127876);
+        invertedEmojiMap.put(":church:", 9962);
+        invertedEmojiMap.put(":cinema:", 127910);
+        invertedEmojiMap.put(":circus_tent:", 127914);
+        invertedEmojiMap.put(":city_sunrise:", 127751);
+        invertedEmojiMap.put(":city_sunset:", 127750);
+        invertedEmojiMap.put(":cl:", 127377);
+        invertedEmojiMap.put(":clap:", 128079);
+        invertedEmojiMap.put(":clapper:", 127916);
+        invertedEmojiMap.put(":clipboard:", 128203);
+        invertedEmojiMap.put(":clock1:", 128336);
+        invertedEmojiMap.put(":clock10:", 128345);
+        invertedEmojiMap.put(":clock1030:", 128357);
+        invertedEmojiMap.put(":clock11:", 128346);
+        invertedEmojiMap.put(":clock1130:", 128358);
+        invertedEmojiMap.put(":clock12:", 128347);
+        invertedEmojiMap.put(":clock1230:", 128359);
+        invertedEmojiMap.put(":clock130:", 128348);
+        invertedEmojiMap.put(":clock2:", 128337);
+        invertedEmojiMap.put(":clock230:", 128349);
+        invertedEmojiMap.put(":clock3:", 128338);
+        invertedEmojiMap.put(":clock330:", 128350);
+        invertedEmojiMap.put(":clock4:", 128339);
+        invertedEmojiMap.put(":clock430:", 128351);
+        invertedEmojiMap.put(":clock5:", 128340);
+        invertedEmojiMap.put(":clock530:", 128352);
+        invertedEmojiMap.put(":clock6:", 128341);
+        invertedEmojiMap.put(":clock630:", 128353);
+        invertedEmojiMap.put(":clock7:", 128342);
+        invertedEmojiMap.put(":clock730:", 128354);
+        invertedEmojiMap.put(":clock8:", 128343);
+        invertedEmojiMap.put(":clock830:", 128355);
+        invertedEmojiMap.put(":clock9:", 128344);
+        invertedEmojiMap.put(":clock930:", 128356);
+        invertedEmojiMap.put(":closed_book:", 128213);
+        invertedEmojiMap.put(":closed_lock_with_key:", 128272);
+        invertedEmojiMap.put(":closed_umbrella:", 127746);
+        invertedEmojiMap.put(":cloud:", 9729);
+        invertedEmojiMap.put(":clubs:", 9827);
+        invertedEmojiMap.put(":cocktail:", 127864);
+        invertedEmojiMap.put(":coffee:", 9749);
+        invertedEmojiMap.put(":cold_sweat:", 128560);
+        invertedEmojiMap.put(":collision:", 128165);
+        invertedEmojiMap.put(":computer:", 128187);
+        invertedEmojiMap.put(":confetti_ball:", 127882);
+        invertedEmojiMap.put(":confounded:", 128534);
+        invertedEmojiMap.put(":confused:", 128533);
+        invertedEmojiMap.put(":congratulations:", 12951);
+        invertedEmojiMap.put(":construction:", 128679);
+        invertedEmojiMap.put(":construction_worker:", 128119);
+        invertedEmojiMap.put(":convenience_store:", 127978);
+        invertedEmojiMap.put(":cookie:", 127850);
+        invertedEmojiMap.put(":cool:", 127378);
+        invertedEmojiMap.put(":cop:", 128110);
+        invertedEmojiMap.put(":copyright:", 169);
+        invertedEmojiMap.put(":corn:", 127805);
+        invertedEmojiMap.put(":couple:", 128107);
+        invertedEmojiMap.put(":couple_with_heart:", 128145);
+        invertedEmojiMap.put(":couplekiss:", 128143);
+        invertedEmojiMap.put(":cow:", 128046);
+        invertedEmojiMap.put(":cow2:", 128004);
+        invertedEmojiMap.put(":credit_card:", 128179);
+        invertedEmojiMap.put(":crescent_moon:", 127769);
+        invertedEmojiMap.put(":crocodile:", 128010);
+        invertedEmojiMap.put(":crossed_flags:", 127884);
+        invertedEmojiMap.put(":crown:", 128081);
+        invertedEmojiMap.put(":cry:", 128546);
+        invertedEmojiMap.put(":crying_cat_face:", 128575);
+        invertedEmojiMap.put(":crystal_ball:", 128302);
+        invertedEmojiMap.put(":cupid:", 128152);
+        invertedEmojiMap.put(":curly_loop:", 10160);
+        invertedEmojiMap.put(":currency_exchange:", 128177);
+        invertedEmojiMap.put(":curry:", 127835);
+        invertedEmojiMap.put(":custard:", 127854);
+        invertedEmojiMap.put(":customs:", 128707);
+        invertedEmojiMap.put(":cyclone:", 127744);
+        invertedEmojiMap.put(":dancer:", 128131);
+        invertedEmojiMap.put(":dancers:", 128111);
+        invertedEmojiMap.put(":dango:", 127841);
+        invertedEmojiMap.put(":dart:", 127919);
+        invertedEmojiMap.put(":dash:", 128168);
+        invertedEmojiMap.put(":date:", 128197);
+        invertedEmojiMap.put(":deciduous_tree:", 127795);
+        invertedEmojiMap.put(":department_store:", 127980);
+        invertedEmojiMap.put(":diamond_shape_with_a_dot_inside:", 128160);
+        invertedEmojiMap.put(":diamonds:", 9830);
+        invertedEmojiMap.put(":disappointed:", 128542);
+        invertedEmojiMap.put(":disappointed_relieved:", 128549);
+        invertedEmojiMap.put(":dizzy:", 128171);
+        invertedEmojiMap.put(":dizzy_face:", 128565);
+        invertedEmojiMap.put(":do_not_litter:", 128687);
+        invertedEmojiMap.put(":dog:", 128054);
+        invertedEmojiMap.put(":dog2:", 128021);
+        invertedEmojiMap.put(":dollar:", 128181);
+        invertedEmojiMap.put(":dolls:", 127886);
+        invertedEmojiMap.put(":dolphin:", 128044);
+        invertedEmojiMap.put(":door:", 128682);
+        invertedEmojiMap.put(":doughnut:", 127849);
+        invertedEmojiMap.put(":dragon:", 128009);
+        invertedEmojiMap.put(":dragon_face:", 128050);
+        invertedEmojiMap.put(":dress:", 128087);
+        invertedEmojiMap.put(":dromedary_camel:", 128042);
+        invertedEmojiMap.put(":droplet:", 128167);
+        invertedEmojiMap.put(":dvd:", 128192);
+        invertedEmojiMap.put(":e-mail:", 128231);
+        invertedEmojiMap.put(":ear:", 128066);
+        invertedEmojiMap.put(":ear_of_rice:", 127806);
+        invertedEmojiMap.put(":earth_africa:", 127757);
+        invertedEmojiMap.put(":earth_americas:", 127758);
+        invertedEmojiMap.put(":earth_asia:", 127759);
+        invertedEmojiMap.put(":egg:", 127859);
+        invertedEmojiMap.put(":eggplant:", 127814);
+        invertedEmojiMap.put(":eight_pointed_black_star:", 10036);
+        invertedEmojiMap.put(":eight_spoked_asterisk:", 10035);
+        invertedEmojiMap.put(":electric_plug:", 128268);
+        invertedEmojiMap.put(":elephant:", 128024);
+        invertedEmojiMap.put(":email:", 9993);
+        invertedEmojiMap.put(":end:", 128282);
+        invertedEmojiMap.put(":envelope:", 9993);
+        invertedEmojiMap.put(":envelope_with_arrow:", 128233);
+        invertedEmojiMap.put(":euro:", 128182);
+        invertedEmojiMap.put(":european_castle:", 127984);
+        invertedEmojiMap.put(":european_post_office:", 127972);
+        invertedEmojiMap.put(":evergreen_tree:", 127794);
+        invertedEmojiMap.put(":exclamation:", 10071);
+        invertedEmojiMap.put(":expressionless:", 128529);
+        invertedEmojiMap.put(":eyeglasses:", 128083);
+        invertedEmojiMap.put(":eyes:", 128064);
+        invertedEmojiMap.put(":facepunch:", 128074);
+        invertedEmojiMap.put(":factory:", 127981);
+        invertedEmojiMap.put(":fallen_leaf:", 127810);
+        invertedEmojiMap.put(":family:", 128106);
+        invertedEmojiMap.put(":fast_forward:", 9193);
+        invertedEmojiMap.put(":fax:", 128224);
+        invertedEmojiMap.put(":fearful:", 128552);
+        invertedEmojiMap.put(":feet:", 128062);
+        invertedEmojiMap.put(":ferris_wheel:", 127905);
+        invertedEmojiMap.put(":file_folder:", 128193);
+        invertedEmojiMap.put(":fire:", 128293);
+        invertedEmojiMap.put(":fire_engine:", 128658);
+        invertedEmojiMap.put(":fireworks:", 127878);
+        invertedEmojiMap.put(":first_quarter_moon:", 127763);
+        invertedEmojiMap.put(":first_quarter_moon_with_face:", 127771);
+        invertedEmojiMap.put(":fish:", 128031);
+        invertedEmojiMap.put(":fish_cake:", 127845);
+        invertedEmojiMap.put(":fishing_pole_and_fish:", 127907);
+        invertedEmojiMap.put(":fist:", 9994);
+        invertedEmojiMap.put(":flags:", 127887);
+        invertedEmojiMap.put(":flashlight:", 128294);
+        invertedEmojiMap.put(":flipper:", 128044);
+        invertedEmojiMap.put(":floppy_disk:", 128190);
+        invertedEmojiMap.put(":flower_playing_cards:", 127924);
+        invertedEmojiMap.put(":flushed:", 128563);
+        invertedEmojiMap.put(":foggy:", 127745);
+        invertedEmojiMap.put(":football:", 127944);
+        invertedEmojiMap.put(":footprints:", 128099);
+        invertedEmojiMap.put(":fork_and_knife:", 127860);
+        invertedEmojiMap.put(":fountain:", 9970);
+        invertedEmojiMap.put(":four_leaf_clover:", 127808);
+        invertedEmojiMap.put(":free:", 127379);
+        invertedEmojiMap.put(":fried_shrimp:", 127844);
+        invertedEmojiMap.put(":fries:", 127839);
+        invertedEmojiMap.put(":frog:", 128056);
+        invertedEmojiMap.put(":frowning:", 128550);
+        invertedEmojiMap.put(":fuelpump:", 9981);
+        invertedEmojiMap.put(":full_moon:", 127765);
+        invertedEmojiMap.put(":full_moon_with_face:", 127773);
+        invertedEmojiMap.put(":game_die:", 127922);
+        invertedEmojiMap.put(":gem:", 128142);
+        invertedEmojiMap.put(":gemini:", 9802);
+        invertedEmojiMap.put(":ghost:", 128123);
+        invertedEmojiMap.put(":gift:", 127873);
+        invertedEmojiMap.put(":gift_heart:", 128157);
+        invertedEmojiMap.put(":girl:", 128103);
+        invertedEmojiMap.put(":globe_with_meridians:", 127760);
+        invertedEmojiMap.put(":goat:", 128016);
+        invertedEmojiMap.put(":golf:", 9971);
+        invertedEmojiMap.put(":grapes:", 127815);
+        invertedEmojiMap.put(":green_apple:", 127823);
+        invertedEmojiMap.put(":green_book:", 128215);
+        invertedEmojiMap.put(":green_heart:", 128154);
+        invertedEmojiMap.put(":grey_exclamation:", 10069);
+        invertedEmojiMap.put(":grey_question:", 10068);
+        invertedEmojiMap.put(":grimacing:", 128556);
+        invertedEmojiMap.put(":grin:", 128513);
+        invertedEmojiMap.put(":grinning:", 128512);
+        invertedEmojiMap.put(":guardsman:", 128130);
+        invertedEmojiMap.put(":guitar:", 127928);
+        invertedEmojiMap.put(":gun:", 128299);
+        invertedEmojiMap.put(":haircut:", 128135);
+        invertedEmojiMap.put(":hamburger:", 127828);
+        invertedEmojiMap.put(":hammer:", 128296);
+        invertedEmojiMap.put(":hamster:", 128057);
+        invertedEmojiMap.put(":hand:", 9995);
+        invertedEmojiMap.put(":handbag:", 128092);
+        invertedEmojiMap.put(":hankey:", 128169);
+        invertedEmojiMap.put(":hatched_chick:", 128037);
+        invertedEmojiMap.put(":hatching_chick:", 128035);
+        invertedEmojiMap.put(":headphones:", 127911);
+        invertedEmojiMap.put(":hear_no_evil:", 128585);
+        invertedEmojiMap.put(":heart:", 10084);
+        invertedEmojiMap.put(":heart_decoration:", 128159);
+        invertedEmojiMap.put(":heart_eyes:", 128525);
+        invertedEmojiMap.put(":heart_eyes_cat:", 128571);
+        invertedEmojiMap.put(":heartbeat:", 128147);
+        invertedEmojiMap.put(":heartpulse:", 128151);
+        invertedEmojiMap.put(":hearts:", 9829);
+        invertedEmojiMap.put(":heavy_check_mark:", 10004);
+        invertedEmojiMap.put(":heavy_division_sign:", 10135);
+        invertedEmojiMap.put(":heavy_dollar_sign:", 128178);
+        invertedEmojiMap.put(":heavy_exclamation_mark:", 10071);
+        invertedEmojiMap.put(":heavy_minus_sign:", 10134);
+        invertedEmojiMap.put(":heavy_multiplication_x:", 10006);
+        invertedEmojiMap.put(":heavy_plus_sign:", 10133);
+        invertedEmojiMap.put(":helicopter:", 128641);
+        invertedEmojiMap.put(":herb:", 127807);
+        invertedEmojiMap.put(":hibiscus:", 127802);
+        invertedEmojiMap.put(":high_brightness:", 128262);
+        invertedEmojiMap.put(":high_heel:", 128096);
+        invertedEmojiMap.put(":hocho:", 128298);
+        invertedEmojiMap.put(":honey_pot:", 127855);
+        invertedEmojiMap.put(":honeybee:", 128029);
+        invertedEmojiMap.put(":horse:", 128052);
+        invertedEmojiMap.put(":horse_racing:", 127943);
+        invertedEmojiMap.put(":hospital:", 127973);
+        invertedEmojiMap.put(":hotel:", 127976);
+        invertedEmojiMap.put(":hotsprings:", 9832);
+        invertedEmojiMap.put(":hourglass:", 8987);
+        invertedEmojiMap.put(":hourglass_flowing_sand:", 9203);
+        invertedEmojiMap.put(":house:", 127968);
+        invertedEmojiMap.put(":house_with_garden:", 127969);
+        invertedEmojiMap.put(":hushed:", 128559);
+        invertedEmojiMap.put(":ice_cream:", 127848);
+        invertedEmojiMap.put(":icecream:", 127846);
+        invertedEmojiMap.put(":id:", 127380);
+        invertedEmojiMap.put(":ideograph_advantage:", 127568);
+        invertedEmojiMap.put(":imp:", 128127);
+        invertedEmojiMap.put(":inbox_tray:", 128229);
+        invertedEmojiMap.put(":incoming_envelope:", 128232);
+        invertedEmojiMap.put(":information_desk_person:", 128129);
+        invertedEmojiMap.put(":information_source:", 8505);
+        invertedEmojiMap.put(":innocent:", 128519);
+        invertedEmojiMap.put(":interrobang:", 8265);
+        invertedEmojiMap.put(":iphone:", 128241);
+        invertedEmojiMap.put(":izakaya_lantern:", 127982);
+        invertedEmojiMap.put(":jack_o_lantern:", 127875);
+        invertedEmojiMap.put(":japan:", 128510);
+        invertedEmojiMap.put(":japanese_castle:", 127983);
+        invertedEmojiMap.put(":japanese_goblin:", 128122);
+        invertedEmojiMap.put(":japanese_ogre:", 128121);
+        invertedEmojiMap.put(":jeans:", 128086);
+        invertedEmojiMap.put(":joy:", 128514);
+        invertedEmojiMap.put(":joy_cat:", 128569);
+        invertedEmojiMap.put(":key:", 128273);
+        invertedEmojiMap.put(":keycap_ten:", 128287);
+        invertedEmojiMap.put(":kimono:", 128088);
+        invertedEmojiMap.put(":kiss:", 128139);
+        invertedEmojiMap.put(":kissing:", 128535);
+        invertedEmojiMap.put(":kissing_cat:", 128573);
+        invertedEmojiMap.put(":kissing_closed_eyes:", 128538);
+        invertedEmojiMap.put(":kissing_heart:", 128536);
+        invertedEmojiMap.put(":kissing_smiling_eyes:", 128537);
+        invertedEmojiMap.put(":koala:", 128040);
+        invertedEmojiMap.put(":koko:", 127489);
+        invertedEmojiMap.put(":lantern:", 127982);
+        invertedEmojiMap.put(":large_blue_circle:", 128309);
+        invertedEmojiMap.put(":large_blue_diamond:", 128311);
+        invertedEmojiMap.put(":large_orange_diamond:", 128310);
+        invertedEmojiMap.put(":last_quarter_moon:", 127767);
+        invertedEmojiMap.put(":last_quarter_moon_with_face:", 127772);
+        invertedEmojiMap.put(":laughing:", 128518);
+        invertedEmojiMap.put(":leaves:", 127811);
+        invertedEmojiMap.put(":ledger:", 128210);
+        invertedEmojiMap.put(":left_luggage:", 128709);
+        invertedEmojiMap.put(":left_right_arrow:", 8596);
+        invertedEmojiMap.put(":leftwards_arrow_with_hook:", 8617);
+        invertedEmojiMap.put(":lemon:", 127819);
+        invertedEmojiMap.put(":leo:", 9804);
+        invertedEmojiMap.put(":leopard:", 128006);
+        invertedEmojiMap.put(":libra:", 9806);
+        invertedEmojiMap.put(":light_rail:", 128648);
+        invertedEmojiMap.put(":link:", 128279);
+        invertedEmojiMap.put(":lips:", 128068);
+        invertedEmojiMap.put(":lipstick:", 128132);
+        invertedEmojiMap.put(":lock:", 128274);
+        invertedEmojiMap.put(":lock_with_ink_pen:", 128271);
+        invertedEmojiMap.put(":lollipop:", 127853);
+        invertedEmojiMap.put(":loop:", 10175);
+        invertedEmojiMap.put(":loudspeaker:", 128226);
+        invertedEmojiMap.put(":love_hotel:", 127977);
+        invertedEmojiMap.put(":love_letter:", 128140);
+        invertedEmojiMap.put(":low_brightness:", 128261);
+        invertedEmojiMap.put(":m:", 9410);
+        invertedEmojiMap.put(":mag:", 128269);
+        invertedEmojiMap.put(":mag_right:", 128270);
+        invertedEmojiMap.put(":mahjong:", 126980);
+        invertedEmojiMap.put(":mailbox:", 128235);
+        invertedEmojiMap.put(":mailbox_closed:", 128234);
+        invertedEmojiMap.put(":mailbox_with_mail:", 128236);
+        invertedEmojiMap.put(":mailbox_with_no_mail:", 128237);
+        invertedEmojiMap.put(":man:", 128104);
+        invertedEmojiMap.put(":man_with_gua_pi_mao:", 128114);
+        invertedEmojiMap.put(":man_with_turban:", 128115);
+        invertedEmojiMap.put(":mans_shoe:", 128094);
+        invertedEmojiMap.put(":maple_leaf:", 127809);
+        invertedEmojiMap.put(":mask:", 128567);
+        invertedEmojiMap.put(":massage:", 128134);
+        invertedEmojiMap.put(":meat_on_bone:", 127830);
+        invertedEmojiMap.put(":mega:", 128227);
+        invertedEmojiMap.put(":melon:", 127816);
+        invertedEmojiMap.put(":memo:", 128221);
+        invertedEmojiMap.put(":mens:", 128697);
+        invertedEmojiMap.put(":metro:", 128647);
+        invertedEmojiMap.put(":microphone:", 127908);
+        invertedEmojiMap.put(":microscope:", 128300);
+        invertedEmojiMap.put(":milky_way:", 127756);
+        invertedEmojiMap.put(":minibus:", 128656);
+        invertedEmojiMap.put(":minidisc:", 128189);
+        invertedEmojiMap.put(":mobile_phone_off:", 128244);
+        invertedEmojiMap.put(":money_with_wings:", 128184);
+        invertedEmojiMap.put(":moneybag:", 128176);
+        invertedEmojiMap.put(":monkey:", 128018);
+        invertedEmojiMap.put(":monkey_face:", 128053);
+        invertedEmojiMap.put(":monorail:", 128669);
+        invertedEmojiMap.put(":moon:", 127764);
+        invertedEmojiMap.put(":mortar_board:", 127891);
+        invertedEmojiMap.put(":mount_fuji:", 128507);
+        invertedEmojiMap.put(":mountain_bicyclist:", 128693);
+        invertedEmojiMap.put(":mountain_cableway:", 128672);
+        invertedEmojiMap.put(":mountain_railway:", 128670);
+        invertedEmojiMap.put(":mouse:", 128045);
+        invertedEmojiMap.put(":mouse2:", 128001);
+        invertedEmojiMap.put(":movie_camera:", 127909);
+        invertedEmojiMap.put(":moyai:", 128511);
+        invertedEmojiMap.put(":muscle:", 128170);
+        invertedEmojiMap.put(":mushroom:", 127812);
+        invertedEmojiMap.put(":musical_keyboard:", 127929);
+        invertedEmojiMap.put(":musical_note:", 127925);
+        invertedEmojiMap.put(":musical_score:", 127932);
+        invertedEmojiMap.put(":mute:", 128263);
+        invertedEmojiMap.put(":nail_care:", 128133);
+        invertedEmojiMap.put(":name_badge:", 128219);
+        invertedEmojiMap.put(":necktie:", 128084);
+        invertedEmojiMap.put(":negative_squared_cross_mark:", 10062);
+        invertedEmojiMap.put(":neutral_face:", 128528);
+        invertedEmojiMap.put(":new:", 127381);
+        invertedEmojiMap.put(":new_moon:", 127761);
+        invertedEmojiMap.put(":new_moon_with_face:", 127770);
+        invertedEmojiMap.put(":newspaper:", 128240);
+        invertedEmojiMap.put(":ng:", 127382);
+        invertedEmojiMap.put(":no_bell:", 128277);
+        invertedEmojiMap.put(":no_bicycles:", 128691);
+        invertedEmojiMap.put(":no_entry:", 9940);
+        invertedEmojiMap.put(":no_entry_sign:", 128683);
+        invertedEmojiMap.put(":no_good:", 128581);
+        invertedEmojiMap.put(":no_mobile_phones:", 128245);
+        invertedEmojiMap.put(":no_mouth:", 128566);
+        invertedEmojiMap.put(":no_pedestrians:", 128695);
+        invertedEmojiMap.put(":no_smoking:", 128685);
+        invertedEmojiMap.put(":non-potable_water:", 128689);
+        invertedEmojiMap.put(":nose:", 128067);
+        invertedEmojiMap.put(":notebook:", 128211);
+        invertedEmojiMap.put(":notebook_with_decorative_cover:", 128212);
+        invertedEmojiMap.put(":notes:", 127926);
+        invertedEmojiMap.put(":nut_and_bolt:", 128297);
+        invertedEmojiMap.put(":o:", 11093);
+        invertedEmojiMap.put(":o2:", 127358);
+        invertedEmojiMap.put(":ocean:", 127754);
+        invertedEmojiMap.put(":octopus:", 128025);
+        invertedEmojiMap.put(":oden:", 127842);
+        invertedEmojiMap.put(":office:", 127970);
+        invertedEmojiMap.put(":ok:", 127383);
+        invertedEmojiMap.put(":ok_hand:", 128076);
+        invertedEmojiMap.put(":ok_woman:", 128582);
+        invertedEmojiMap.put(":older_man:", 128116);
+        invertedEmojiMap.put(":older_woman:", 128117);
+        invertedEmojiMap.put(":on:", 128283);
+        invertedEmojiMap.put(":oncoming_automobile:", 128664);
+        invertedEmojiMap.put(":oncoming_bus:", 128653);
+        invertedEmojiMap.put(":oncoming_police_car:", 128660);
+        invertedEmojiMap.put(":oncoming_taxi:", 128662);
+        invertedEmojiMap.put(":open_book:", 128214);
+        invertedEmojiMap.put(":open_file_folder:", 128194);
+        invertedEmojiMap.put(":open_hands:", 128080);
+        invertedEmojiMap.put(":open_mouth:", 128558);
+        invertedEmojiMap.put(":ophiuchus:", 9934);
+        invertedEmojiMap.put(":orange_book:", 128217);
+        invertedEmojiMap.put(":outbox_tray:", 128228);
+        invertedEmojiMap.put(":ox:", 128002);
+        invertedEmojiMap.put(":package:", 128230);
+        invertedEmojiMap.put(":page_facing_up:", 128196);
+        invertedEmojiMap.put(":page_with_curl:", 128195);
+        invertedEmojiMap.put(":pager:", 128223);
+        invertedEmojiMap.put(":palm_tree:", 127796);
+        invertedEmojiMap.put(":panda_face:", 128060);
+        invertedEmojiMap.put(":paperclip:", 128206);
+        invertedEmojiMap.put(":parking:", 127359);
+        invertedEmojiMap.put(":part_alternation_mark:", 12349);
+        invertedEmojiMap.put(":partly_sunny:", 9925);
+        invertedEmojiMap.put(":passport_control:", 128706);
+        invertedEmojiMap.put(":paw_prints:", 128062);
+        invertedEmojiMap.put(":peach:", 127825);
+        invertedEmojiMap.put(":pear:", 127824);
+        invertedEmojiMap.put(":pencil:", 128221);
+        invertedEmojiMap.put(":pencil2:", 9999);
+        invertedEmojiMap.put(":penguin:", 128039);
+        invertedEmojiMap.put(":pensive:", 128532);
+        invertedEmojiMap.put(":performing_arts:", 127917);
+        invertedEmojiMap.put(":persevere:", 128547);
+        invertedEmojiMap.put(":person_frowning:", 128589);
+        invertedEmojiMap.put(":person_with_blond_hair:", 128113);
+        invertedEmojiMap.put(":person_with_pouting_face:", 128590);
+        invertedEmojiMap.put(":phone:", 9742);
+        invertedEmojiMap.put(":pig:", 128055);
+        invertedEmojiMap.put(":pig2:", 128022);
+        invertedEmojiMap.put(":pig_nose:", 128061);
+        invertedEmojiMap.put(":pill:", 128138);
+        invertedEmojiMap.put(":pineapple:", 127821);
+        invertedEmojiMap.put(":pisces:", 9811);
+        invertedEmojiMap.put(":pizza:", 127829);
+        invertedEmojiMap.put(":point_down:", 128071);
+        invertedEmojiMap.put(":point_left:", 128072);
+        invertedEmojiMap.put(":point_right:", 128073);
+        invertedEmojiMap.put(":point_up:", 9757);
+        invertedEmojiMap.put(":point_up_2:", 128070);
+        invertedEmojiMap.put(":police_car:", 128659);
+        invertedEmojiMap.put(":poodle:", 128041);
+        invertedEmojiMap.put(":poop:", 128169);
+        invertedEmojiMap.put(":post_office:", 127971);
+        invertedEmojiMap.put(":postal_horn:", 128239);
+        invertedEmojiMap.put(":postbox:", 128238);
+        invertedEmojiMap.put(":potable_water:", 128688);
+        invertedEmojiMap.put(":pouch:", 128093);
+        invertedEmojiMap.put(":poultry_leg:", 127831);
+        invertedEmojiMap.put(":pound:", 128183);
+        invertedEmojiMap.put(":pouting_cat:", 128574);
+        invertedEmojiMap.put(":pray:", 128591);
+        invertedEmojiMap.put(":princess:", 128120);
+        invertedEmojiMap.put(":punch:", 128074);
+        invertedEmojiMap.put(":purple_heart:", 128156);
+        invertedEmojiMap.put(":purse:", 128091);
+        invertedEmojiMap.put(":pushpin:", 128204);
+        invertedEmojiMap.put(":put_litter_in_its_place:", 128686);
+        invertedEmojiMap.put(":question:", 10067);
+        invertedEmojiMap.put(":rabbit:", 128048);
+        invertedEmojiMap.put(":rabbit2:", 128007);
+        invertedEmojiMap.put(":racehorse:", 128014);
+        invertedEmojiMap.put(":radio:", 128251);
+        invertedEmojiMap.put(":radio_button:", 128280);
+        invertedEmojiMap.put(":rage:", 128545);
+        invertedEmojiMap.put(":railway_car:", 128643);
+        invertedEmojiMap.put(":rainbow:", 127752);
+        invertedEmojiMap.put(":raised_hand:", 9995);
+        invertedEmojiMap.put(":raised_hands:", 128588);
+        invertedEmojiMap.put(":raising_hand:", 128587);
+        invertedEmojiMap.put(":ram:", 128015);
+        invertedEmojiMap.put(":ramen:", 127836);
+        invertedEmojiMap.put(":rat:", 128000);
+        invertedEmojiMap.put(":recycle:", 9851);
+        invertedEmojiMap.put(":red_car:", 128663);
+        invertedEmojiMap.put(":red_circle:", 128308);
+        invertedEmojiMap.put(":registered:", 174);
+        invertedEmojiMap.put(":relaxed:", 9786);
+        invertedEmojiMap.put(":relieved:", 128524);
+        invertedEmojiMap.put(":repeat:", 128257);
+        invertedEmojiMap.put(":repeat_one:", 128258);
+        invertedEmojiMap.put(":restroom:", 128699);
+        invertedEmojiMap.put(":revolving_hearts:", 128158);
+        invertedEmojiMap.put(":rewind:", 9194);
+        invertedEmojiMap.put(":ribbon:", 127872);
+        invertedEmojiMap.put(":rice:", 127834);
+        invertedEmojiMap.put(":rice_ball:", 127833);
+        invertedEmojiMap.put(":rice_cracker:", 127832);
+        invertedEmojiMap.put(":rice_scene:", 127889);
+        invertedEmojiMap.put(":ring:", 128141);
+        invertedEmojiMap.put(":rocket:", 128640);
+        invertedEmojiMap.put(":roller_coaster:", 127906);
+        invertedEmojiMap.put(":rooster:", 128019);
+        invertedEmojiMap.put(":rose:", 127801);
+        invertedEmojiMap.put(":rotating_light:", 128680);
+        invertedEmojiMap.put(":round_pushpin:", 128205);
+        invertedEmojiMap.put(":rowboat:", 128675);
+        invertedEmojiMap.put(":rugby_football:", 127945);
+        invertedEmojiMap.put(":runner:", 127939);
+        invertedEmojiMap.put(":running:", 127939);
+        invertedEmojiMap.put(":running_shirt_with_sash:", 127933);
+        invertedEmojiMap.put(":sa:", 127490);
+        invertedEmojiMap.put(":sagittarius:", 9808);
+        invertedEmojiMap.put(":sailboat:", 9973);
+        invertedEmojiMap.put(":sake:", 127862);
+        invertedEmojiMap.put(":sandal:", 128097);
+        invertedEmojiMap.put(":santa:", 127877);
+        invertedEmojiMap.put(":satellite:", 128225);
+        invertedEmojiMap.put(":satisfied:", 128518);
+        invertedEmojiMap.put(":saxophone:", 127927);
+        invertedEmojiMap.put(":school:", 127979);
+        invertedEmojiMap.put(":school_satchel:", 127890);
+        invertedEmojiMap.put(":scissors:", 9986);
+        invertedEmojiMap.put(":scorpius:", 9807);
+        invertedEmojiMap.put(":scream:", 128561);
+        invertedEmojiMap.put(":scream_cat:", 128576);
+        invertedEmojiMap.put(":scroll:", 128220);
+        invertedEmojiMap.put(":seat:", 128186);
+        invertedEmojiMap.put(":secret:", 12953);
+        invertedEmojiMap.put(":see_no_evil:", 128584);
+        invertedEmojiMap.put(":seedling:", 127793);
+        invertedEmojiMap.put(":shaved_ice:", 127847);
+        invertedEmojiMap.put(":sheep:", 128017);
+        invertedEmojiMap.put(":shell:", 128026);
+        invertedEmojiMap.put(":ship:", 128674);
+        invertedEmojiMap.put(":shirt:", 128085);
+        invertedEmojiMap.put(":shit:", 128169);
+        invertedEmojiMap.put(":shoe:", 128094);
+        invertedEmojiMap.put(":shower:", 128703);
+        invertedEmojiMap.put(":signal_strength:", 128246);
+        invertedEmojiMap.put(":six_pointed_star:", 128303);
+        invertedEmojiMap.put(":ski:", 127935);
+        invertedEmojiMap.put(":skull:", 128128);
+        invertedEmojiMap.put(":sleeping:", 128564);
+        invertedEmojiMap.put(":sleepy:", 128554);
+        invertedEmojiMap.put(":slot_machine:", 127920);
+        invertedEmojiMap.put(":small_blue_diamond:", 128313);
+        invertedEmojiMap.put(":small_orange_diamond:", 128312);
+        invertedEmojiMap.put(":small_red_triangle:", 128314);
+        invertedEmojiMap.put(":small_red_triangle_down:", 128315);
+        invertedEmojiMap.put(":smile:", 128516);
+        invertedEmojiMap.put(":smile_cat:", 128568);
+        invertedEmojiMap.put(":smiley:", 128515);
+        invertedEmojiMap.put(":smiley_cat:", 128570);
+        invertedEmojiMap.put(":smiling_imp:", 128520);
+        invertedEmojiMap.put(":smirk:", 128527);
+        invertedEmojiMap.put(":smirk_cat:", 128572);
+        invertedEmojiMap.put(":smoking:", 128684);
+        invertedEmojiMap.put(":snail:", 128012);
+        invertedEmojiMap.put(":snake:", 128013);
+        invertedEmojiMap.put(":snowboarder:", 127938);
+        invertedEmojiMap.put(":snowflake:", 10052);
+        invertedEmojiMap.put(":snowman:", 9924);
+        invertedEmojiMap.put(":sob:", 128557);
+        invertedEmojiMap.put(":soccer:", 9917);
+        invertedEmojiMap.put(":soon:", 128284);
+        invertedEmojiMap.put(":sos:", 127384);
+        invertedEmojiMap.put(":sound:", 128265);
+        invertedEmojiMap.put(":space_invader:", 128126);
+        invertedEmojiMap.put(":spades:", 9824);
+        invertedEmojiMap.put(":spaghetti:", 127837);
+        invertedEmojiMap.put(":sparkle:", 10055);
+        invertedEmojiMap.put(":sparkler:", 127879);
+        invertedEmojiMap.put(":sparkles:", 10024);
+        invertedEmojiMap.put(":sparkling_heart:", 128150);
+        invertedEmojiMap.put(":speak_no_evil:", 128586);
+        invertedEmojiMap.put(":speaker:", 128266);
+        invertedEmojiMap.put(":speech_balloon:", 128172);
+        invertedEmojiMap.put(":speedboat:", 128676);
+        invertedEmojiMap.put(":star:", 11088);
+        invertedEmojiMap.put(":star2:", 127775);
+        invertedEmojiMap.put(":stars:", 127747);
+        invertedEmojiMap.put(":station:", 128649);
+        invertedEmojiMap.put(":statue_of_liberty:", 128509);
+        invertedEmojiMap.put(":steam_locomotive:", 128642);
+        invertedEmojiMap.put(":stew:", 127858);
+        invertedEmojiMap.put(":straight_ruler:", 128207);
+        invertedEmojiMap.put(":strawberry:", 127827);
+        invertedEmojiMap.put(":stuck_out_tongue:", 128539);
+        invertedEmojiMap.put(":stuck_out_tongue_closed_eyes:", 128541);
+        invertedEmojiMap.put(":stuck_out_tongue_winking_eye:", 128540);
+        invertedEmojiMap.put(":sun_with_face:", 127774);
+        invertedEmojiMap.put(":sunflower:", 127803);
+        invertedEmojiMap.put(":sunglasses:", 128526);
+        invertedEmojiMap.put(":sunny:", 9728);
+        invertedEmojiMap.put(":sunrise:", 127749);
+        invertedEmojiMap.put(":sunrise_over_mountains:", 127748);
+        invertedEmojiMap.put(":surfer:", 127940);
+        invertedEmojiMap.put(":sushi:", 127843);
+        invertedEmojiMap.put(":suspension_railway:", 128671);
+        invertedEmojiMap.put(":sweat:", 128531);
+        invertedEmojiMap.put(":sweat_drops:", 128166);
+        invertedEmojiMap.put(":sweat_smile:", 128517);
+        invertedEmojiMap.put(":sweet_potato:", 127840);
+        invertedEmojiMap.put(":swimmer:", 127946);
+        invertedEmojiMap.put(":symbols:", 128291);
+        invertedEmojiMap.put(":syringe:", 128137);
+        invertedEmojiMap.put(":tada:", 127881);
+        invertedEmojiMap.put(":tanabata_tree:", 127883);
+        invertedEmojiMap.put(":tangerine:", 127818);
+        invertedEmojiMap.put(":taurus:", 9801);
+        invertedEmojiMap.put(":taxi:", 128661);
+        invertedEmojiMap.put(":tea:", 127861);
+        invertedEmojiMap.put(":telephone:", 9742);
+        invertedEmojiMap.put(":telephone_receiver:", 128222);
+        invertedEmojiMap.put(":telescope:", 128301);
+        invertedEmojiMap.put(":tennis:", 127934);
+        invertedEmojiMap.put(":tent:", 9978);
+        invertedEmojiMap.put(":thought_balloon:", 128173);
+        invertedEmojiMap.put(":thumbsdown:", 128078);
+        invertedEmojiMap.put(":thumbsup:", 128077);
+        invertedEmojiMap.put(":ticket:", 127915);
+        invertedEmojiMap.put(":tiger:", 128047);
+        invertedEmojiMap.put(":tiger2:", 128005);
+        invertedEmojiMap.put(":tired_face:", 128555);
+        invertedEmojiMap.put(":tm:", 8482);
+        invertedEmojiMap.put(":toilet:", 128701);
+        invertedEmojiMap.put(":tokyo_tower:", 128508);
+        invertedEmojiMap.put(":tomato:", 127813);
+        invertedEmojiMap.put(":tongue:", 128069);
+        invertedEmojiMap.put(":top:", 128285);
+        invertedEmojiMap.put(":tophat:", 127913);
+        invertedEmojiMap.put(":tractor:", 128668);
+        invertedEmojiMap.put(":traffic_light:", 128677);
+        invertedEmojiMap.put(":train:", 128643);
+        invertedEmojiMap.put(":train2:", 128646);
+        invertedEmojiMap.put(":tram:", 128650);
+        invertedEmojiMap.put(":triangular_flag_on_post:", 128681);
+        invertedEmojiMap.put(":triangular_ruler:", 128208);
+        invertedEmojiMap.put(":trident:", 128305);
+        invertedEmojiMap.put(":triumph:", 128548);
+        invertedEmojiMap.put(":trolleybus:", 128654);
+        invertedEmojiMap.put(":trophy:", 127942);
+        invertedEmojiMap.put(":tropical_drink:", 127865);
+        invertedEmojiMap.put(":tropical_fish:", 128032);
+        invertedEmojiMap.put(":truck:", 128666);
+        invertedEmojiMap.put(":trumpet:", 127930);
+        invertedEmojiMap.put(":tshirt:", 128085);
+        invertedEmojiMap.put(":tulip:", 127799);
+        invertedEmojiMap.put(":turtle:", 128034);
+        invertedEmojiMap.put(":tv:", 128250);
+        invertedEmojiMap.put(":twisted_rightwards_arrows:", 128256);
+        invertedEmojiMap.put(":two_hearts:", 128149);
+        invertedEmojiMap.put(":two_men_holding_hands:", 128108);
+        invertedEmojiMap.put(":two_women_holding_hands:", 128109);
+        invertedEmojiMap.put(":u5272:", 127545);
+        invertedEmojiMap.put(":u5408:", 127540);
+        invertedEmojiMap.put(":u55b6:", 127546);
+        invertedEmojiMap.put(":u6307:", 127535);
+        invertedEmojiMap.put(":u6708:", 127543);
+        invertedEmojiMap.put(":u6709:", 127542);
+        invertedEmojiMap.put(":u6e80:", 127541);
+        invertedEmojiMap.put(":u7121:", 127514);
+        invertedEmojiMap.put(":u7533:", 127544);
+        invertedEmojiMap.put(":u7981:", 127538);
+        invertedEmojiMap.put(":u7a7a:", 127539);
+        invertedEmojiMap.put(":umbrella:", 9748);
+        invertedEmojiMap.put(":unamused:", 128530);
+        invertedEmojiMap.put(":underage:", 128286);
+        invertedEmojiMap.put(":unlock:", 128275);
+        invertedEmojiMap.put(":up:", 127385);
+        invertedEmojiMap.put(":v:", 9996);
+        invertedEmojiMap.put(":vertical_traffic_light:", 128678);
+        invertedEmojiMap.put(":vhs:", 128252);
+        invertedEmojiMap.put(":vibration_mode:", 128243);
+        invertedEmojiMap.put(":video_camera:", 128249);
+        invertedEmojiMap.put(":video_game:", 127918);
+        invertedEmojiMap.put(":violin:", 127931);
+        invertedEmojiMap.put(":virgo:", 9805);
+        invertedEmojiMap.put(":volcano:", 127755);
+        invertedEmojiMap.put(":vs:", 127386);
+        invertedEmojiMap.put(":walking:", 128694);
+        invertedEmojiMap.put(":waning_crescent_moon:", 127768);
+        invertedEmojiMap.put(":waning_gibbous_moon:", 127766);
+        invertedEmojiMap.put(":warning:", 9888);
+        invertedEmojiMap.put(":watch:", 8986);
+        invertedEmojiMap.put(":water_buffalo:", 128003);
+        invertedEmojiMap.put(":watermelon:", 127817);
+        invertedEmojiMap.put(":wave:", 128075);
+        invertedEmojiMap.put(":wavy_dash:", 12336);
+        invertedEmojiMap.put(":waxing_crescent_moon:", 127762);
+        invertedEmojiMap.put(":waxing_gibbous_moon:", 127764);
+        invertedEmojiMap.put(":wc:", 128702);
+        invertedEmojiMap.put(":weary:", 128553);
+        invertedEmojiMap.put(":wedding:", 128146);
+        invertedEmojiMap.put(":whale:", 128051);
+        invertedEmojiMap.put(":whale2:", 128011);
+        invertedEmojiMap.put(":wheelchair:", 9855);
+        invertedEmojiMap.put(":white_check_mark:", 9989);
+        invertedEmojiMap.put(":white_circle:", 9898);
+        invertedEmojiMap.put(":white_flower:", 128174);
+        invertedEmojiMap.put(":white_large_square:", 11036);
+        invertedEmojiMap.put(":white_medium_small_square:", 9725);
+        invertedEmojiMap.put(":white_medium_square:", 9723);
+        invertedEmojiMap.put(":white_small_square:", 9643);
+        invertedEmojiMap.put(":white_square_button:", 128307);
+        invertedEmojiMap.put(":wind_chime:", 127888);
+        invertedEmojiMap.put(":wine_glass:", 127863);
+        invertedEmojiMap.put(":wink:", 128521);
+        invertedEmojiMap.put(":wolf:", 128058);
+        invertedEmojiMap.put(":woman:", 128105);
+        invertedEmojiMap.put(":womans_clothes:", 128090);
+        invertedEmojiMap.put(":womans_hat:", 128082);
+        invertedEmojiMap.put(":womens:", 128698);
+        invertedEmojiMap.put(":worried:", 128543);
+        invertedEmojiMap.put(":wrench:", 128295);
+        invertedEmojiMap.put(":x:", 10060);
+        invertedEmojiMap.put(":yellow_heart:", 128155);
+        invertedEmojiMap.put(":yen:", 128180);
+        invertedEmojiMap.put(":yum:", 128523);
+        invertedEmojiMap.put(":zap:", 9889);
+        invertedEmojiMap.put(":zzz:", 128164);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiParser.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiParser.kt
new file mode 100644
index 000000000..2d1ac695c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiParser.kt
@@ -0,0 +1,50 @@
+package com.habitrpg.android.habitica.ui.helpers
+
+import java.util.regex.Pattern
+
+object EmojiParser {
+    /**
+     * Converts Cheat Sheet emoji-codes into unicode characters
+     *
+     * @param text String containing Cheat Sheet codes
+     * @return Formatted String containing unicode characters
+     */
+    fun parseEmojis(text: String?): String? {
+        if (text == null) {
+            return text
+        }
+        var returnString: String = text
+        val pattern = Pattern.compile("(:[^:]+:)")
+        val matcher = pattern.matcher(text)
+        while (matcher.find()) {
+            val found = matcher.group()
+            if (EmojiMap.invertedEmojiMap[found] == null) continue
+            val hexInt = EmojiMap.invertedEmojiMap[found]!!
+            val replacement = String(Character.toChars(hexInt))
+            returnString = returnString.replace(found, replacement)
+        }
+        return returnString
+    }
+
+    /**
+     * Converts unicode characters into Cheat Sheet codes
+     *
+     * @param text String containing unicode formatted emojis
+     * @return String containing the Cheat Sheet codes of the emojis
+     */
+    fun convertToCheatCode(text: String?): String? {
+        if (text == null) {
+            return text
+        }
+        var returnString: String = text
+        val charArray = text.toCharArray()
+        for (i in 0..charArray.size - 2) {
+            val testString = String(charArray.copyOfRange(i, i + 2))
+            val test = testString.codePointAt(0)
+            if (EmojiMap.emojiMap.containsKey(test)) {
+                returnString = returnString.replace(testString, EmojiMap.emojiMap[test]!!)
+            }
+        }
+        return returnString
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperAdapter.java
deleted file mode 100644
index 912917dc0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperAdapter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * Interface to notify a {@link RecyclerView.Adapter} of moving and dismissal event from a {@link
- * androidx.recyclerview.widget.ItemTouchHelper.Callback}.
- *
- * @author Paul Burke (ipaulpro)
- */
-public interface ItemTouchHelperAdapter {
-
-    /**
-     * Called when an item has been dragged far enough to trigger a move. This is called every time
-     * an item is shifted, and not at the end of a "drop" event.
-     *
-     * @param fromPosition The start position of the moved item.
-     * @param toPosition   Then end position of the moved item.
-     * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
-     * @see RecyclerView.ViewHolder#getAdapterPosition()
-     */
-    void onItemMove(int fromPosition, int toPosition);
-
-
-    /**
-     * Called when an item has been dismissed by a swipe.
-     *
-     * @param position The position of the item dismissed.
-     * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
-     * @see RecyclerView.ViewHolder#getAdapterPosition()
-     */
-    void onItemDismiss(int position);
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperDropCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperDropCallback.java
deleted file mode 100644
index 3bc3d03ce..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperDropCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-/**
- * Created by ell on 3/30/16.
- */
-public interface ItemTouchHelperDropCallback {
-    void onDrop(int from, int to);
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperViewHolder.java
deleted file mode 100644
index 3040108a8..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperViewHolder.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-import androidx.recyclerview.widget.ItemTouchHelper;
-
-/**
- * Interface to notify an item ViewHolder of relevant callbacks from {@link
- * androidx.recyclerview.widget.ItemTouchHelper.Callback}.
- *
- * @author Paul Burke (ipaulpro)
- */
-public interface ItemTouchHelperViewHolder {
-
-    /**
-     * Called when the {@link ItemTouchHelper} first registers an item as being moved or swiped.
-     * Implementations should update the item view to indicate it's active state.
-     */
-    void onItemSelected();
-
-
-    /**
-     * Called when the {@link ItemTouchHelper} has completed the move or swipe, and the active item
-     * state should be cleared.
-     */
-    void onItemClear();
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/Kotterknife.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/Kotterknife.kt
deleted file mode 100644
index e7d6a14e2..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/Kotterknife.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers
-
-import android.app.Activity
-import android.app.Dialog
-import android.content.Context
-import androidx.annotation.ColorRes
-import androidx.annotation.IdRes
-import androidx.fragment.app.Fragment
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import android.view.View
-import java.util.*
-import kotlin.properties.ReadOnlyProperty
-import kotlin.reflect.KProperty
-
-fun <V : View> View.bindView(@IdRes id: Int)
-        : ReadOnlyProperty<View, V> = required(id, viewFinder)
-
-fun <V : View> Activity.bindView(@IdRes id: Int)
-        : ReadOnlyProperty<Activity, V> = required(id, viewFinder)
-
-fun <V : View> Dialog.bindView(@IdRes id: Int)
-        : ReadOnlyProperty<Dialog, V> = required(id, viewFinder)
-
-fun <V : View> Fragment.bindView(@IdRes id: Int)
-        : ReadOnlyProperty<Fragment, V> = required(id, viewFinder)
-
-fun <V : View> ViewHolder.bindView(@IdRes id: Int)
-        : ReadOnlyProperty<ViewHolder, V> = required(id, viewFinder)
-
-fun <V : View> View.bindOptionalView(@IdRes id: Int)
-        : ReadOnlyProperty<View, V?> = optional(id, viewFinder)
-
-fun <V : View> Activity.bindOptionalView(@IdRes id: Int)
-        : ReadOnlyProperty<Activity, V?> = optional(id, viewFinder)
-
-fun <V : View> Dialog.bindOptionalView(@IdRes id: Int)
-        : ReadOnlyProperty<Dialog, V?> = optional(id, viewFinder)
-
-fun <V : View> Fragment.bindOptionalView(@IdRes id: Int)
-        : ReadOnlyProperty<Fragment, V?> = optional(id, viewFinder)
-
-fun <V : View> ViewHolder.bindOptionalView(@IdRes id: Int)
-        : ReadOnlyProperty<ViewHolder, V?> = optional(id, viewFinder)
-
-
-fun <V : View> bindView(container: View, @IdRes res: Int) : Lazy<V> {
-    @Suppress("UNCHECKED_CAST")
-    return lazy(LazyThreadSafetyMode.NONE) { container.findViewById<V>(res) }
-}
-
-fun <V : View> bindOptionalView(container: View?, @IdRes res: Int) : Lazy<V?> {
-    @Suppress("UNCHECKED_CAST")
-    return lazy(LazyThreadSafetyMode.NONE) { container?.findViewById<V>(res) }
-}
-
-fun bindColor(context: Context, @ColorRes res: Int) : Lazy<Int> {
-    @Suppress("UNCHECKED_CAST")
-    return lazy(LazyThreadSafetyMode.NONE) { ContextCompat.getColor(context, res) }
-}
-
-fun Fragment.resetViews() {
-    LazyRegistry.reset(this)
-}
-
-
-private val View.viewFinder: View.(Int) -> View?
-    get() = { findViewById(it) }
-private val Activity.viewFinder: Activity.(Int) -> View?
-    get() = { findViewById(it) }
-private val Dialog.viewFinder: Dialog.(Int) -> View?
-    get() = { findViewById(it) }
-private val Fragment.viewFinder: Fragment.(Int) -> View?
-    get() = { view?.findViewById(it) }
-private val ViewHolder.viewFinder: ViewHolder.(Int) -> View?
-    get() = { itemView.findViewById(it) }
-
-private fun viewNotFound(id: Int, desc: KProperty<*>): Nothing =
-        throw IllegalStateException("View ID $id for '${desc.name}' not found.")
-
-@Suppress("UNCHECKED_CAST")
-private fun <T, V : View> required(id: Int, finder: T.(Int) -> View?)
-        = TargetedLazy { t: T, desc -> t.finder(id) as V? ?: viewNotFound(id, desc) }
-
-@Suppress("UNCHECKED_CAST")
-private fun <T, V : View> optional(id: Int, finder: T.(Int) -> View?)
-        = TargetedLazy { t: T, _ -> t.finder(id) as V? }
-
-@Suppress("UNCHECKED_CAST")
-private fun <T, V : View> required(ids: IntArray, finder: T.(Int) -> View?)
-        = TargetedLazy { t: T, desc -> ids.map { t.finder(it) as V? ?: viewNotFound(it, desc) } }
-
-@Suppress("UNCHECKED_CAST")
-private fun <T, V : View> optional(ids: IntArray, finder: T.(Int) -> View?)
-        = TargetedLazy { t: T, _ -> ids.map { t.finder(it) as V? }.filterNotNull() }
-
-// Like Kotlin's lazy delegate but the initializer gets the target and metadata passed to it
-private class TargetedLazy<T, V>(private val initializer: (T, KProperty<*>) -> V) : ReadOnlyProperty<T, V> {
-    private object EMPTY
-
-    private var value: Any? = EMPTY
-
-    override fun getValue(thisRef: T, property: KProperty<*>): V {
-        LazyRegistry.register(thisRef!!, this)
-        if (value == EMPTY) {
-            value = initializer(thisRef, property)
-        }
-        @Suppress("UNCHECKED_CAST")
-        return value as V
-    }
-
-    fun reset() {
-        value = EMPTY
-    }
-}
-
-private object LazyRegistry {
-    private val lazyMap = WeakHashMap<Any, MutableCollection<TargetedLazy<*, *>>>()
-
-    fun register(target: Any, lazy: TargetedLazy<*, *>) {
-        lazyMap.getOrPut(target) { Collections.newSetFromMap(WeakHashMap()) }.add(lazy)
-    }
-
-    fun reset(target: Any) {
-        lazyMap[target]?.forEach { it.reset() }
-    }
-}
\ No newline at end of file
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/MarkdownParser.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
index e98f3ed20..157e668fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
@@ -12,11 +12,10 @@ import io.noties.markwon.image.ImagesPlugin
 import io.noties.markwon.image.file.FileSchemeHandler
 import io.noties.markwon.image.network.OkHttpNetworkSchemeHandler
 import io.noties.markwon.movement.MovementMethodPlugin
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
-import net.pherth.android.emoji_library.EmojiParser
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
 
 
 object MarkdownParser {
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/helpers/SimpleItemTouchHelperCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SimpleItemTouchHelperCallback.java
deleted file mode 100644
index 825855fa5..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SimpleItemTouchHelperCallback.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
-
-/**
- * An implementation of {@link ItemTouchHelper.Callback} that enables basic drag & drop and
- * swipe-to-dismiss. Drag events are automatically started by an item long-press.<br/>
- * </br/>
- * Expects the <code>RecyclerView.Adapter</code> to react to {@link
- * ItemTouchHelperAdapter} callbacks and the <code>RecyclerView.ViewHolder</code> to implement
- * {@link ItemTouchHelperViewHolder}.
- *
- * @author Paul Burke (ipaulpro)
- */
-public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
-
-    private final ItemTouchHelperAdapter mAdapter;
-
-    public SimpleItemTouchHelperCallback(ItemTouchHelperAdapter adapter) {
-        mAdapter = adapter;
-    }
-
-    @Override
-    public boolean isLongPressDragEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isItemViewSwipeEnabled() {
-        return false;
-    }
-
-    @Override
-    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-        final int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
-        final int swipeFlags = ItemTouchHelper.START | ItemTouchHelper.END;
-        return makeMovementFlags(dragFlags, swipeFlags);
-    }
-
-    @Override
-    public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder source, RecyclerView.ViewHolder target) {
-        mAdapter.onItemMove(source.getAdapterPosition(), target.getAdapterPosition());
-        return true;
-    }
-
-    @Override
-    public void onSwiped(RecyclerView.ViewHolder viewHolder, int i) {
-        mAdapter.onItemDismiss(viewHolder.getAdapterPosition());
-    }
-
-    @Override
-    public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
-        if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
-            ItemTouchHelperViewHolder itemViewHolder = (ItemTouchHelperViewHolder) viewHolder;
-            itemViewHolder.onItemSelected();
-        }
-
-        super.onSelectedChanged(viewHolder, actionState);
-    }
-
-    @Override
-    public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-        super.clearView(recyclerView, viewHolder);
-
-        ItemTouchHelperViewHolder itemViewHolder = (ItemTouchHelperViewHolder) viewHolder;
-        itemViewHolder.onItemClear();
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
index 5c70ffdb7..106948dee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
@@ -16,14 +16,14 @@ limitations under the License.
 package com.habitrpg.android.habitica.ui.helpers
 
 import android.app.Activity
+import android.graphics.Color
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Build
 import android.view.View
-import android.view.ViewGroup
-import android.view.ViewTreeObserver
 import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.widget.ImageButton
+import android.widget.TextView
 import androidx.appcompat.view.menu.ActionMenuItemView
 import androidx.appcompat.widget.ActionMenuView
 import androidx.appcompat.widget.Toolbar
@@ -40,20 +40,22 @@ import java.util.*
 object ToolbarColorHelper {
     /**
      * Use this method to colorize toolbar icons to the desired target color
-     * @param toolbarView toolbar view being colored
-     * @param toolbarIconsColor the target color of toolbar icons
+     * @param toolbar toolbar view being colored
      * @param activity reference to activity needed to register observers
      */
     fun colorizeToolbar(toolbar: Toolbar, activity: Activity?, overrideModernHeader: Boolean? = null) {
         if (activity == null) return
         val modernHeaderStyle = overrideModernHeader ?: PreferenceManager.getDefaultSharedPreferences(activity).getBoolean("modern_header_style", true)
-        val toolbarIconsColor = if (modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        val toolbarIconsColor = if (modernHeaderStyle) {
             toolbar.setBackgroundColor(activity.getThemeColor(R.attr.headerBackgroundColor))
             activity.getThemeColor(R.attr.headerTextColor)
         } else {
             toolbar.setBackgroundColor(activity.getThemeColor(R.attr.colorPrimary))
             activity.getThemeColor(R.attr.toolbarContentColor)
         }
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            activity.window.statusBarColor = activity.getThemeColor(R.attr.colorPrimaryDark)
+        }
         val colorFilter = PorterDuffColorFilter(toolbarIconsColor, PorterDuff.Mode.MULTIPLY)
         for (i in 0 until toolbar.childCount) {
             val v = toolbar.getChildAt(i)
@@ -62,8 +64,7 @@ object ToolbarColorHelper {
             if (v is ImageButton) {
                 //Action Bar back button
                 v.drawable.colorFilter = colorFilter
-            }
-            if (v is ActionMenuView) {
+            } else if (v is ActionMenuView) {
                 for (j in 0 until v.childCount) {
 
                     //Step 2: Changing the color of any ActionMenuViews - icons that are not back button, nor text, nor overflow menu icon.
@@ -72,15 +73,16 @@ object ToolbarColorHelper {
                     if (innerView is ActionMenuItemView) {
                         innerView.setTextColor(toolbarIconsColor)
                         for (k in innerView.compoundDrawables.indices) {
-                            if (innerView.compoundDrawables[k] != null) {
-
-                                //Important to set the color filter in seperate thread, by adding it to the message queue
-                                //Won't work otherwise.
-                                innerView.post { innerView.compoundDrawables[k].colorFilter = colorFilter }
+                            innerView.post {
+                                if (innerView.compoundDrawables[k] != null) {
+                                    innerView.compoundDrawables[k].colorFilter = colorFilter
+                                }
                             }
                         }
                     }
                 }
+            } else if (v is TextView) {
+                v.setTextColor(toolbarIconsColor)
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
index 7c6b0f99b..2f9fdeb88 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
@@ -2,9 +2,7 @@ package com.habitrpg.android.habitica.ui.menu
 
 import android.content.Context
 import android.view.View
-import android.widget.LinearLayout
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.MenuBottomSheetBinding
 
 class BottomSheetMenu(context: Context) : BottomSheetDialog(context), View.OnClickListener {
@@ -20,12 +18,6 @@ class BottomSheetMenu(context: Context) : BottomSheetDialog(context), View.OnCli
         this.runnable = runnable
     }
 
-    fun addMenuItems(vararg menuItems: BottomSheetMenuItem) {
-        for (menuItem in menuItems) {
-            this.addMenuItem(menuItem)
-        }
-    }
-
     override fun setTitle(title: CharSequence?) {
         binding.titleView.text = title
         binding.titleView.visibility = View.VISIBLE
@@ -37,10 +29,6 @@ class BottomSheetMenu(context: Context) : BottomSheetDialog(context), View.OnCli
         this.binding.menuItems.addView(item)
     }
 
-    fun removeMenuItem(index: Int) {
-        this.binding.menuItems.removeViewAt(index)
-    }
-
     override fun onClick(v: View) {
         if (this.runnable != null) {
             val index = this.binding.menuItems.indexOfChild(v)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
index 03e98f73f..af3003de4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
@@ -5,45 +5,52 @@ import android.content.Context
 import android.content.res.Resources
 import android.graphics.drawable.BitmapDrawable
 import android.text.method.LinkMovementMethod
+import android.util.Log
 import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.LinearLayout
-import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ChatItemBinding
+import com.habitrpg.android.habitica.databinding.TavernChatIntroItemBinding
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.getAgoString
 import com.habitrpg.android.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-import io.reactivex.Maybe
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 
-class ChatRecyclerViewHolder(itemView: View, private var userId: String, private val isTavern: Boolean) : RecyclerView.ViewHolder(itemView) {
+open class ChatRecyclerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
-    private val messageWrapper: ViewGroup by bindView(R.id.message_wrapper)
-    private val avatarView: AvatarView by bindView(R.id.avatar_view)
-    private val userLabel: UsernameLabel by bindView(R.id.user_label)
-    private val messageText: HabiticaEmojiTextView by bindView(R.id.message_text)
-    private val sublineTextView: TextView by bindView(R.id.subline_textview)
-    private val likeBackground: LinearLayout by bindView(R.id.like_background_layout)
-    private val tvLikes: TextView by bindView(R.id.tvLikes)
-    private val buttonsWrapper: ViewGroup by bindView(R.id.buttons_wrapper)
-    private val replyButton: Button by bindView(R.id.reply_button)
-    private val copyButton: Button by bindView(R.id.copy_button)
-    private val reportButton: Button by bindView(R.id.report_button)
-    private val deleteButton: Button by bindView(R.id.delete_button)
-    private val modView: TextView by bindView(R.id.mod_view)
+class ChatRecyclerIntroViewHolder(itemView: View, replyToUUID: String) : ChatRecyclerViewHolder(itemView) {
+    private val binding = TavernChatIntroItemBinding.bind(itemView)
+
+    var onOpenProfile: ((String) -> Unit)? = null
+
+    init {
+        binding.avatarView.setOnClickListener { onOpenProfile?.invoke(replyToUUID) }
+        binding.displayNameTextview.setOnClickListener { onOpenProfile?.invoke(replyToUUID) }
+        binding.sublineTextview.setOnClickListener { onOpenProfile?.invoke(replyToUUID) }
+    }
+
+    fun bind(member: Member) {
+        binding.avatarView.setAvatar(member)
+        binding.displayNameTextview.username = member.displayName
+        binding.displayNameTextview.tier = member.contributor?.level ?: 0
+        binding.sublineTextview.text = member.formattedUsername
+    }
+}
+
+
+class ChatRecyclerMessageViewHolder(itemView: View, private var userId: String, private val isTavern: Boolean) : ChatRecyclerViewHolder(itemView) {
+    val binding = ChatItemBinding.bind(itemView)
 
     val context: Context = itemView.context
     val res: Resources = itemView.resources
@@ -62,28 +69,42 @@ class ChatRecyclerViewHolder(itemView: View, private var userId: String, private
         itemView.setOnClickListener {
             onShouldExpand?.invoke()
         }
-        tvLikes.setOnClickListener { chatMessage?.let { onLikeMessage?.invoke(it) } }
-        messageText.setOnClickListener { onShouldExpand?.invoke() }
-        messageText.movementMethod = LinkMovementMethod.getInstance()
-        userLabel.setOnClickListener { chatMessage?.uuid?.let { onOpenProfile?.invoke(it) } }
-        avatarView.setOnClickListener { chatMessage?.uuid?.let { onOpenProfile?.invoke(it) } }
-        replyButton.setOnClickListener {
+        binding.tvLikes.setOnClickListener { chatMessage?.let {
+            if(it.uuid != userId) {
+                onLikeMessage?.invoke(it)
+            }
+            else {
+                val context = context
+                if (context != null) {
+                    val alert = HabiticaAlertDialog(context)
+                    alert.setMessage("Can't like your own message. Don't be that person.")
+                    alert.addButton(R.string.ok, true)
+                    alert.show()
+                }
+            }
+            }
+        }
+        binding.messageText.setOnClickListener { onShouldExpand?.invoke() }
+        binding.messageText.movementMethod = LinkMovementMethod.getInstance()
+        binding.userLabel.setOnClickListener { chatMessage?.uuid?.let { onOpenProfile?.invoke(it) } }
+        binding.avatarView.setOnClickListener { chatMessage?.uuid?.let { onOpenProfile?.invoke(it) } }
+        binding.replyButton.setOnClickListener {
             if (chatMessage?.username != null) {
                 chatMessage?.username?.let { onReply?.invoke(it) }
             } else {
                 chatMessage?.user?.let { onReply?.invoke(it) }
             }
         }
-        replyButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReplyIcon()),
+        binding.replyButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReplyIcon()),
                 null, null, null)
-        copyButton.setOnClickListener { chatMessage?.let { onCopyMessage?.invoke(it) } }
-        copyButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatCopyIcon()),
+        binding.copyButton.setOnClickListener { chatMessage?.let { onCopyMessage?.invoke(it) } }
+        binding.copyButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatCopyIcon()),
                 null, null, null)
-        reportButton.setOnClickListener { chatMessage?.let { onFlagMessage?.invoke(it) } }
-        reportButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReportIcon()),
+        binding.reportButton.setOnClickListener { chatMessage?.let { onFlagMessage?.invoke(it) } }
+        binding.reportButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReportIcon()),
                 null, null, null)
-        deleteButton.setOnClickListener { chatMessage?.let { onDeleteMessage?.invoke(it) } }
-        deleteButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatDeleteIcon()),
+        binding.deleteButton.setOnClickListener { chatMessage?.let { onDeleteMessage?.invoke(it) } }
+        binding.deleteButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatDeleteIcon()),
                 null, null, null)
     }
 
@@ -98,86 +119,86 @@ class ChatRecyclerViewHolder(itemView: View, private var userId: String, private
 
         val name = user?.profile?.name
         if (wasSent) {
-            userLabel.isNPC = user?.backer?.npc != null
-            userLabel.tier = user?.contributor?.level ?: 0
-            userLabel.username = name
+            binding.userLabel.isNPC = user?.backer?.npc != null
+            binding.userLabel.tier = user?.contributor?.level ?: 0
+            binding.userLabel.username = name
             if (user?.username != null) {
                 @SuppressLint("SetTextI18n")
-                sublineTextView.text = "${user.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
+                binding.sublineTextview.text = "${user.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
             } else {
-                sublineTextView.text = msg.timestamp?.getAgoString(res)
+                binding.sublineTextview.text = msg.timestamp?.getAgoString(res)
             }
         } else {
-            userLabel.isNPC = msg.backer?.npc != null
-            userLabel.tier = msg.contributor?.level ?: 0
-            userLabel.username = msg.user
+            binding.userLabel.isNPC = msg.backer?.npc != null
+            binding.userLabel.tier = msg.contributor?.level ?: 0
+            binding.userLabel.username = msg.user
             if (msg.username != null) {
                 @SuppressLint("SetTextI18n")
-                sublineTextView.text = "${msg.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
+                binding.sublineTextview.text = "${msg.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
             } else {
-                sublineTextView.text = msg.timestamp?.getAgoString(res)
+                binding.sublineTextview.text = msg.timestamp?.getAgoString(res)
             }
         }
-        when {
-            userLabel.tier == 8 -> {
-                modView.visibility = View.VISIBLE
-                modView.text = context.getString(R.string.moderator)
-                modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_blue)
-                modView.setScaledPadding(context, 12, 4, 12, 4)
+        when (binding.userLabel.tier) {
+            8 -> {
+                binding.modView.visibility = View.VISIBLE
+                binding.modView.text = context.getString(R.string.moderator)
+                binding.modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_blue)
+                binding.modView.setScaledPadding(context, 12, 4, 12, 4)
             }
-            userLabel.tier == 9 -> {
-                modView.visibility = View.VISIBLE
-                modView.text = context.getString(R.string.staff)
-                modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_purple_300)
-                modView.setScaledPadding(context, 12, 4, 12, 4)
+            9 -> {
+                binding.modView.visibility = View.VISIBLE
+                binding.modView.text = context.getString(R.string.staff)
+                binding.modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_purple_300)
+                binding.modView.setScaledPadding(context, 12, 4, 12, 4)
             }
-            else -> modView.visibility = View.GONE
+            else -> binding.modView.visibility = View.GONE
         }
 
         if (wasSent) {
-            avatarView.visibility = View.GONE
+            binding.avatarView.visibility = View.GONE
             itemView.setPadding(64.dpToPx(context), itemView.paddingTop, itemView.paddingRight, itemView.paddingBottom)
         } else {
             val displayMetrics = res.displayMetrics
             val dpWidth = displayMetrics.widthPixels / displayMetrics.density
             if (dpWidth > 350) {
-                avatarView.visibility = View.VISIBLE
+                binding.avatarView.visibility = View.VISIBLE
                 msg.userStyles?.let {
-                    avatarView.setAvatar(it)
+                    binding.avatarView.setAvatar(it)
                 }
             } else {
-                avatarView.visibility = View.GONE
+                binding.avatarView.visibility = View.GONE
             }
             itemView.setPadding(16.dpToPx(context), itemView.paddingTop, itemView.paddingRight, itemView.paddingBottom)
         }
 
-        messageText.text = chatMessage?.parsedText
+        binding.messageText.text = chatMessage?.parsedText
         if (msg.parsedText == null) {
-            messageText.text = chatMessage?.text
+            binding.messageText.text = chatMessage?.text
             Maybe.just(chatMessage?.text ?: "")
                     .map { MarkdownParser.parseMarkdown(it) }
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe({ parsedText ->
                         chatMessage?.parsedText = parsedText
-                        messageText.text = chatMessage?.parsedText
+                        binding.messageText.text = chatMessage?.parsedText
                     }, { it.printStackTrace() })
         }
 
         val username = user?.formattedUsername
-        messageWrapper.background = if ((name != null && msg.text?.contains("@$name") == true) || (username != null && msg.text?.contains(username) == true)) {
+        binding.messageWrapper.background = if ((name != null && msg.text?.contains("@$name") == true) || (username != null && msg.text?.contains(username) == true)) {
             ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_700)
         } else {
-            ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg)
+            ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
         }
-        messageWrapper.setScaledPadding(context, 8, 8, 8, 8)
+        binding.messageWrapper.setScaledPadding(context, 8, 8, 8, 8)
 
         if (isExpanded) {
-            buttonsWrapper.visibility = View.VISIBLE
-            deleteButton.visibility = if (shouldShowDelete()) View.VISIBLE else View.GONE
-            replyButton.visibility = if (chatMessage?.isInboxMessage == true) View.GONE else View.VISIBLE
+            binding.buttonsWrapper.visibility = View.VISIBLE
+            binding.deleteButton.visibility = if (shouldShowDelete()) View.VISIBLE else View.GONE
+            binding.replyButton.visibility = if (chatMessage?.isInboxMessage == true) View.GONE else View.VISIBLE
         } else {
-            buttonsWrapper.visibility = View.GONE
+            binding.buttonsWrapper.visibility = View.GONE
         }
     }
 
@@ -186,9 +207,9 @@ class ChatRecyclerViewHolder(itemView: View, private var userId: String, private
     }
 
     private fun setLikeProperties() {
-        likeBackground.visibility = if (isTavern) View.VISIBLE else View.INVISIBLE
+        binding.likeBackgroundLayout.visibility = if (isTavern) View.VISIBLE else View.INVISIBLE
         @SuppressLint("SetTextI18n")
-        tvLikes.text = "+" + chatMessage?.likeCount
+        binding.tvLikes.text = "+" + chatMessage?.likeCount
 
         val backgroundColorRes: Int
         val foregroundColorRes: Int
@@ -206,8 +227,8 @@ class ChatRecyclerViewHolder(itemView: View, private var userId: String, private
             foregroundColorRes = R.color.tavern_nolikes_foreground
         }
 
-        DataBindingUtils.setRoundedBackground(likeBackground, ContextCompat.getColor(context, backgroundColorRes))
-        tvLikes.setTextColor(ContextCompat.getColor(context, foregroundColorRes))
+        DataBindingUtils.setRoundedBackground(binding.likeBackgroundLayout, ContextCompat.getColor(context, backgroundColorRes))
+        binding.tvLikes.setTextColor(ContextCompat.getColor(context, foregroundColorRes))
     }
 
     private fun shouldShowDelete(): Boolean {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GiftOneGetOnePromoMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GiftOneGetOnePromoMenuView.kt
deleted file mode 100644
index a42f3a142..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GiftOneGetOnePromoMenuView.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.habitrpg.android.habitica.ui.viewHolders
-
-import android.content.Context
-import android.content.Intent
-import android.util.AttributeSet
-import android.widget.RelativeLayout
-import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.ui.activities.GiftOneGetOneInfoActivity
-import kotlinx.android.synthetic.main.promo_subscription_buy_gems.view.*
-
-class GiftOneGetOnePromoMenuView @JvmOverloads constructor(
-        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-
-    init {
-        inflate(R.layout.promo_gift_one_get_one, true)
-        setBackgroundColor(ContextCompat.getColor(context, R.color.teal_50))
-        clipToPadding = false
-        clipChildren = false
-        clipToOutline = false
-        button.setOnClickListener {
-            val intent = Intent(context, GiftOneGetOneInfoActivity::class.java)
-            context.startActivity(intent)
-        }
-    }
-
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder/MemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder/MemberViewHolder.kt
deleted file mode 100644
index 60c9b0c48..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder/MemberViewHolder.kt
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
-
-import android.view.MenuItem
-import android.view.View
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.widget.PopupMenu
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.android.habitica.ui.AvatarView
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaProgressBar
-import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-
-
-class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), PopupMenu.OnMenuItemClickListener {
-
-    private var currentUserID: String? = null
-    private var leaderID: String? = null
-    private val avatarView: AvatarView by bindView(R.id.avatarView)
-    private val displayNameTextView: UsernameLabel by bindView(R.id.display_name_textview)
-    private val sublineTextView: TextView by bindView(R.id.subline_textview)
-    private val buffIconView: ImageView by bindView(R.id.buff_icon_view)
-    private val classIconView: ImageView by bindView(R.id.class_icon_view)
-    private val healthBar: HabiticaProgressBar by bindView(R.id.health_bar)
-    private val experienceBar: HabiticaProgressBar by bindView(R.id.experience_bar)
-    private val manaBar: HabiticaProgressBar by bindView(R.id.mana_bar)
-    private val healthTextView: TextView by bindView(R.id.health_textview)
-    private val experienceTextView: TextView by bindView(R.id.experience_textview)
-    private val manaTextView: TextView by bindView(R.id.mana_textview)
-    private val moreButton: ImageButton by bindView(R.id.more_button)
-    //private val leaderTextView: TextView by bindView(R.id.leader_textview)
-
-    var onClickEvent: (() -> Unit)? = null
-    var sendMessageEvent: (() -> Unit)? = null
-    var removeMemberEvent: (() -> Unit)? = null
-    var transferOwnershipEvent: (() -> Unit)? = null
-
-    init {
-        buffIconView.setImageBitmap(HabiticaIconsHelper.imageOfBuffIcon())
-        itemView.setOnClickListener { onClickEvent?.invoke() }
-        moreButton.setOnClickListener { showOptionsPopup() }
-    }
-
-    private fun showOptionsPopup() {
-        val popup = PopupMenu(itemView.context, moreButton)
-        popup.setOnMenuItemClickListener(this)
-        val inflater = popup.menuInflater
-        inflater.inflate(R.menu.party_member_menu, popup.menu)
-        popup.menu.findItem(R.id.transfer_ownership).isVisible = currentUserID == leaderID
-        popup.menu.findItem(R.id.remove).isVisible = currentUserID == leaderID
-        popup.show()
-    }
-
-    override fun onMenuItemClick(item: MenuItem?): Boolean {
-        when (item?.itemId) {
-            R.id.send_message -> { sendMessageEvent?.invoke() }
-            R.id.transfer_ownership -> { transferOwnershipEvent?.invoke() }
-            R.id.remove -> { removeMemberEvent?.invoke() }
-        }
-        return true
-    }
-
-    fun bind(user: Member, leaderID: String?, userID: String?) {
-        avatarView.setAvatar(user)
-        this.leaderID = leaderID
-        this.currentUserID = userID
-
-        if (user.id == userID) {
-            moreButton.visibility = View.GONE
-        } else {
-            moreButton.visibility = View.VISIBLE
-        }
-
-        user.stats?.let {
-            healthBar.set(it.hp ?: 0.0, it.maxHealth?.toDouble() ?: 50.0)
-            healthTextView.text = "${it.hp?.toInt()} / ${it.maxHealth}"
-            experienceBar.set(it.exp ?: 0.0, it.toNextLevel?.toDouble() ?: 0.0)
-            experienceTextView.text = "${it.exp?.toInt()} / ${it.toNextLevel}"
-            manaBar.set(it.mp ?: 0.0, it.maxMP?.toDouble() ?: 0.0)
-            manaTextView.text = "${it.mp?.toInt()} / ${it.maxMP}"
-        }
-        displayNameTextView.username = user.profile?.name
-        displayNameTextView.tier = user.contributor?.level ?: 0
-
-        if (user.hasClass()) {
-            sublineTextView.text = itemView.context.getString(R.string.user_level_with_class, user.stats?.lvl, user.stats?.getTranslatedClassName(itemView.context))
-        } else {
-            sublineTextView.text = itemView.context.getString(R.string.user_level, user.stats?.lvl)
-        }
-
-        if (user.stats?.isBuffed == true) {
-            buffIconView.visibility = View.VISIBLE
-        } else {
-            buffIconView.visibility = View.GONE
-        }
-
-        classIconView.visibility = View.VISIBLE
-        when (user.stats?.habitClass) {
-            Stats.HEALER -> {
-                classIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
-            }
-            Stats.WARRIOR -> {
-                classIconView.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
-            }
-            Stats.ROGUE -> {
-                classIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
-            }
-            Stats.MAGE -> {
-                classIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
-            }
-            else -> {
-                classIconView.visibility = View.INVISIBLE
-            }
-        }
-
-        itemView.isClickable = true
-        //leaderTextView.visibility = if (user.id == leaderID) View.VISIBLE else View.GONE
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MemberViewHolder.kt
new file mode 100644
index 000000000..107f17e0f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MemberViewHolder.kt
@@ -0,0 +1,107 @@
+package com.habitrpg.android.habitica.ui.viewHolders
+
+import android.annotation.SuppressLint
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.widget.PopupMenu
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.PartyMemberBinding
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.user.Stats
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+
+
+class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), PopupMenu.OnMenuItemClickListener {
+    private val binding = PartyMemberBinding.bind(itemView)
+    private var currentUserID: String? = null
+    private var leaderID: String? = null
+
+    var onClickEvent: (() -> Unit)? = null
+    var sendMessageEvent: (() -> Unit)? = null
+    var removeMemberEvent: (() -> Unit)? = null
+    var transferOwnershipEvent: (() -> Unit)? = null
+
+    init {
+        binding.buffIconView.setImageBitmap(HabiticaIconsHelper.imageOfBuffIcon())
+        itemView.setOnClickListener { onClickEvent?.invoke() }
+        binding.moreButton.setOnClickListener { showOptionsPopup() }
+    }
+
+    private fun showOptionsPopup() {
+        val popup = PopupMenu(itemView.context, binding.moreButton)
+        popup.setOnMenuItemClickListener(this)
+        val inflater = popup.menuInflater
+        inflater.inflate(R.menu.party_member_menu, popup.menu)
+        popup.menu.findItem(R.id.transfer_ownership).isVisible = currentUserID == leaderID
+        popup.menu.findItem(R.id.remove).isVisible = currentUserID == leaderID
+        popup.show()
+    }
+
+    override fun onMenuItemClick(item: MenuItem?): Boolean {
+        when (item?.itemId) {
+            R.id.send_message -> { sendMessageEvent?.invoke() }
+            R.id.transfer_ownership -> { transferOwnershipEvent?.invoke() }
+            R.id.remove -> { removeMemberEvent?.invoke() }
+        }
+        return true
+    }
+
+    @SuppressLint("SetTextI18n")
+    fun bind(user: Member, leaderID: String?, userID: String?) {
+        binding.avatarView.setAvatar(user)
+        this.leaderID = leaderID
+        this.currentUserID = userID
+
+        if (user.id == userID) {
+            binding.youPill.visibility = View.VISIBLE
+            binding.moreButton.visibility = View.GONE
+        } else {
+            binding.youPill.visibility = View.GONE
+            binding.moreButton.visibility = View.VISIBLE
+        }
+
+        user.stats?.let {
+            binding.healthBar.set(it.hp ?: 0.0, it.maxHealth?.toDouble() ?: 50.0)
+            binding.healthTextview.text = "${it.hp?.toInt()} / ${it.maxHealth}"
+            binding.experienceBar.set(it.exp ?: 0.0, it.toNextLevel?.toDouble() ?: 0.0)
+            binding.experienceTextview.text = "${it.exp?.toInt()} / ${it.toNextLevel}"
+            binding.manaBar.set(it.mp ?: 0.0, it.maxMP?.toDouble() ?: 0.0)
+            binding.manaTextview.text = "${it.mp?.toInt()} / ${it.maxMP}"
+        }
+        binding.displayNameTextview.username = user.profile?.name
+        binding.displayNameTextview.tier = user.contributor?.level ?: 0
+
+        if (user.hasClass()) {
+            binding.sublineTextview.text = itemView.context.getString(R.string.user_level_with_class, user.stats?.lvl, user.stats?.getTranslatedClassName(itemView.context))
+        } else {
+            binding.sublineTextview.text = itemView.context.getString(R.string.user_level, user.stats?.lvl)
+        }
+
+        if (user.stats?.isBuffed == true) {
+            binding.buffIconView.visibility = View.VISIBLE
+        } else {
+            binding.buffIconView.visibility = View.GONE
+        }
+
+        binding.classIconView.visibility = View.VISIBLE
+        when (user.stats?.habitClass) {
+            Stats.HEALER -> {
+                binding.classIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
+            }
+            Stats.WARRIOR -> {
+                binding.classIconView.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
+            }
+            Stats.ROGUE -> {
+                binding.classIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
+            }
+            Stats.MAGE -> {
+                binding.classIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
+            }
+            else -> {
+                binding.classIconView.visibility = View.INVISIBLE
+            }
+        }
+
+        itemView.isClickable = true
+    }
+}
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..9ceeae1c7 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
@@ -12,10 +12,9 @@ import com.habitrpg.android.habitica.models.inventory.Mount
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<String>) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.mount_overview_item)), View.OnClickListener {
     private var binding: MountOverviewItemBinding = MountOverviewItemBinding.bind(itemView)
@@ -43,7 +42,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())
         }
@@ -57,7 +56,7 @@ class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject
         menu.setTitle(animal?.text)
         menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.equip)))
         menu.setSelectionRunnable {
-            animal?.let { equipEvents.onNext(it.key) }
+            animal?.let { equipEvents.onNext(it.key ?: "") }
         }
         menu.show()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
index aa50fbd51..e597c9134 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
@@ -14,13 +14,12 @@ import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
 import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.subjects.PublishSubject
 import org.greenrobot.eventbus.EventBus
 
-class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<String>, private val animalIngredientsRetriever: ((Animal) -> Pair<Egg?, HatchingPotion?>)?) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.pet_detail_item)), View.OnClickListener {
+class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<String>, private val animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)?) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.pet_detail_item)), View.OnClickListener {
     private var hasMount: Boolean = false
     private var hasUnlockedPotion: Boolean = false
     private var hasUnlockedEgg: Boolean = false
@@ -68,7 +67,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 +82,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 +97,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())
         }
@@ -123,7 +122,7 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<S
             when (index) {
                 0 -> {
                     animal?.let {
-                        equipEvents.onNext(it.key)
+                        equipEvents.onNext(it.key ?: "")
                     }
                 }
                 1 -> {
@@ -148,16 +147,17 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<S
         val context = itemView.context
         val dialog = PetSuggestHatchDialog(context)
         animal?.let {
-            val ingredients = animalIngredientsRetriever?.invoke(it)
-            dialog.configure(it,
-                    ingredients?.first,
-                    ingredients?.second,
-                    eggCount,
-                    potionCount,
-                    hasUnlockedEgg,
-                    hasUnlockedPotion,
-                    hasMount)
+            animalIngredientsRetriever?.invoke(it) { ingredients ->
+                dialog.configure(it,
+                        ingredients.first,
+                        ingredients.second,
+                        eggCount,
+                        potionCount,
+                        hasUnlockedEgg,
+                        hasUnlockedPotion,
+                        hasMount)
+                dialog.show()
+            }
         }
-        dialog.show()
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
index e40aab43a..159786335 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
@@ -11,14 +11,13 @@ import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.inventory.StableSection
-import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-    private val label: TextView by bindView(itemView, R.id.label)
-    private val selectionSpinner: Spinner? by bindView(itemView, R.id.classSelectionSpinner)
-    internal val notesView: TextView? by bindView(itemView, R.id.headerNotesView)
-    private val countPill: TextView? by bindView(itemView, R.id.count_pill)
+    private val label: TextView = itemView.findViewById(R.id.label)
+    private val selectionSpinner: Spinner? = itemView.findViewById(R.id.classSelectionSpinner)
+    internal val notesView: TextView? = itemView.findViewById(R.id.headerNotesView)
+    private val countPill: TextView? = itemView.findViewById(R.id.count_pill)
     var context: Context = itemView.context
 
     var spinnerSelectionChanged: (() -> Unit)? = null
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..3439df40f 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
@@ -3,97 +3,86 @@ package com.habitrpg.android.habitica.ui.viewHolders
 import android.content.Context
 import android.graphics.drawable.BitmapDrawable
 import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
 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.databinding.RowShopitemBinding
+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
-import com.habitrpg.android.habitica.ui.views.CurrencyView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog
 
 class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
-    private val imageView: SimpleDraweeView by bindView(itemView, R.id.imageView)
-    private val buyButton: View by bindView(itemView, R.id.buyButton)
-    private val priceLabel: CurrencyView by bindView(itemView, R.id.priceLabel)
-    private val unlockLabel: TextView by bindView(itemView, R.id.unlockLabel)
-    private val itemDetailIndicator: TextView by bindView(itemView, R.id.item_detail_indicator)
-    private val pinIndicator: ImageView by bindView(itemView, R.id.pin_indicator)
-
+    private val binding = RowShopitemBinding.bind(itemView)
     var shopIdentifier: String? = null
     private var item: ShopItem? = null
 
     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
     set(value) {
         field = value
         if (value > 0) {
-            itemDetailIndicator.text = value.toString()
-            itemDetailIndicator.background = countDrawable
-            itemDetailIndicator.visibility = View.VISIBLE
+            binding.itemDetailIndicator.text = value.toString()
+            binding.itemDetailIndicator.background = if (context.isUsingNightModeResources()) {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorNumberDark())
+            } else {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorNumber())
+            }
+            binding.itemDetailIndicator.visibility = View.VISIBLE
         }
     }
 
     var isPinned = false
     set(value) {
         field =value
-        pinIndicator.visibility = if (isPinned) View.VISIBLE else View.GONE
+        binding.pinIndicator.visibility = if (isPinned) View.VISIBLE else View.GONE
     }
 
     init {
         itemView.setOnClickListener(this)
         itemView.isClickable = true
-        pinIndicator.setImageBitmap(HabiticaIconsHelper.imageOfPinnedItem())
+        binding.pinIndicator.setImageBitmap(HabiticaIconsHelper.imageOfPinnedItem())
     }
 
     fun bind(item: ShopItem, canBuy: Boolean) {
         this.item = item
-        buyButton.visibility = View.VISIBLE
+        binding.buyButton.visibility = View.VISIBLE
 
-        DataBindingUtils.loadImage(this.imageView, item.imageName?.replace("_locked", ""))
+        DataBindingUtils.loadImage(binding.imageView, item.imageName?.replace("_locked", ""))
 
-        itemDetailIndicator.text = null
-        itemDetailIndicator.visibility = View.GONE
+        binding.itemDetailIndicator.text = null
+        binding.itemDetailIndicator.visibility = View.GONE
 
         val lockedReason = item.shortLockedReason(context)
         if (!item.locked || lockedReason == null) {
-            priceLabel.text = item.value.toString()
-            priceLabel.currency = item.currency
+            binding.priceLabel.text = item.value.toString()
+            binding.priceLabel.currency = item.currency
             if (item.currency == null) {
-                buyButton.visibility = View.GONE
-            }
-            priceLabel.visibility = View.VISIBLE
-            unlockLabel.visibility = View.GONE
-            if (item.locked) {
-                itemDetailIndicator.background = lockedDrawable
-                itemDetailIndicator.visibility = View.VISIBLE
+                binding.buyButton.visibility = View.GONE
             }
+            binding.priceLabel.visibility = View.VISIBLE
+            binding.unlockLabel.visibility = View.GONE
         } else {
-            unlockLabel.text = lockedReason
-            priceLabel.visibility = View.GONE
-            unlockLabel.visibility = View.VISIBLE
-            itemDetailIndicator.background = lockedDrawable
-            itemDetailIndicator.visibility = View.VISIBLE
+            binding.unlockLabel.text = lockedReason
+            binding.priceLabel.visibility = View.GONE
+            binding.unlockLabel.visibility = View.VISIBLE
+        }
+        if (item.locked) {
+            binding.itemDetailIndicator.background = if (context.isUsingNightModeResources()) {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLockedDark())
+            } else {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLocked())
+            }
+            binding.itemDetailIndicator.visibility = View.VISIBLE
+        } else if (item.isLimited) {
+            binding.itemDetailIndicator.background = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLimited())
+            binding.itemDetailIndicator.visibility = View.VISIBLE
         }
 
-        if (item.isLimited) {
-            itemDetailIndicator.background = limitedDrawable
-            itemDetailIndicator.visibility = View.VISIBLE
-        }
-
-        priceLabel.isLocked = item.locked || !canBuy
+        binding.priceLabel.isLocked = item.locked || !canBuy
     }
 
     override fun onClick(view: View) {
@@ -110,6 +99,6 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
     }
 
     fun hidePinIndicator() {
-        pinIndicator.visibility = View.GONE
+        binding.pinIndicator.visibility = View.GONE
     }
 }
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..26f479681 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
@@ -1,10 +1,17 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
 import android.content.Context
+import android.text.TextUtils
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.ContextCompat
+import androidx.core.text.TextUtilsCompat
 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.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -12,37 +19,37 @@ import com.habitrpg.android.habitica.ui.helpers.*
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.android.habitica.ui.views.EllipsisTextView
 import io.noties.markwon.utils.NoCopySpannableFactory
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Action
+import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 
-abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc: ((Task, TaskDirection) -> Unit), var openTaskFunc: ((Task) -> Unit), var brokenTaskFunc: ((Task) -> Unit)) : BindableViewHolder<Task>(itemView), View.OnClickListener {
-
-
+abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc: ((Task, TaskDirection) -> Unit), var openTaskFunc: ((Task) -> Unit), var brokenTaskFunc: ((Task) -> Unit)) : BindableViewHolder<Task>(itemView), View.OnTouchListener {
     var task: Task? = null
     var movingFromPosition: Int? = null
     var errorButtonClicked: Action? = null
+    var isLocked = false
     protected var context: Context
-    private val mainTaskWrapper: ViewGroup by bindView(itemView, R.id.main_task_wrapper)
-    private val titleTextView: EllipsisTextView by bindView(itemView, R.id.checkedTextView)
-    private val notesTextView: EllipsisTextView? by bindView(itemView, R.id.notesTextView)
-    protected val calendarIconView: ImageView? by bindView(itemView, R.id.iconViewCalendar)
-    protected val specialTaskTextView: TextView? by bindOptionalView(itemView, R.id.specialTaskText)
-    private val iconViewChallenge: ImageView? by bindView(itemView, R.id.iconviewChallenge)
-    private val iconViewReminder: ImageView? by bindOptionalView(itemView, R.id.iconviewReminder)
-    private val taskIconWrapper: LinearLayout? by bindView(itemView, R.id.taskIconWrapper)
-    private val approvalRequiredTextView: TextView? by bindView(itemView, R.id.approvalRequiredTextField)
-    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 streakTextView: TextView by bindView(itemView, R.id.streakTextView)
-    protected val reminderTextView: TextView by bindView(itemView, R.id.reminder_textview)
+    private val mainTaskWrapper: ViewGroup = itemView.findViewById(R.id.main_task_wrapper)
+    protected val titleTextView: EllipsisTextView = itemView.findViewById(R.id.checkedTextView)
+    protected val notesTextView: EllipsisTextView? = itemView.findViewById(R.id.notesTextView)
+    protected val calendarIconView: ImageView? = itemView.findViewById(R.id.iconViewCalendar)
+    protected val iconViewTeam: ImageView? = itemView.findViewById(R.id.iconViewTeamTask)
+    protected val specialTaskTextView: TextView? = itemView.findViewById(R.id.specialTaskText)
+    private val iconViewChallenge: AppCompatImageView? = itemView.findViewById(R.id.iconviewChallenge)
+    private val iconViewReminder: ImageView? = itemView.findViewById(R.id.iconviewReminder)
+    private val taskIconWrapper: LinearLayout? = itemView.findViewById(R.id.taskIconWrapper)
+    private val approvalRequiredTextView: TextView? = itemView.findViewById(R.id.approvalRequiredTextField)
+    private val expandNotesButton: Button? = itemView.findViewById(R.id.expand_notes_button)
+    private val syncingView: ProgressBar? = itemView.findViewById(R.id.syncing_view)
+    private val errorIconView: ImageButton? = itemView.findViewById(R.id.error_icon)
+    protected val taskGray: Int = ContextCompat.getColor(itemView.context, R.color.offset_background)
+    protected val streakIconView: ImageView = itemView.findViewById(R.id.iconViewStreak)
+    protected val streakTextView: TextView = itemView.findViewById(R.id.streakTextView)
+    protected val reminderTextView: TextView = itemView.findViewById(R.id.reminder_textview)
 
     private var openTaskDisabled: Boolean = false
     private var taskActionsDisabled: Boolean = false
@@ -52,6 +59,9 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         get() {
             var isVisible = false
 
+            if (iconViewTeam?.visibility == View.VISIBLE) {
+                isVisible = true
+            }
             if (iconViewReminder?.visibility == View.VISIBLE) {
                 isVisible = true
             }
@@ -71,12 +81,12 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         }
 
     init {
-        itemView.setOnClickListener { onClick(it) }
+        itemView.setOnTouchListener(this)
         itemView.isClickable = true
         mainTaskWrapper.clipToOutline = true
 
-        titleTextView.setOnClickListener { onClick(it) }
-        notesTextView?.setOnClickListener { onClick(it) }
+        titleTextView.setOnClickListener { onTouch(it, null) }
+        notesTextView?.setOnClickListener { onTouch(it, null) }
         errorIconView?.setOnClickListener { errorButtonClicked?.run()}
 
         //Re enable when we find a way to only react when a link is tapped.
@@ -92,8 +102,8 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         notesTextView?.addEllipsesListener(object : EllipsisTextView.EllipsisListener {
             override fun ellipsisStateChanged(ellipses: Boolean) {
                 GlobalScope.launch(Dispatchers.Main.immediate) {
-                    if (ellipses && notesTextView?.maxLines != 3) {
-                        notesTextView?.maxLines = 3
+                    if (ellipses && notesTextView.maxLines != 3) {
+                        notesTextView.maxLines = 3
                     }
                     expandNotesButton?.visibility = if (ellipses || notesExpanded) View.VISIBLE else View.GONE
                 }
@@ -108,20 +118,22 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
             notesTextView?.maxLines = 100
             expandNotesButton?.text = context.getString(R.string.collapse_notes)
         } else {
-            notesTextView?.maxLines = 5
+            notesTextView?.maxLines = 8
             expandNotesButton?.text = context.getString(R.string.expand_notes)
         }
     }
 
     override fun bind(data: Task, position: Int, displayMode: String) {
+        notesExpanded = false
         task = data
-        itemView.setBackgroundResource(R.color.white)
+        itemView.setBackgroundColor(context.getThemeColor(R.attr.colorContentBackground))
 
         expandNotesButton?.visibility = View.GONE
         notesExpanded = false
-        notesTextView?.maxLines = 5
+        notesTextView?.maxLines = 8
         if (data.notes?.isNotEmpty() == true) {
             notesTextView?.visibility = View.VISIBLE
+            notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
             //expandNotesButton.visibility = if (notesTextView.hadEllipses() || notesExpanded) View.VISIBLE else View.GONE
         } else {
             notesTextView?.visibility = View.GONE
@@ -135,10 +147,11 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
                 titleTextView.setSpannableFactory(NoCopySpannableFactory.getInstance())
                 if (data.text.isNotEmpty()) {
                     Single.just(data.text)
+                            .map { TextUtils.concat(it, "\u200B").toString() }
                             .map { MarkdownParser.parseMarkdown(it) }
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(Consumer{ parsedText ->
+                            .subscribe({ parsedText ->
                                 data.parsedText = parsedText
                                 titleTextView.setParsedMarkdown(parsedText)
                             }, RxErrorHandler.handleEmptyError())
@@ -154,10 +167,11 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
                                 return@let
                             }
                             Single.just(notes)
+                                    .map { TextUtils.concat(it, "\u200B").toString() }
                                     .map { MarkdownParser.parseMarkdown(it) }
                                     .subscribeOn(Schedulers.io())
                                     .observeOn(AndroidSchedulers.mainThread())
-                                    .subscribe(Consumer { parsedNotes ->
+                                    .subscribe({ parsedNotes ->
                                         notesTextView?.text = parsedNotes
                                         notesTextView?.setParsedMarkdown(parsedNotes)
                                     }, RxErrorHandler.handleEmptyError())
@@ -175,16 +189,27 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
                 notesTextView?.visibility = View.GONE
             }
         }
+        titleTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
 
         if (displayMode == "standard") {
             iconViewReminder?.visibility = if (data.reminders?.size ?: 0 > 0) View.VISIBLE else View.GONE
 
             iconViewChallenge?.visibility = if (task?.challengeID != null) View.VISIBLE else View.GONE
             if (task?.challengeID != null) {
-                iconViewChallenge?.setImageResource(if (task?.challengeBroken?.isNotBlank() == true) R.drawable.task_broken_megaphone else R.drawable.task_megaphone)
+                if (task?.challengeBroken?.isNotBlank() == true) {
+                    iconViewChallenge?.alpha = 1.0f
+                    iconViewChallenge?.imageTintList = ContextCompat.getColorStateList(context, R.color.white)
+                    iconViewChallenge?.setImageResource(R.drawable.task_broken_megaphone)
+                } else {
+                    iconViewChallenge?.alpha = 0.3f
+                    iconViewChallenge?.imageTintList = ContextCompat.getColorStateList(context, R.color.text_ternary)
+                    iconViewChallenge?.setImageResource(R.drawable.task_megaphone)
+                }
             }
             configureSpecialTaskTextView(data)
 
+            iconViewTeam?.visibility = if (data.isGroupTask) View.VISIBLE else View.GONE
+
             taskIconWrapper?.visibility = if (taskIconWrapperIsVisible) View.VISIBLE else View.GONE
         } else {
             taskIconWrapper?.visibility = View.GONE
@@ -207,8 +232,47 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         calendarIconView?.visibility = View.GONE
     }
 
-    override fun onClick(v: View) {
+    open fun onLeftActionTouched() {}
+    open fun onRightActionTouched() {}
+
+    override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean {
+        if (motionEvent != null) {
+            if (motionEvent.action != MotionEvent.ACTION_UP) return true
+            if (motionEvent.y <= mainTaskWrapper.height + 5.dpToPx(context)) {
+                if ((this.task?.checklist?.isNotEmpty() != true)) {
+                    if (motionEvent.x <= 72.dpToPx(context)) {
+                        onLeftActionTouched()
+                        return true
+                    } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) {
+                        onRightActionTouched()
+                        return true
+                    }
+                } else {
+                    val checkboxHolder: ViewGroup = itemView.findViewById(R.id.checkBoxHolder)
+                    if (mainTaskWrapper.height == checkboxHolder.height) {
+                        if (motionEvent.x <= 72.dpToPx(context)) {
+                            onLeftActionTouched()
+                            return true
+                        } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) {
+                            onRightActionTouched()
+                            return true
+                        }
+                    }  else {
+                        if (motionEvent.y <= (checkboxHolder.height + 5.dpToPx(context))) {
+                            if (motionEvent.x <= 72.dpToPx(context)) {
+                                onLeftActionTouched()
+                                return true
+                            } else if ((itemView.width - motionEvent.x <= 72.dpToPx(context))) {
+                                onRightActionTouched()
+                                return true
+                            }
+                        }
+                    }
+                }
+            }
+        }
         task?.let { openTaskFunc(it) }
+        return true
     }
 
     open fun canContainMarkdown(): Boolean {
@@ -219,4 +283,4 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         this.openTaskDisabled = openTaskDisabled
         this.taskActionsDisabled = taskActionsDisabled
     }
-}
+}
\ No newline at end of file
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..5b5c0c79a 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
@@ -2,71 +2,88 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
 import android.content.Context
 import android.graphics.PorterDuff
-import android.graphics.Rect
-import android.view.LayoutInflater
-import android.view.TouchDelegate
-import android.view.View
-import android.view.ViewGroup
+import android.graphics.drawable.BitmapDrawable
+import android.view.*
 import android.widget.*
 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
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.ui.helpers.setParsedMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 
-abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), var scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit), openTaskFunc: ((Task) -> Unit), brokenTaskFunc: ((Task) -> Unit)) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc), CompoundButton.OnCheckedChangeListener {
+abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), var scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit), openTaskFunc: ((Task) -> Unit), brokenTaskFunc: ((Task) -> Unit)) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
 
-    private val checkboxHolder: ViewGroup by bindView(itemView, R.id.checkBoxHolder)
-    internal val checkbox: CheckBox by bindView(itemView, R.id.checkBox)
-    internal val checklistView: LinearLayout by bindView(itemView, R.id.checklistView)
-    internal val checklistIndicatorWrapper: ViewGroup by bindView(itemView, R.id.checklistIndicatorWrapper)
-    private val checklistCompletedTextView: TextView by bindView(itemView, R.id.checkListCompletedTextView)
-    private val checklistAllTextView: TextView by bindView(itemView, R.id.checkListAllTextView)
-    private val checklistDivider: View by bindView(itemView, R.id.checklistDivider)
+    private val checkboxHolder: ViewGroup = itemView.findViewById(R.id.checkBoxHolder)
+    internal val checkmarkView: ImageView = itemView.findViewById(R.id.checkmark)
+    internal val lockView: ImageView = itemView.findViewById(R.id.lock_view)
+    internal val checkboxBackground: View = itemView.findViewById(R.id.checkBoxBackground)
+    internal val checklistView: LinearLayout = itemView.findViewById(R.id.checklistView)
+    internal val checklistIndicatorWrapper: ViewGroup = itemView.findViewById(R.id.checklistIndicatorWrapper)
+    private val checklistCompletedTextView: TextView = itemView.findViewById(R.id.checkListCompletedTextView)
+    private val checklistAllTextView: TextView = itemView.findViewById(R.id.checkListAllTextView)
+    private val checklistDivider: View = itemView.findViewById(R.id.checklistDivider)
 
     init {
         checklistIndicatorWrapper.isClickable = true
         checklistIndicatorWrapper.setOnClickListener { onChecklistIndicatorClicked() }
-        checkbox.setOnCheckedChangeListener(this)
-        expandCheckboxTouchArea(checkboxHolder, checkbox)
     }
 
-    override fun bind(newTask: Task, position: Int, displayMode: String) {
-        var completed = newTask.completed
-        if (newTask.isPendingApproval) {
+    override fun bind(data: Task, position: Int, displayMode: String) {
+        var completed = data.completed
+        if (data.isPendingApproval) {
             completed = false
         }
-        this.checkbox.isChecked = completed
-        if (this.shouldDisplayAsActive(newTask) && !newTask.isPendingApproval) {
-            this.checkboxHolder.setBackgroundResource(newTask.lightTaskColor)
+        if (isLocked) {
+            this.checkmarkView.visibility = View.GONE
+            this.lockView.visibility = View.VISIBLE
+            lockView.setImageBitmap(HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.white), 10, 12))
         } else {
-            if (newTask.completed) {
-                this.checkboxHolder.setBackgroundResource(R.color.gray_700)
-            } else {
-                this.checkboxHolder.setBackgroundColor(this.taskGray)
-            }
+            this.checkmarkView.visibility = if (completed) View.VISIBLE else View.GONE
+            checkmarkView.drawable.setTint(ContextCompat.getColor(context, R.color.gray_400))
+            this.lockView.visibility = View.GONE
         }
-        this.checklistCompletedTextView.text = newTask.completedChecklistCount.toString()
-        this.checklistAllTextView.text = newTask.checklist?.size.toString()
+        this.checklistCompletedTextView.text = data.completedChecklistCount.toString()
+        this.checklistAllTextView.text = data.checklist?.size.toString()
 
         this.checklistView.removeAllViews()
         this.updateChecklistDisplay()
 
-        this.checklistIndicatorWrapper.visibility = if (newTask.checklist?.size == 0) View.GONE else View.VISIBLE
-        super.bind(newTask, position, displayMode)
+        this.checklistIndicatorWrapper.visibility = if (data.checklist?.size == 0) View.GONE else View.VISIBLE
+        super.bind(data, position, displayMode)
+        val regularBoxBackground = if (task?.type == Task.TYPE_DAILY) R.drawable.daily_unchecked else R.drawable.todo_unchecked
+        val completedBoxBackground = if (task?.type == Task.TYPE_DAILY) R.drawable.daily_checked else R.drawable.todo_checked
+        val inactiveBoxBackground = R.drawable.daily_inactive
+        if (this.shouldDisplayAsActive(data) && !data.isPendingApproval) {
+            this.checkboxHolder.setBackgroundResource(data.lightTaskColor)
+            checkboxBackground.setBackgroundResource(regularBoxBackground)
+        } else {
+            if (data.completed) {
+                titleTextView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
+                notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
+                this.checkboxHolder.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
+                checkboxBackground.setBackgroundResource(completedBoxBackground)
+            } else {
+                this.checkboxHolder.setBackgroundColor(this.taskGray)
+                notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
+                checkboxBackground.setBackgroundResource(regularBoxBackground)
+                checkboxBackground.setBackgroundResource(inactiveBoxBackground)
+            }
+        }
     }
 
-    abstract fun shouldDisplayAsActive(newTask: Task): Boolean
+    abstract fun shouldDisplayAsActive(newTask: Task?): Boolean
 
     private fun updateChecklistDisplay() {
         //This needs to be a LinearLayout, as ListViews can not be inside other ListViews.
@@ -76,19 +93,31 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
                 checklistView.removeAllViews()
                 for (item in this.task?.checklist ?: emptyList<ChecklistItem>()) {
                     val itemView = layoutInflater?.inflate(R.layout.checklist_item_row, this.checklistView, false)
-                    val checkboxBackground = itemView?.findViewById<FrameLayout>(R.id.checkBoxBackground)
+                    val checkboxBackground = itemView?.findViewById<View>(R.id.checkBoxBackground)
                     if (task?.type == Task.TYPE_TODO) {
                         checkboxBackground?.setBackgroundResource(R.drawable.round_checklist_unchecked)
                     }
+                    checkboxBackground?.backgroundTintList = ContextCompat.getColorStateList(context, (if (context.isUsingNightModeResources()) {
+                        if (task?.completed == true || (task?.type == Task.TYPE_DAILY && task?.isDue == false)) {
+                            R.color.checkbox_fill
+                        } else {
+                            task?.lightTaskColor
+                        }
+                    } else {
+                        R.color.checkbox_fill
+                    }) ?: R.color.checkbox_fill)
                     val textView = itemView?.findViewById<HabiticaEmojiTextView>(R.id.checkedTextView)
                     // Populate the data into the template view using the data object
                     textView?.text = item.text
+                    textView?.setTextColor(ContextCompat.getColor(context, if (item.completed) R.color.text_dimmed else R.color.text_secondary))
                     if (item.text != null) {
                         Observable.just(item.text)
                                 .map { MarkdownParser.parseMarkdown(it) }
                                 .subscribeOn(Schedulers.io())
                                 .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe(Consumer<CharSequence> { textView?.text = it }, RxErrorHandler.handleEmptyError())
+                                .subscribe({
+                                    textView?.setParsedMarkdown(it)
+                                }, RxErrorHandler.handleEmptyError())
                     }
                     val checkmark = itemView?.findViewById<ImageView>(R.id.checkmark)
                     checkmark?.drawable?.setTintMode(PorterDuff.Mode.SRC_ATOP)
@@ -98,11 +127,12 @@ 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
+                        val color = if (context.isUsingNightModeResources()) task?.darkestTaskColor else task?.darkTaskColor
+                        checkmark?.drawable?.setTint(ContextCompat.getColor(context, color ?: R.color.text_dimmed))
+                        task?.extraLightTaskColor ?: R.color.offset_background
                     })
                     color.let { checkboxHolder?.setBackgroundColor(it) }
                     this.checklistView.addView(itemView)
@@ -119,13 +149,17 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
         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)
+            val textColor = if (context.isUsingNightModeResources()) {
+                ContextCompat.getColor(context, R.color.gray_600)
+            } 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_quad)
             checklistCompletedTextView.setTextColor(textColor)
             checklistAllTextView.setTextColor(textColor)
             checklistDivider.setBackgroundColor(textColor)
@@ -142,36 +176,36 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
             layoutManager?.scrollToPositionWithOffset(this.adapterPosition, 15)
         }
         updateChecklistDisplay()
+    }
 
+    override fun onLeftActionTouched() {
+        super.onLeftActionTouched()
+        if (task?.isValid == true) {
+            onCheckedChanged(!(task?.completed ?: false))
+        }
+    }
+
+    override fun onRightActionTouched() {
+        super.onRightActionTouched()
+        onChecklistIndicatorClicked()
     }
 
     private fun shouldDisplayExpandedChecklist(): Boolean {
         return expandedChecklistRow != null && adapterPosition == expandedChecklistRow
     }
 
-    private fun expandCheckboxTouchArea(expandedView: View?, checkboxView: View?) {
-        expandedView?.post {
-            val rect = Rect()
-            expandedView.getHitRect(rect)
-            expandedView.touchDelegate = TouchDelegate(rect, checkboxView)
+    private fun onCheckedChanged(isChecked: Boolean) {
+        if (task?.isValid != true) {
+            return
         }
-    }
-
-    override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
-        if (buttonView == checkbox) {
-            if (task?.isValid != true) {
-                return
-            }
-            if (isChecked != task?.completed) {
-                task?.let { scoreTaskFunc(it, if (task?.completed == false) TaskDirection.UP else TaskDirection.DOWN) }
-            }
+        if (isChecked != task?.completed) {
+            task?.let { scoreTaskFunc(it, if (task?.completed == false) TaskDirection.UP else TaskDirection.DOWN) }
         }
     }
 
     override fun setDisabled(openTaskDisabled: Boolean, taskActionsDisabled: Boolean) {
         super.setDisabled(openTaskDisabled, taskActionsDisabled)
-
-        this.checkbox.isEnabled = !taskActionsDisabled
+        this.checkboxHolder.isEnabled = !taskActionsDisabled
     }
 
     companion object {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
index ea4356ca6..f9e19956f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
@@ -1,19 +1,14 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
 import android.view.View
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import java.text.DateFormat
 import java.util.*
 
 class DailyViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit), openTaskFunc: ((Task) -> Unit), brokenTaskFunc: ((Task) -> Unit)) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc) {
 
-
-
     override val taskIconWrapperIsVisible: Boolean
         get() {
             var isVisible: Boolean = super.taskIconWrapperIsVisible
@@ -52,8 +47,8 @@ class DailyViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         super.bind(newTask, position, displayMode)
     }
 
-    override fun shouldDisplayAsActive(newTask: Task): Boolean {
-        return newTask.isDisplayedActive
+    override fun shouldDisplayAsActive(newTask: Task?): Boolean {
+        return newTask?.isDisplayedActive ?: false
     }
 
     override fun configureSpecialTaskTextView(task: Task) {
@@ -61,8 +56,10 @@ class DailyViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         if (task.streak ?: 0 > 0) {
             this.streakTextView.text = task.streak.toString()
             this.streakTextView.visibility = View.VISIBLE
+            this.streakIconView.visibility = View.VISIBLE
         } else {
             this.streakTextView.visibility = View.GONE
+            this.streakIconView.visibility = View.GONE
         }
     }
 
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..a10454335 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
@@ -1,25 +1,29 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
+import android.graphics.Color
 import android.graphics.PorterDuff
+import android.graphics.drawable.BitmapDrawable
 import android.view.View
 import android.widget.Button
 import android.widget.FrameLayout
 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.setTintWith
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), openTaskFunc: ((Task) -> Unit), brokenTaskFunc: ((Task) -> Unit)) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
 
-    private val btnPlusWrapper: FrameLayout by bindView(itemView, R.id.btnPlusWrapper)
-    private val btnPlusIconView: ImageView by bindView(itemView, R.id.btnPlusIconView)
-    private val btnPlus: Button by bindView(itemView, R.id.btnPlus)
-    private val btnMinusWrapper: FrameLayout by bindView(itemView, R.id.btnMinusWrapper)
-    private val btnMinusIconView: ImageView by bindView(itemView, R.id.btnMinusIconView)
-    private val btnMinus: Button by bindView(itemView, R.id.btnMinus)
+    private val btnPlusWrapper: FrameLayout = itemView.findViewById(R.id.btnPlusWrapper)
+    private val btnPlusIconView: ImageView = itemView.findViewById(R.id.btnPlusIconView)
+    private val btnPlusCircleView: View = itemView.findViewById(R.id.button_plus_circle_view)
+    private val btnPlus: Button = itemView.findViewById(R.id.btnPlus)
+    private val btnMinusWrapper: FrameLayout = itemView.findViewById(R.id.btnMinusWrapper)
+    private val btnMinusIconView: ImageView = itemView.findViewById(R.id.btnMinusIconView)
+    private val btnMinusCircleView: View = itemView.findViewById(R.id.button_minus_circle_view)
+    private val btnMinus: Button = itemView.findViewById(R.id.btnMinus)
 
     init {
         btnPlus.setOnClickListener { onPlusButtonClicked() }
@@ -29,51 +33,68 @@ 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)
+            val plusIcon = if (isLocked) {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.white), 10, 12))
+            } else {
+                ContextCompat.getDrawable(context, R.drawable.habit_plus)
+            }
+            plusIcon?.setTintWith(context, R.color.white)
             this.btnPlusIconView.setImageDrawable(plusIcon)
             val drawable = ContextCompat.getDrawable(context, R.drawable.habit_circle)
+            this.btnPlusWrapper.setBackgroundResource(data.lightTaskColor)
             drawable?.setTint(ContextCompat.getColor(context, data.mediumTaskColor))
             drawable?.setTintMode(PorterDuff.Mode.MULTIPLY)
-            btnPlusIconView.background = drawable
+            btnPlusCircleView.background = drawable
             this.btnPlus.visibility = View.VISIBLE
             this.btnPlus.isClickable = true
         } 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))
+            val plusIcon = if (isLocked) {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.content_background_offset), 10, 12))
+            } else {
+                ContextCompat.getDrawable(context, R.drawable.habit_plus)
+            }
+            plusIcon?.setTint(ContextCompat.getColor(context, R.color.content_background_offset))
             plusIcon?.setTintMode(PorterDuff.Mode.MULTIPLY)
             this.btnPlusIconView.setImageDrawable(plusIcon)
-            btnPlusIconView.background = ContextCompat.getDrawable(context, R.drawable.habit_circle_disabled)
+            btnPlusCircleView.background = ContextCompat.getDrawable(context, R.drawable.habit_circle_disabled)
             this.btnPlus.visibility = View.GONE
             this.btnPlus.isClickable = false
         }
 
         if (data.down == true) {
             this.btnMinusWrapper.setBackgroundResource(data.lightTaskColor)
-            val minusIcon = ContextCompat.getDrawable(context, R.drawable.habit_minus)
+            val minusIcon = if (isLocked) {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.white), 10, 12))
+            } else {
+                ContextCompat.getDrawable(context, R.drawable.habit_minus)
+            }
             minusIcon?.setTint(ContextCompat.getColor(context, R.color.white))
             minusIcon?.setTintMode(PorterDuff.Mode.MULTIPLY)
             this.btnMinusIconView.setImageDrawable(minusIcon)
             val drawable = ContextCompat.getDrawable(context, R.drawable.habit_circle)
+            this.btnMinusWrapper.setBackgroundResource(data.lightTaskColor)
             drawable?.setTint(ContextCompat.getColor(context, data.mediumTaskColor))
             drawable?.setTintMode(PorterDuff.Mode.MULTIPLY)
-            btnMinusIconView.background = drawable
+            btnMinusCircleView.background = drawable
             this.btnMinus.visibility = View.VISIBLE
             this.btnMinus.isClickable = true
         } 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))
+            val minusIcon = if (isLocked) {
+                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.content_background_offset), 10, 12))
+            } else {
+                ContextCompat.getDrawable(context, R.drawable.habit_minus)
+            }
+            minusIcon?.setTint(ContextCompat.getColor(context, R.color.content_background_offset))
             minusIcon?.setTintMode(PorterDuff.Mode.MULTIPLY)
             this.btnMinusIconView.setImageDrawable(minusIcon)
-            btnMinusIconView.background = ContextCompat.getDrawable(context, R.drawable.habit_circle_disabled)
+            btnMinusCircleView.background = ContextCompat.getDrawable(context, R.drawable.habit_circle_disabled)
             this.btnMinus.visibility = View.GONE
             this.btnMinus.isClickable = false
         }
 
+
         var streakString = ""
         if (data.counterUp != null && data.counterUp ?: 0 > 0 && data.counterDown != null && data.counterDown ?: 0 > 0) {
             streakString = streakString + "+" + data.counterUp.toString() + " | -" + data.counterDown?.toString()
@@ -85,19 +106,37 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         if (streakString.isNotEmpty()) {
             streakTextView.text = streakString
             streakTextView.visibility = View.VISIBLE
+            streakIconView.visibility = View.VISIBLE
         } else {
             streakTextView.visibility = View.GONE
+            streakIconView.visibility = View.GONE
         }
         reminderTextView.visibility = View.GONE
         calendarIconView?.visibility = View.GONE
         super.bind(data, position, displayMode)
+        if (data.up == false && data.down == false) {
+            titleTextView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
+            notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
+        }
+    }
+
+    override fun onLeftActionTouched() {
+        super.onLeftActionTouched()
+        onPlusButtonClicked()
+    }
+
+    override fun onRightActionTouched() {
+        super.onRightActionTouched()
+        onMinusButtonClicked()
     }
 
     private fun onPlusButtonClicked() {
+        if (task?.up != true) return
         task?.let { scoreTaskFunc.invoke(it, TaskDirection.UP) }
     }
 
     private fun onMinusButtonClicked() {
+        if (task?.down != true) return
         task?.let { scoreTaskFunc.invoke(it, TaskDirection.DOWN) }
     }
 
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..88ec0750f 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
@@ -1,33 +1,27 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
-import android.content.DialogInterface
+import android.view.MotionEvent
 import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.RewardItemCardBinding
 import com.habitrpg.android.habitica.helpers.NumberAbbreviator
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.ItemDetailDialog
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), openTaskFunc: ((Task) -> Unit), brokenTaskFunc: ((Task) -> Unit)) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
-
-    private val buyButton: View by bindView(itemView, R.id.buyButton)
-    internal val priceLabel: TextView by bindView(itemView, R.id.priceLabel)
-    private val goldIconView: ImageView by bindView(itemView, R.id.gold_icon)
-
+    private val binding = RewardItemCardBinding.bind(itemView)
 
     private val isItem: Boolean
         get() = this.task?.specialTag == "item"
 
     init {
-        goldIconView.setImageBitmap(HabiticaIconsHelper.imageOfGold())
+        binding.goldIcon.setImageBitmap(HabiticaIconsHelper.imageOfGold())
 
-        buyButton.setOnClickListener {
+        binding.buyButton.setOnClickListener {
             buyReward()
         }
     }
@@ -40,9 +34,9 @@ class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) ->
         task?.let { scoreTaskFunc(it, TaskDirection.DOWN) }
     }
 
-    override fun onClick(v: View) {
+    override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean {
         if (task?.isValid != true) {
-            return
+            return true
         }
         if (isItem) {
             val dialog = ItemDetailDialog(context)
@@ -51,32 +45,32 @@ 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)
+            super.onTouch(view, motionEvent)
         }
+        return true
     }
 
     override fun setDisabled(openTaskDisabled: Boolean, taskActionsDisabled: Boolean) {
         super.setDisabled(openTaskDisabled, taskActionsDisabled)
-
-        this.buyButton.isEnabled = !taskActionsDisabled
+        binding.buyButton.isEnabled = !taskActionsDisabled
     }
 
     fun bind(reward: Task, position: Int, canBuy: Boolean, displayMode: String) {
         this.task = reward
         super.bind(reward, position, displayMode)
-        this.priceLabel.text = NumberAbbreviator.abbreviate(itemView.context, this.task?.value ?: 0.0)
+        binding.priceLabel.text = NumberAbbreviator.abbreviate(itemView.context, this.task?.value ?: 0.0)
 
         if (canBuy) {
-            goldIconView.alpha = 1.0f
-            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.yellow_1))
-            buyButton.setBackgroundColor(ContextCompat.getColor(context, R.color.yellow_500))
+            binding.goldIcon.alpha = 1.0f
+            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.reward_buy_button_text))
+            binding.buyButton.setBackgroundColor(ContextCompat.getColor(context, R.color.reward_buy_button_bg))
         } else {
-            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))
+            binding.goldIcon.alpha = 0.6f
+            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
+            binding.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/viewHolders/tasks/TodoViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
index a42eb5491..8dfbf14d3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
@@ -14,7 +14,7 @@ class TodoViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Un
 
     override fun bind(newTask: Task, position: Int, displayMode: String) {
         this.task = newTask
-        setChecklistIndicatorBackgroundActive(!newTask.completed)
+        setChecklistIndicatorBackgroundActive(newTask.isChecklistDisplayActive)
         reminderTextView.visibility = View.GONE
         this.streakTextView.visibility = View.GONE
         super.bind(newTask, position, displayMode)
@@ -31,7 +31,7 @@ class TodoViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Un
         }
     }
 
-    override fun shouldDisplayAsActive(newTask: Task): Boolean {
-        return !newTask.completed
+    override fun shouldDisplayAsActive(newTask: Task?): Boolean {
+        return newTask?.completed != true
     }
 }
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..dcfbd4ec5 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
@@ -8,9 +8,8 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 
 abstract class BaseViewModel: ViewModel() {
@@ -40,10 +39,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(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..5f1c92f3c 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
@@ -15,13 +15,12 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.notifications.NewChatMessageData
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import io.realm.RealmResults
-import java.util.*
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 enum class GroupViewType(internal val order: String) {
@@ -52,7 +51,7 @@ open class GroupViewModel : BaseViewModel() {
     }
 
     protected val groupIDSubject = BehaviorSubject.create<Optional<String>>()
-    val groupIDFlowable = groupIDSubject.toFlowable(BackpressureStrategy.BUFFER)
+    val groupIDFlowable: Flowable<Optional<String>> = groupIDSubject.toFlowable(BackpressureStrategy.BUFFER)
     var gotNewMessages: Boolean = false
 
     init {
@@ -80,7 +79,7 @@ open class GroupViewModel : BaseViewModel() {
         } }
                 .filter { it.isNotEmpty() }
                 .flatMapPublisher { userRepository.readNotification(it.first().id) }
-                .subscribe(Consumer {
+                .subscribe({
                 }, RxErrorHandler.handleEmptyError()))
     }
 
@@ -101,7 +100,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 +110,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 +118,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()))
     }
@@ -127,7 +126,7 @@ open class GroupViewModel : BaseViewModel() {
     fun getChatMessages(): Flowable<RealmResults<ChatMessage>> {
         return groupIDFlowable
                 .filterMapEmpty()
-                .flatMapMaybe { socialRepository.getGroupChat(it).firstElement() }
+                .flatMap { socialRepository.getGroupChat(it) }
     }
 
     fun retrieveGroup(function: (() -> Unit)?) {
@@ -138,13 +137,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 +159,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 +192,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 +216,10 @@ open class GroupViewModel : BaseViewModel() {
             onComplete()
             return
         }
-        disposable.add(socialRepository.retrieveGroupChat(groupID).subscribe(Consumer {
+        disposable.add(socialRepository.retrieveGroupChat(groupID)
+                .delay(500, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({
             onComplete()
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -228,6 +230,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..edb8f9ad4 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
@@ -16,11 +16,10 @@ import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -37,7 +36,7 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
             .setEnablePlaceholders(false)
             .build()
 
-    private val dataSourceFactory = MessagesDataSourceFactory(socialRepository, recipientID)
+    val dataSourceFactory = MessagesDataSourceFactory(socialRepository, recipientID, ChatMessage())
     val messages: LiveData<PagedList<ChatMessage>> = dataSourceFactory.toLiveData(config)
     private val member: MutableLiveData<Member?> by lazy {
         MutableLiveData<Member?>()
@@ -49,11 +48,11 @@ 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>>()
-    val memberIDFlowable = memberIDSubject.toFlowable(BackpressureStrategy.BUFFER)
+    val memberIDFlowable: Flowable<Optional<String>> = memberIDSubject.toFlowable(BackpressureStrategy.BUFFER)
 
     fun setMemberID(groupID: String) {
         if (groupID == memberIDSubject.value?.value) return
@@ -76,7 +75,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)
@@ -86,7 +85,7 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
     }
 }
 
-private class MessagesDataSource(val socialRepository: SocialRepository, var recipientID: String?):
+class MessagesDataSource(val socialRepository: SocialRepository, var recipientID: String?, var footer : ChatMessage?):
         PositionalDataSource<ChatMessage>() {
     private var lastFetchWasEnd = false
     override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<ChatMessage>) {
@@ -98,9 +97,13 @@ 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 {
-                        if (it.size != 10) lastFetchWasEnd = true
-                        callback.onResult(it)
+                    .subscribe( {
+                        if (it.size < 10) {
+                            lastFetchWasEnd = true
+                            callback.onResult(it)
+                        }
+                        else
+                            callback.onResult(it)
                     }, RxErrorHandler.handleEmptyError())
         }
     }
@@ -115,24 +118,29 @@ private class MessagesDataSource(val socialRepository: SocialRepository, var rec
                         if (it.isEmpty()) {
                             if (recipientID?.isNotBlank() != true) { return@flatMapPublisher Flowable.just(it) }
                             socialRepository.retrieveInboxMessages(recipientID ?: "", 0)
-                                    .doOnNext {
-                                        messages -> if (messages.size != 10) lastFetchWasEnd = true
+                                    .doOnNext { messages ->
+                                        if (messages.size < 10) {
+                                            lastFetchWasEnd = true
+                                        }
                                     }
                         } else {
                             Flowable.just(it)
                         }
                     }
-                    .subscribe(Consumer {
-                        callback.onResult(it, 0)
+                    .subscribe( {
+                        if (it.size < 10 && footer != null)
+                            callback.onResult(it.plusElement(footer!!), 0)
+                        else
+                            callback.onResult(it, 0)
                     }, RxErrorHandler.handleEmptyError())
         }
     }
 }
 
-private class MessagesDataSourceFactory(val socialRepository: SocialRepository, var recipientID: String?) :
+class MessagesDataSourceFactory(val socialRepository: SocialRepository, var recipientID: String?, val footer : ChatMessage?) :
         DataSource.Factory<Int, ChatMessage>() {
     val sourceLiveData = MutableLiveData<MessagesDataSource>()
-    var latestSource: MessagesDataSource = MessagesDataSource(socialRepository, recipientID)
+    var latestSource: MessagesDataSource = MessagesDataSource(socialRepository, recipientID, footer)
 
     fun updateRecipientID(newID: String?) {
         recipientID = newID
@@ -140,7 +148,7 @@ private class MessagesDataSourceFactory(val socialRepository: SocialRepository,
     }
 
     override fun create(): DataSource<Int, ChatMessage> {
-        latestSource = MessagesDataSource(socialRepository, recipientID)
+        latestSource = MessagesDataSource(socialRepository, recipientID, footer)
         sourceLiveData.postValue(latestSource)
         return latestSource
     }
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..f155c96a9 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
@@ -12,12 +12,11 @@ import com.habitrpg.android.habitica.models.Notification
 import com.habitrpg.android.habitica.models.notifications.*
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Consumer
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.BiFunction
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import java.util.*
 import javax.inject.Inject
 
@@ -55,7 +54,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 +180,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 +197,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 +214,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 +314,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 +324,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 +334,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 +344,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..643a43d0c 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
@@ -8,9 +8,8 @@ import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.BackpressureStrategy
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.realm.RealmResults
 import org.greenrobot.eventbus.EventBus
 
@@ -20,7 +19,8 @@ class PartyViewModel: GroupViewModel() {
         get() = getGroupData().value?.quest?.active == true
 
     internal val isUserOnQuest: Boolean
-        get() = !(getGroupData().value?.quest?.members?.filter { it.key == getUserData().value?.id }?.isEmpty()?:true)
+        get() = !(getGroupData().value?.quest?.members?.none { it.key == getUserData().value?.id }
+                ?: true)
 
     private val members: MutableLiveData<RealmResults<Member>?> by lazy {
         MutableLiveData<RealmResults<Member>?>()
@@ -42,14 +42,15 @@ 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)
+        groupIDSubject.value?.value?.let { groupID ->
+            disposable.add(socialRepository.acceptQuest(null, groupID)
                     .flatMap { userRepository.retrieveUser() }
-                    .subscribe(Consumer {
+                    .flatMap { socialRepository.retrieveGroup(groupID) }
+                    .subscribe({
                         val event = ShowSnackbarEvent()
                         event.type = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
                         event.text = "Quest invitation accepted"
@@ -59,10 +60,11 @@ class PartyViewModel: GroupViewModel() {
     }
 
     fun rejectQuest() {
-        groupIDSubject.value?.value?.let {
-            disposable.add(socialRepository.rejectQuest(null, it)
+        groupIDSubject.value?.value?.let { groupID ->
+            disposable.add(socialRepository.rejectQuest(null, groupID)
                     .flatMap { userRepository.retrieveUser() }
-                    .subscribe(Consumer {
+                    .flatMap { socialRepository.retrieveGroup(groupID) }
+                    .subscribe({
                         val event = ShowSnackbarEvent()
                         event.type = HabiticaSnackbar.SnackbarDisplayType.FAILURE
                         event.text = "Quest invitation rejected"
@@ -80,7 +82,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/CollapsibleSectionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
index 0e7db3a04..a9098c66c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
@@ -7,30 +7,27 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ViewCollapsibleSectionBinding
 import com.habitrpg.android.habitica.extensions.getThemeColor
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.extensions.layoutInflater
 
-class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
-
-    private val separatorView: View by bindView(R.id.separator)
-    private val titleView: LinearLayout by bindView(R.id.title_view)
-    private val titleLabel: TextView by bindView(R.id.titleTextView)
-    private val caretView: ImageView by bindView(R.id.caretView)
-    val infoIconView: ImageView by bindView(R.id.infoIconView)
+class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+    val infoIconView: ImageView
+    get() = binding.infoIconView
+    private val binding = ViewCollapsibleSectionBinding.inflate(context.layoutInflater, this)
     private var preferences: SharedPreferences? = null
-    private val padding = context?.resources?.getDimension(R.dimen.spacing_large)?.toInt() ?: 0
-    private val bottomPadding = context?.resources?.getDimension(R.dimen.collapsible_section_padding)?.toInt() ?: 0
+    private val padding = context.resources?.getDimension(R.dimen.spacing_large)?.toInt() ?: 0
+    private val bottomPadding = context.resources?.getDimension(R.dimen.collapsible_section_padding)?.toInt() ?: 0
 
     var title: CharSequence
     get() {
-        return titleLabel.text
+        return binding.titleTextView.text
     }
     set(value) {
-        titleLabel.text = value
+        binding.titleTextView.text = value
     }
 
     private var isCollapsed = false
@@ -53,18 +50,18 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
 
     var separatorColor: Int
     get() {
-        return (separatorView.background as? ColorDrawable)?.color ?: 0
+        return (binding.separator.background as? ColorDrawable)?.color ?: 0
     }
     set(value) {
-        separatorView.setBackgroundColor(value)
+        binding.separator.setBackgroundColor(value)
     }
 
     private fun showViews() {
         updatePreferences()
         setCaretImage()
-        (2 until childCount)
-                .filter { getChildAt(it) != titleView }
-                .forEach { getChildAt(it).visibility = View.VISIBLE }
+        (0 until childCount)
+                .map { getChildAt(it) }
+                .forEach { it.visibility = View.VISIBLE }
     }
 
     private fun hideViews() {
@@ -72,6 +69,7 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
         setCaretImage()
         (2 until childCount)
                 .map { getChildAt(it) }
+                .filter { it != binding.sectionTitleView }
                 .forEach {
                     it.visibility = View.GONE
                 }
@@ -85,12 +83,13 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
     }
 
     private fun setCaretImage() {
-        caretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(caretColor, isCollapsed))
+        binding.caretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(caretColor, isCollapsed))
     }
 
     private fun setChildMargins() {
         (2 until childCount)
                 .map { getChildAt(it) }
+                .filter { it != binding.sectionTitleView }
                 .forEach {
                     val lp = it.layoutParams as? LayoutParams
                     lp?.setMargins(padding, 0, padding, bottomPadding)
@@ -105,10 +104,10 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         var height = 0
-        measureChildWithMargins(separatorView, widthMeasureSpec, 0, heightMeasureSpec, height)
-        height += separatorView.measuredHeight
-        measureChildWithMargins(titleView, widthMeasureSpec, 0, heightMeasureSpec, height)
-        height += titleView.measuredHeight
+        measureChildWithMargins(binding.separator, widthMeasureSpec, 0, heightMeasureSpec, height)
+        height += binding.separator.measuredHeight
+        measureChildWithMargins(binding.sectionTitleView, widthMeasureSpec, 0, heightMeasureSpec, height)
+        height += binding.sectionTitleView.measuredHeight
         (2 until childCount)
                 .map { getChildAt(it) }
                 .forEach {
@@ -124,15 +123,12 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
     }
 
     init {
-        View.inflate(context, R.layout.view_collapsible_section, this)
-        context?.let {
-            caretColor = ContextCompat.getColor(it, R.color.black_50_alpha)
-        }
+        caretColor = ContextCompat.getColor(context, R.color.black_50_alpha)
         orientation = VERTICAL
-        titleView.setOnClickListener {
+        binding.sectionTitleView.setOnClickListener {
             isCollapsed = !isCollapsed
         }
-        val attributes = context?.theme?.obtainStyledAttributes(
+        val attributes = context.theme?.obtainStyledAttributes(
                 attrs,
                 R.styleable.CollapsibleSectionView,
                 0, 0)
@@ -142,13 +138,13 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
         val color = attributes?.getColor(R.styleable.CollapsibleSectionView_color, 0)
         if (color != null && color != 0) {
             caretColor = color
-            titleLabel.setTextColor(color)
+            binding.titleTextView.setTextColor(color)
         }
 
         if (attributes?.getBoolean(R.styleable.CollapsibleSectionView_hasAdditionalInfo, false) == true) {
-            infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(context.getThemeColor(R.attr.colorPrimaryOffset)))
+            binding.infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(context.getThemeColor(R.attr.colorPrimaryOffset)))
         } else {
-            infoIconView.visibility = View.GONE
+            binding.infoIconView.visibility = View.GONE
         }
     }
 
@@ -163,6 +159,6 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
     }
 
     fun setCaretOffset(offset: Int) {
-        caretView.setPadding(0, 0, offset, 0)
+        binding.caretView.setPadding(0, 0, offset, 0)
     }
 }
\ No newline at end of file
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..445e9052b 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,9 +9,11 @@ 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 {
+    var hideWhenEmpty: Boolean = false
     var lightBackground: Boolean = false
         set(value) {
             field = value
@@ -31,10 +33,11 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
                 attrs,
                 R.styleable.CurrencyViews,
                 0, 0)
+        val fallBackLight = !context.isUsingNightModeResources()
         lightBackground = try {
-            attributes?.getBoolean(R.styleable.CurrencyView_hasLightBackground, true) ?: true
+            attributes?.getBoolean(R.styleable.CurrencyView_hasLightBackground, fallBackLight) ?: fallBackLight
         } catch (_: ArrayIndexOutOfBoundsException) {
-            true
+            !context.isUsingNightModeResources()
         }
         visibility = GONE
     }
@@ -78,6 +81,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
                 setTextColor(ContextCompat.getColor(context, R.color.brand_500))
             }
         }
+        hideWhenEmpty = "hourglasses" == currency
     }
 
     private var drawable: BitmapDrawable? = null
@@ -110,21 +114,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
         if (field != value) {
             field = value
             if (isLocked) {
-                this.setTextColor(ContextCompat.getColor(context, R.color.gray_300))
-                drawable?.alpha = 127
-            } else {
-                drawable?.alpha = 255
-            }
-            this.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
-        }
-    }
-
-    var cantAfford = false
-    set(value) {
-        if (field != value) {
-            field = value
-            if (value) {
-                this.setTextColor(ContextCompat.getColor(context, R.color.red_50))
+                this.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
                 drawable?.alpha = 127
             } else {
                 drawable?.alpha = 255
@@ -134,7 +124,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
     }
 
     private fun updateVisibility() {
-        visibility = if ("hourglasses" == this.currency) {
+        visibility = if (hideWhenEmpty) {
             if ("0" == text) View.GONE else View.VISIBLE
         } else {
             View.VISIBLE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
index cdd4bd92c..c2b70fcc9 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
@@ -28,6 +29,19 @@ class CurrencyViews : LinearLayout {
         get() = hourglassTextView.value
         set(value) { hourglassTextView.value = value }
 
+    var hourglassVisibility
+        get() = hourglassTextView.visibility
+        set(value) {
+            hourglassTextView.visibility = value
+            hourglassTextView.hideWhenEmpty = false
+        }
+    var goldVisibility: Int
+        get() = goldTextView.visibility
+        set(value) { goldTextView.visibility = value }
+    var gemVisibility
+        get() = gemTextView.visibility
+        set(value) { gemTextView.visibility = value }
+
 
     constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
         val attributes = context?.theme?.obtainStyledAttributes(
@@ -35,7 +49,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) {
@@ -51,6 +66,7 @@ class CurrencyViews : LinearLayout {
 
     private fun setupView(view: CurrencyView, margin: Int) {
         this.addView(view)
+        view.textSize = 12f
         val params = view.layoutParams as? LayoutParams
         params?.marginStart = margin
         view.layoutParams = params
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt
new file mode 100644
index 000000000..ac487cdb6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt
@@ -0,0 +1,22 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
+
+
+class DayNightTextView(context: Context, attrs: AttributeSet?) : AppCompatTextView(context, attrs) {
+
+    init {
+        val attributes = context.theme?.obtainStyledAttributes(attrs, R.styleable.DayNightTextView, 0, 0)
+        setTextColor(if (context.isUsingNightModeResources()) {
+            attributes?.getColor(R.styleable.DayNightTextView_nightTextColor, ContextCompat.getColor(context, R.color.text_primary))
+        } else {
+            attributes?.getColor(R.styleable.DayNightTextView_dayTextColor, ContextCompat.getColor(context, R.color.text_primary))
+        } ?: ContextCompat.getColor(context, R.color.text_primary))
+    }
+
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
index 6106117fe..042f80630 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
@@ -77,11 +77,11 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
         fun onSwap(firstView: View?, firstPosition: Int, secondView: View, secondPosition: Int)
     }
 
-    private inner class DraggableChild {
+    private class DraggableChild {
         /**
          * 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..27481f8f4 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 16. 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 fillColor6 = Color.argb(128, 181, 36, 40);
-        int fillColor4 = Color.argb(89, 181, 36, 40);
-        int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int heartDarkBackground = Color.argb(178, 255, 255, 255);
         int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor4 = Color.argb(89, 181, 36, 40);
+        int heartLightBackground = Color.argb(255, 247, 78, 82);
         
         // Local Variables
         int expression = darkBackground ? heartDarkBackground : heartLightBackground;
@@ -376,11 +376,11 @@ public class HabiticaIcons {
         Paint paint = CacheForExperience.paint;
         
         // 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 fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor12 = Color.argb(128, 191, 125, 26);
+        int fillColor11 = Color.argb(64, 191, 125, 26);
         
         // Resize to Target Frame
         canvas.save();
@@ -607,11 +607,11 @@ public class HabiticaIcons {
         Paint paint = CacheForMagic.paint;
         
         // Local Colors
+        int fillColor7 = Color.argb(255, 41, 149, 205);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
+        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
         canvas.save();
@@ -758,9 +758,9 @@ public class HabiticaIcons {
         Paint paint = CacheForGold.paint;
         
         // Local Colors
+        int fillColor10 = Color.argb(255, 255, 166, 35);
         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);
         
@@ -912,10 +912,10 @@ public class HabiticaIcons {
         Paint paint = CacheForGem.paint;
         
         // Local Colors
-        int fillColor15 = Color.argb(89, 27, 153, 107);
-        int fillColor14 = Color.argb(255, 36, 204, 143);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor15 = Color.argb(89, 27, 153, 107);
+        int fillColor14 = Color.argb(255, 36, 204, 143);
         
         // Resize to Target Frame
         canvas.save();
@@ -1121,10 +1121,10 @@ public class HabiticaIcons {
         Paint paint = CacheForHourglass.paint;
         
         // Local Colors
+        int fillColor19 = Color.argb(255, 79, 42, 147);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
         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);
         
         // Resize to Target Frame
         canvas.save();
@@ -1541,12 +1541,12 @@ public class HabiticaIcons {
         // Local Colors
         int fillColor43 = Color.argb(255, 200, 43, 43);
         int fillColor22 = Color.argb(255, 242, 123, 134);
+        int fillColor23 = Color.argb(255, 229, 65, 77);
+        int fillColor = Color.argb(255, 240, 97, 102);
         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 fillColor = Color.argb(255, 240, 97, 102);
         
         // 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;
@@ -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 fillColor38 = Color.argb(255, 165, 161, 172);
+        int strokeColor = Color.argb(255, 97, 51, 180);
+        int strokeColor2 = Color.argb(255, 189, 168, 255);
         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);
         
         // 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 fillColor36 = Color.argb(255, 97, 51, 180);
         int fillColor47 = Color.argb(255, 198, 182, 228);
-        int fillColor44 = Color.argb(255, 204, 190, 237);
+        int fillColor48 = Color.argb(255, 137, 102, 199);
+        int fillColor45 = Color.argb(255, 155, 129, 226);
         int fillColor19 = Color.argb(255, 79, 42, 147);
-        int fillColor46 = Color.argb(255, 122, 84, 192);
+        int fillColor44 = Color.argb(255, 204, 190, 237);
         
         // 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 fillColor57 = Color.argb(255, 255, 221, 181);
+        int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor56 = Color.argb(255, 255, 166, 35);
+        int fillColor49 = Color.argb(255, 255, 215, 168);
+        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);
         
         // 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 fillColor68 = Color.argb(255, 31, 110, 162);
+        int fillColor65 = Color.argb(255, 107, 196, 233);
+        int fillColor69 = Color.argb(255, 169, 219, 245);
+        int fillColor62 = Color.argb(255, 83, 180, 229);
         int fillColor67 = Color.argb(255, 83, 180, 229);
-        int fillColor70 = Color.argb(255, 132, 207, 242);
+        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 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 fillColor68 = Color.argb(255, 31, 110, 162);
+        int fillColor70 = Color.argb(255, 132, 207, 242);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6573,10 +6573,10 @@ public class HabiticaIcons {
         Paint paint = CacheForHourglassShop.paint;
         
         // Local Colors
+        int fillColor19 = Color.argb(255, 79, 42, 147);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
         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);
         
         // 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 fillColor71 = Color.argb(255, 80, 181, 233);
         int fillColor18 = Color.argb(255, 154, 98, 255);
+        int fillColor72 = Color.argb(255, 255, 97, 101);
         
         // 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);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
+        int fillColor71 = Color.argb(255, 80, 181, 233);
         
         // Resize to Target Frame
         canvas.save();
@@ -7202,36 +7202,36 @@ 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 strokeColor7 = Color.argb(255, 238, 145, 9);
+        int strokeColor5 = Color.argb(255, 225, 22, 27);
+        int strokeColor11 = Color.argb(255, 106, 52, 204);
+        int fillColor76 = Color.argb(255, 255, 182, 184);
+        int fillColor7 = Color.argb(255, 41, 149, 205);
         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 fillColor79 = Color.argb(255, 255, 190, 93);
+        int strokeColor4 = Color.argb(255, 136, 10, 10);
+        int fillColor82 = Color.argb(255, 154, 98, 255);
+        int fillColor2 = Color.argb(255, 255, 97, 101);
+        int strokeColor8 = Color.argb(255, 28, 163, 114);
+        int strokeColor6 = Color.argb(255, 236, 109, 23);
+        int strokeColor12 = Color.argb(255, 0, 87, 55);
+        int fillColor77 = Color.argb(255, 201, 43, 43);
+        int strokeColor10 = Color.argb(255, 5, 112, 168);
+        int fillColor80 = Color.argb(255, 63, 218, 162);
         int fillColor78 = Color.argb(255, 255, 148, 76);
+        int fillColor83 = Color.argb(255, 119, 244, 199);
         
         // Local Variables
+        boolean isTier1 = _1 == 1f && !isNPC;
+        boolean isTier2 = _1 == 2f && !isNPC;
+        boolean isTier3 = _1 == 3f && !isNPC;
+        boolean isTier4 = _1 == 4f && !isNPC;
+        boolean isTier5 = _1 == 5f && !isNPC;
+        boolean isTier6 = _1 == 6f && !isNPC;
         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 isTier1 = _1 == 1f && !isNPC;
-        boolean isTier6 = _1 == 6f && !isNPC;
         boolean isTier9 = _1 == 9f && !isNPC;
         
         // Resize to Target Frame
@@ -7575,8 +7575,8 @@ public class HabiticaIcons {
         Paint paint = CacheForChatLikeIcon.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
         int fillColor82 = Color.argb(255, 154, 98, 255);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
         
         // Local Variables
         int expression2 = wasLiked ? fillColor82 : fillColor25;
@@ -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 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 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 fillColor84 = Color.argb(255, 240, 97, 102);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor40 = Color.argb(255, 165, 161, 172);
+        int fillColor90 = Color.argb(179, 78, 74, 87);
+        int fillColor89 = Color.argb(255, 227, 143, 61);
+        int fillColor88 = Color.argb(255, 179, 98, 19);
+        int fillColor87 = Color.argb(255, 189, 168, 255);
+        int fillColor35 = Color.argb(255, 195, 192, 199);
         
         // Resize to Target Frame
         canvas.save();
@@ -8658,9 +8658,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor91 = Color.argb(255, 255, 200, 167);
-        int textForeground = Color.argb(255, 183, 90, 28);
         int strokeColor14 = Color.argb(255, 255, 148, 76);
         int strokeColor13 = Color.argb(255, 244, 120, 37);
+        int textForeground = Color.argb(255, 183, 90, 28);
         
         // Resize to Target Frame
         canvas.save();
@@ -8823,8 +8823,8 @@ public class HabiticaIcons {
         Paint paint = CacheForRageStrikeActive.paint;
         
         // Local Colors
-        int strokeColor14 = Color.argb(255, 255, 148, 76);
         int strokeColor13 = Color.argb(255, 244, 120, 37);
+        int strokeColor14 = Color.argb(255, 255, 148, 76);
         
         // Local Images
         PaintCodeBitmap pc_rageStrikeNPC = GlobalCache.rageStrikeNPC.get(rageStrikeNPC);
@@ -8962,13 +8962,13 @@ public class HabiticaIcons {
         Paint paint = CacheForRage.paint;
         
         // 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 fillColor93 = Color.argb(255, 244, 120, 37);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor14 = Color.argb(255, 36, 204, 143);
         int fillColor92 = Color.argb(255, 90, 228, 178);
         int fillColor94 = Color.argb(89, 180, 89, 27);
-        int fillColor14 = Color.argb(255, 36, 204, 143);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
         
         // 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();
@@ -9497,14 +9497,14 @@ public class HabiticaIcons {
         Paint paint = CacheForHabitControlPlus.paint;
         
         // Local Colors
-        int strokeColor15 = Color.argb(255, 195, 192, 199);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
         int transparent = Color.argb(0, 204, 82, 82);
+        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
         
         // Local Variables
-        int borderColor = isActive ? taskTintColor : strokeColor15;
         int controlFillColor = isActive ? fillColor37 : strokeColor15;
         int starFillColor = isActive ? taskTintColor : transparent;
+        int borderColor = isActive ? taskTintColor : strokeColor15;
         
         // Resize to Target Frame
         canvas.save();
@@ -9585,14 +9585,14 @@ public class HabiticaIcons {
         Paint paint = CacheForHabitControlMinus.paint;
         
         // Local Colors
-        int strokeColor15 = Color.argb(255, 195, 192, 199);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
         int transparent = Color.argb(0, 204, 82, 82);
+        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
         
         // Local Variables
-        int borderColor = isActive ? taskTintColor : strokeColor15;
         int controlFillColor = isActive ? fillColor37 : strokeColor15;
         int starFillColor = isActive ? taskTintColor : transparent;
+        int borderColor = isActive ? taskTintColor : 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 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 crestBronze3 = Color.argb(255, 179, 98, 19);
+        int crestGold5 = Color.argb(255, 223, 145, 30);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestGold6 = Color.argb(255, 223, 145, 30);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
         int crestGold3 = Color.argb(255, 223, 145, 30);
+        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 crestGold1 = Color.argb(255, 255, 188, 90);
+        int crestBronze5 = Color.argb(255, 179, 98, 19);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze4 = Color.argb(255, 215, 122, 32);
         
         // Local Variables
+        boolean isPrivate = !isPublic;
         int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
+        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
         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 crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
         
         // Resize to Target Frame
         canvas.save();
@@ -10378,26 +10378,26 @@ 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 crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestGold6 = Color.argb(255, 223, 145, 30);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
         int crestBronze1 = Color.argb(255, 234, 140, 49);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
         int crestGold3 = Color.argb(255, 223, 145, 30);
+        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 crestGold1 = Color.argb(255, 255, 188, 90);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze4 = Color.argb(255, 215, 122, 32);
         
         // Local Variables
-        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 crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
+        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
         int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
         
@@ -10579,10 +10579,10 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildCrestSmall.paint;
         
         // Local Colors
+        int crestGold4 = Color.argb(255, 255, 166, 35);
         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);
         
         // Local Variables
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
@@ -10694,13 +10694,13 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildHeaderCrest.paint;
         
         // Local Colors
-        int guildHeaderDark2 = PaintCodeColor.colorByChangingValue(guildHeader, 0.7f);
-        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 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 textForeground2 = Color.argb(255, 255, 255, 255);
         
         // Resize to Target Frame
@@ -11640,8 +11640,8 @@ public class HabiticaIcons {
         
         // Local Variables
         float filterNode1Position = 3f + 10f * percentage;
-        float filterNode2Position = 13f - 10f * percentage;
         float filterNode3Position = 3f + 5f * percentage;
+        float filterNode2Position = 13f - 10f * percentage;
         
         // 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();
@@ -12655,13 +12655,13 @@ public class HabiticaIcons {
         Paint paint = CacheForStats.paint;
         
         // 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 fillColor40 = Color.argb(255, 165, 161, 172);
+        int fillColor106 = Color.argb(255, 216, 216, 216);
         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 fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor35 = Color.argb(255, 195, 192, 199);
         
         // Resize to Target Frame
         canvas.save();
@@ -13640,8 +13640,6 @@ public class HabiticaIcons {
         private static Paint paint = new Paint();
         private static RectF originalFrame = new RectF(0f, 0f, 132f, 35f);
         private static RectF resizedFrame = new RectF();
-        private static RectF rectangleRect = new RectF();
-        private static Path rectanglePath = new Path();
         private static RectF bezierRect = new RectF();
         private static Path bezierPath = new Path();
         private static RectF bezier2Rect = new RectF();
@@ -13679,9 +13677,8 @@ public class HabiticaIcons {
         Paint paint = CacheForSpookyGemPromoBG.paint;
         
         // Local Colors
-        int fillColor109 = Color.argb(255, 250, 133, 55);
         int strokeColor24 = Color.argb(255, 146, 92, 243);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int fillColor109 = Color.argb(255, 250, 133, 55);
         int fillColor73 = Color.argb(255, 255, 180, 69);
         
         // Resize to Target Frame
@@ -13691,19 +13688,6 @@ public class HabiticaIcons {
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 132f, resizedFrame.height() / 35f);
         
-        // Rectangle
-        RectF rectangleRect = CacheForSpookyGemPromoBG.rectangleRect;
-        rectangleRect.set(-199f, -765f, 161f, 404f);
-        Path rectanglePath = CacheForSpookyGemPromoBG.rectanglePath;
-        rectanglePath.reset();
-        rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-        
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(fillColor37);
-        canvas.drawPath(rectanglePath, paint);
-        
         // Bezier
         RectF bezierRect = CacheForSpookyGemPromoBG.bezierRect;
         bezierRect.set(22.7f, 18.97f, 27.3f, 23.03f);
@@ -13987,6 +13971,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 +14708,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) {
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..71d2aabd8 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
@@ -256,7 +256,7 @@ public class HabiticaIconsHelper {
         if (imageOfPinItem != null)
             return imageOfPinItem;
 
-        int size = scaleSize(40);
+        int size = scaleSize(24);
         imageOfPinItem = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfPinItem);
         canvas.scale(displayDensity, displayDensity);
@@ -270,7 +270,7 @@ public class HabiticaIconsHelper {
         if (imageOfUnpinItem != null)
             return imageOfUnpinItem;
 
-        int size = scaleSize(40);
+        int size = scaleSize(24);
         imageOfUnpinItem = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfUnpinItem);
         canvas.scale(displayDensity, displayDensity);
@@ -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)
@@ -603,11 +630,14 @@ public class HabiticaIconsHelper {
     }
 
     public static Bitmap imageOfLocked(@ColorInt int lockColor) {
-        Bitmap imageOfLocked = Bitmap.createBitmap(scaleSize(15), scaleSize(17), Bitmap.Config.ARGB_8888);
+        return imageOfLocked(lockColor, 15, 17);
+    }
+
+        public static Bitmap imageOfLocked(@ColorInt int lockColor, int width, int height) {
+        Bitmap imageOfLocked = Bitmap.createBitmap(scaleSize(width), scaleSize(height), Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfLocked);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawLocked(canvas, lockColor);
-
+        HabiticaIcons.drawLocked(canvas, new RectF(0f, 0f, width, height), HabiticaIcons.ResizingBehavior.AspectFit, lockColor);
         return imageOfLocked;
     }
 
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..713706086 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
@@ -1,33 +1,42 @@
 package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.PorterDuff
+import android.os.Build
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
+import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import androidx.core.widget.ImageViewCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ProgressBarBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import kotlin.math.min
 
 
 class HabiticaProgressBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
-
-    private val barView: View by bindView(R.id.bar)
-    private val pendingBarView: View by bindView(R.id.pendingBar)
-    private val barEmptySpace: View by bindView(R.id.emptyBarSpace)
-    private val pendingEmptyBarSpace: View by bindView(R.id.pendingEmptyBarSpace)
+    val binding = ProgressBarBinding.inflate(context.layoutInflater, this)
 
     var barForegroundColor: Int = 0
     set(value) {
         field = value
-        DataBindingUtils.setRoundedBackground(barView, value)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            DataBindingUtils.setRoundedBackground(binding.bar, value)
+        } else {
+            val bar: ImageView = findViewById(R.id.bar)
+            ImageViewCompat.setImageTintList(bar, ColorStateList.valueOf(field))
+            ImageViewCompat.setImageTintMode(bar, PorterDuff.Mode.SRC_IN)
+        }
     }
 
     var barPendingColor: Int = 0
         set(value) {
             field = value
-            DataBindingUtils.setRoundedBackground(pendingBarView, value)
+            DataBindingUtils.setRoundedBackground(binding.pendingBar, value)
         }
 
     var barBackgroundColor: Int = 0
@@ -49,7 +58,6 @@ class HabiticaProgressBar(context: Context, attrs: AttributeSet?) : FrameLayout(
             }
         }
 
-
     private fun updateBar() {
         val remainingValue = currentValue - pendingValue
         val remainingPercent = if (remainingValue < 0) {
@@ -77,12 +85,12 @@ class HabiticaProgressBar(context: Context, attrs: AttributeSet?) : FrameLayout(
 
 
     private fun setBarWeight(percent: Double) {
-        setLayoutWeight(barView, percent)
-        setLayoutWeight(barEmptySpace, 1.0f - percent)
+        setLayoutWeight(binding.bar, percent)
+        setLayoutWeight(binding.emptyBarSpace, 1.0f - percent)
     }
     private fun setPendingBarWeight(percent: Double) {
-        setLayoutWeight(pendingBarView, percent)
-        setLayoutWeight(pendingEmptyBarSpace, 1.0f - percent)
+        setLayoutWeight(binding.pendingBar, percent)
+        setLayoutWeight(binding.pendingEmptyBarSpace, 1.0f - percent)
     }
 
 
@@ -109,9 +117,8 @@ class HabiticaProgressBar(context: Context, attrs: AttributeSet?) : FrameLayout(
             layout?.weight = weight.toFloat()
             view.layoutParams = layout
         } else if (layout?.weight?.toDouble() != weight) {
-            val anim = DataBindingUtils.LayoutWeightAnimation(view, weight.toFloat())
-            anim.duration = 300
-            view.startAnimation(anim)
+            layout?.weight = weight.toFloat()
+            view.layoutParams = layout
         }
     }
 }
\ No newline at end of file
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..f61e834c9 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
@@ -7,21 +7,17 @@ import android.graphics.drawable.BitmapDrawable
 import android.util.AttributeSet
 import android.widget.FrameLayout
 import android.widget.ImageView
-import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.NpcBannerBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import kotlin.math.roundToInt
 
 class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
-
-    private val backgroundView: ImageView by bindView(R.id.backgroundView)
-    private val sceneView: SimpleDraweeView by bindView(R.id.sceneView)
+    private val binding = NpcBannerBinding.inflate(context.layoutInflater, this)
 
     var shopSpriteSuffix: String = ""
         set(value) {
@@ -40,14 +36,10 @@ class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(contex
         setImage()
     }
 
-    init {
-        context?.layoutInflater?.inflate(R.layout.npc_banner, this)
-    }
-
     private fun setImage() {
-        DataBindingUtils.loadImage(sceneView, identifier + "_scene" + shopSpriteSuffix)
+        DataBindingUtils.loadImage(binding.sceneView, identifier + "_scene" + shopSpriteSuffix)
 
-        backgroundView.scaleType = ImageView.ScaleType.FIT_START
+        binding.backgroundView.scaleType = ImageView.ScaleType.FIT_START
 
         DataBindingUtils.loadImage(identifier + "_background" + shopSpriteSuffix) {
             val aspectRatio = it.width / it.height.toFloat()
@@ -57,8 +49,8 @@ class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(contex
             drawable.tileModeX = Shader.TileMode.REPEAT
             Observable.just(drawable)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(Consumer {
-                        backgroundView.background = it
+                    .subscribe({
+                        binding.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..a40663e6e 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
@@ -5,34 +5,51 @@ import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.View
-import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ValueBarBinding
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.getThemeColor
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import java.math.RoundingMode
 import java.text.NumberFormat
 
 
 class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
 
-    private val iconView: ImageView by bindView(R.id.ic_header)
-    private val secondaryIconView: ImageView by bindView(R.id.secondaryIconView)
-    private val descriptionIconView: ImageView by bindView(R.id.descriptionIconView)
-    private val valueTextView: TextView by bindView(R.id.valueLabel)
-    private val descriptionTextView: TextView by bindView(R.id.descriptionLabel)
-    private val progressBar: HabiticaProgressBar by bindView(R.id.progressBar)
-    private val labelWrapper: ViewGroup by bindView(R.id.labelWrapper)
+    var descriptionIconVisibility: Int
+        get() = binding.descriptionIconView.visibility
+        set(value) {
+            binding.descriptionIconView.visibility = value
+        }
 
+    private var binding: ValueBarBinding = ValueBarBinding.inflate(context.layoutInflater, this, true)
     private val formatter = NumberFormat.getInstance()
 
     private var currentValue: Double = 0.0
     private var maxValue: Double = 0.0
 
+    var barForegroundColor: Int
+        get() = binding.progressBar.barForegroundColor
+        set(value) {
+            binding.progressBar.barForegroundColor = value
+        }
+
+    var barPendingColor: Int
+        get() = binding.progressBar.barPendingColor
+        set(value) {
+            binding.progressBar.barPendingColor = value
+        }
+
+    var barBackgroundColor: Int
+        get() = binding.progressBar.barBackgroundColor
+        set(value) {
+            binding.progressBar.barBackgroundColor = value
+        }
+
     var pendingValue: Double = 0.0
         set(value) {
             if (field != value) {
@@ -45,49 +62,48 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
     set(value) {
         field = value
         if (value != null) {
-            progressBar.layoutParams.height = value
+            binding.progressBar.layoutParams.height = value
         }
     }
 
     var description: String = ""
     set(value) {
         field = value
-        descriptionTextView.text = description
+        binding.descriptionTextView.text = description
     }
 
     private fun updateBar() {
-        progressBar.set(currentValue, maxValue)
-        this.progressBar.pendingValue = pendingValue
-        this.setValueText(formatter.format(currentValue) + " / " + formatter.format(maxValue.toInt()))
+        binding.progressBar.set(currentValue, maxValue)
+        binding.progressBar.pendingValue = pendingValue
+        setValueText(formatter.format(currentValue) + " / " + formatter.format(maxValue.toInt()))
     }
 
     init {
-        View.inflate(context, R.layout.value_bar, this)
 
         val attributes = context.theme?.obtainStyledAttributes(
                 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
-        progressBar.barBackgroundColor = attributes?.getColor(R.styleable.ValueBar_barBackgroundColor, 0) ?: 0
+        binding.progressBar.barForegroundColor = attributes?.getColor(R.styleable.ValueBar_barForegroundColor, 0) ?: 0
+        binding.progressBar.barPendingColor = attributes?.getColor(R.styleable.ValueBar_barPendingColor, 0) ?: 0
+        binding.progressBar.barBackgroundColor = attributes?.getColor(R.styleable.ValueBar_barBackgroundColor, 0) ?: 0
 
         val labelSpacing = attributes?.getDimension(R.styleable.ValueBar_labelSpacing, 2.dpToPx(context).toFloat())
         if (labelSpacing != null) {
-            labelWrapper.setPadding(0, labelSpacing.toInt(), 0, 0)
+            binding.labelWrapper.setPadding(0, labelSpacing.toInt(), 0, 0)
         }
 
         barHeight = attributes?.getDimension(R.styleable.ValueBar_barHeight, context.resources.getDimension(R.dimen.bar_size))?.toInt()
 
         val valueTextColor = attributes?.getColor(R.styleable.ValueBar_valueTextColor, 0) ?: 0
         if (valueTextColor != 0) {
-            valueTextView.setTextColor(valueTextColor)
+            binding.valueTextView.setTextColor(valueTextColor)
         }
         val descriptionTextColor = attributes?.getColor(R.styleable.ValueBar_descriptionTextColor, 0) ?: 0
         if (descriptionTextColor != 0) {
-            descriptionTextView.setTextColor(descriptionTextColor)
+            binding.descriptionTextView.setTextColor(descriptionTextColor)
         }
 
         val iconRes = attributes?.getDrawable(R.styleable.ValueBar_barIconDrawable)
@@ -95,7 +111,7 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
             setIcon(iconRes)
         }
 
-        descriptionTextView.text = attributes?.getString(R.styleable.ValueBar_description)
+        binding.descriptionTextView.text = attributes?.getString(R.styleable.ValueBar_description)
 
         formatter.maximumFractionDigits = 1
         formatter.roundingMode = RoundingMode.UP
@@ -103,50 +119,50 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
     }
 
     fun setIcon(iconRes: Drawable) {
-        iconView.setImageDrawable(iconRes)
-        iconView.visibility = View.VISIBLE
+        binding.iconView.setImageDrawable(iconRes)
+        binding.iconView.visibility = View.VISIBLE
     }
 
     fun setIcon(bitmap: Bitmap) {
-        iconView.setImageBitmap(bitmap)
-        iconView.visibility = View.VISIBLE
+        binding.iconView.setImageBitmap(bitmap)
+        binding.iconView.visibility = View.VISIBLE
     }
 
     fun setSecondaryIcon(iconRes: Drawable) {
-        secondaryIconView.setImageDrawable(iconRes)
-        secondaryIconView.visibility = View.VISIBLE
+        binding.secondaryIconView.setImageDrawable(iconRes)
+        binding.secondaryIconView.visibility = View.VISIBLE
     }
 
     fun setSecondaryIcon(bitmap: Bitmap) {
-        secondaryIconView.setImageBitmap(bitmap)
-        secondaryIconView.visibility = View.VISIBLE
+        binding.secondaryIconView.setImageBitmap(bitmap)
+        binding.secondaryIconView.visibility = View.VISIBLE
     }
 
     fun setDescriptionIcon(iconRes: Drawable) {
-        descriptionIconView.setImageDrawable(iconRes)
-        descriptionIconView.visibility = View.VISIBLE
+        binding.descriptionIconView.setImageDrawable(iconRes)
+        binding.descriptionIconView.visibility = View.VISIBLE
     }
 
     fun setDescriptionIcon(bitmap: Bitmap) {
-        descriptionIconView.setImageBitmap(bitmap)
-        descriptionIconView.visibility = View.VISIBLE
+        binding.descriptionIconView.setImageBitmap(bitmap)
+        binding.descriptionIconView.visibility = View.VISIBLE
     }
 
     fun setValueText(valueText: String) {
-        valueTextView.text = valueText
+        binding.valueTextView.text = valueText
     }
 
     fun setLightBackground(lightBackground: Boolean) {
         val textColor: Int
         if (lightBackground) {
-            textColor = ContextCompat.getColor(context, R.color.gray_10)
-            progressBar.setBackgroundResource(R.drawable.layout_rounded_bg_light_gray)
+            textColor = ContextCompat.getColor(context, R.color.text_ternary)
+            binding.progressBar.setBackgroundResource(R.drawable.layout_rounded_bg_light_gray)
         } else {
             textColor = context.getThemeColor(R.attr.textColorPrimaryDark)
-            progressBar.setBackgroundResource(R.drawable.layout_rounded_bg_header_bar)
+            binding.progressBar.setBackgroundResource(R.drawable.layout_rounded_bg_header_bar)
         }
-        valueTextView.setTextColor(textColor)
-        descriptionTextView.setTextColor(textColor)
+        binding.valueTextView.setTextColor(textColor)
+        binding.descriptionTextView.setTextColor(textColor)
     }
 
     fun set(value: Double, valueMax: Double) {
@@ -158,7 +174,7 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
     }
 
     fun setLabelVisibility(visibility: Int) {
-        valueTextView.visibility = visibility
-        descriptionTextView.visibility = visibility
+        binding.valueTextView.visibility = visibility
+        binding.descriptionTextView.visibility = visibility
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt
index 60e79aeb4..b2b8a0ce8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt
@@ -1,15 +1,13 @@
 package com.habitrpg.android.habitica.ui.views.adventureGuide
 
 import android.content.Context
-import android.os.Build
-import android.text.Html
 import android.util.AttributeSet
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.AdventureGuideMenuBannerBinding
-import com.habitrpg.android.habitica.databinding.EquipmentOverviewItemBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.user.User
 
@@ -22,11 +20,7 @@ class AdventureGuideMenuBanner @JvmOverloads constructor(
     init {
         background = ContextCompat.getDrawable(context, R.drawable.adventure_guide_menu_bg)
         val descriptionText = context.getString(R.string.complete_for_gold)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            binding.descriptionView.setText(Html.fromHtml(descriptionText,  Html.FROM_HTML_MODE_LEGACY), TextView.BufferType.SPANNABLE)
-        } else {
-            binding.descriptionView.setText(Html.fromHtml(descriptionText), TextView.BufferType.SPANNABLE)
-        }
+        binding.descriptionView.setText(descriptionText.fromHtml(), TextView.BufferType.SPANNABLE)
     }
 
     fun updateData(user: User) {
@@ -34,6 +28,6 @@ class AdventureGuideMenuBanner @JvmOverloads constructor(
         val completed = achievements.count { it.earned }
         binding.progressBar.max = achievements.size
         binding.progressBar.progress = completed
-        binding.countView.text = "${completed} / ${achievements.size}"
+        binding.countView.text = "$completed / ${achievements.size}"
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt
index a1ba22e5f..e621f0df1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt
@@ -6,6 +6,7 @@ import android.widget.TextView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.addCloseButton
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 
@@ -21,7 +22,7 @@ class AchievementDetailDialog(val achievement: Achievement, context: Context): H
         descriptionView = view?.findViewById(R.id.description_view)
         setAdditionalContentView(view)
         setTitle(achievement.title)
-        descriptionView?.text = achievement.text
+        descriptionView?.setText(achievement.text?.fromHtml(), TextView.BufferType.SPANNABLE)
         val iconName = if (achievement.earned) {
             achievement.icon + "2x"
         } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
index 575e5b464..96bbd1821 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
@@ -2,13 +2,12 @@ package com.habitrpg.android.habitica.ui.views.dialogs
 
 import android.content.Context
 import android.graphics.Typeface
-import android.os.Build
-import android.text.Html
 import android.util.TypedValue
 import android.view.View
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogAchievementDetailBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.Notification
@@ -25,7 +24,7 @@ class AchievementDialog(context: Context) : HabiticaAlertDialog(context) {
         setAdditionalContentView(binding.root)
     }
 
-    fun setType(type: String) {
+    fun setType(type: String, message: String?, text: String?) {
         when (type) {
             Notification.Type.ACHIEVEMENT_PARTY_UP.type -> configure(R.string.partyUpTitle, R.string.partyUpDescription, "partyUp")
             Notification.Type.ACHIEVEMENT_PARTY_ON.type -> configure(R.string.partyOnTitle, R.string.partyOnDescription, "partyOn")
@@ -41,12 +40,17 @@ class AchievementDialog(context: Context) : HabiticaAlertDialog(context) {
             "fedPet" -> configure(R.string.fedPetTitle, R.string.fedPetDescription, type)
             "purchasedEquipment" -> configure(R.string.purchasedEquipmentTitle, R.string.purchasedEquipmentDescription, type)
             Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type -> configure(R.string.onboardingCompleteTitle, R.string.onboardingCompleteDescription, "onboardingComplete")
+            else -> configure(message ?: "", text ?: "", type)
         }
     }
 
     private fun configure(titleID: Int, descriptionID: Int, iconName: String) {
-        binding.titleView.text = context.getString(titleID)
-        binding.descriptionView.text = context.getString(descriptionID)
+        configure(context.getString(titleID), context.getString(descriptionID), iconName)
+    }
+
+    private fun configure(title: String, description: String, iconName: String) {
+        binding.titleView.text = title
+        binding.descriptionView.setText(description.fromHtml(), TextView.BufferType.SPANNABLE)
         DataBindingUtils.loadImage(binding.iconView, "achievement-${iconName}2x")
         if (iconName == "onboardingComplete") {
             setTitle(R.string.onboardingComplete_achievement_title)
@@ -54,12 +58,7 @@ class AchievementDialog(context: Context) : HabiticaAlertDialog(context) {
             binding.achievementWrapper.visibility = View.GONE
             binding.onboardingDoneIcon.visibility = View.VISIBLE
             binding.titleView.typeface = Typeface.DEFAULT
-            val titleText = context.getString(titleID)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                binding.titleView.setText(Html.fromHtml(titleText,  Html.FROM_HTML_MODE_LEGACY), TextView.BufferType.SPANNABLE)
-            } else {
-                binding.titleView.setText(Html.fromHtml(titleText), TextView.BufferType.SPANNABLE)
-            }
+            binding.titleView.setText(title.fromHtml(), TextView.BufferType.SPANNABLE)
         } else {
             setTitle(R.string.achievement_title)
             binding.achievementWrapper.visibility = View.VISIBLE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt
index 0e4989234..af3c341f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt
@@ -2,12 +2,9 @@ package com.habitrpg.android.habitica.ui.views.dialogs
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
-import android.widget.TextView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.Notification
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 
 class FirstDropDialog(context: Context) : HabiticaAlertDialog(context) {
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..04aa7d6b5 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
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.views.dialogs
 import android.app.Activity
 import android.content.Context
 import android.text.method.ScrollingMovementMethod
-import android.util.Log
 import android.view.*
 import android.view.animation.AccelerateInterpolator
 import android.widget.*
@@ -14,21 +13,33 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.extensions.setScaledPadding
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragmentDirections
+import com.habitrpg.android.habitica.ui.views.login.LockableScrollView
 import com.plattysoft.leonids.ParticleSystem
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import java.lang.ref.WeakReference
 
 
-
 open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.HabiticaAlertDialogTheme) {
 
+    var buttonAxis: Int = LinearLayout.VERTICAL
+    set(value) {
+        field = value
+        updateButtonLayout()
+    }
     var isCelebratory: Boolean = false
     private val view: RelativeLayout = LayoutInflater.from(context).inflate(R.layout.dialog_habitica_base, null) as RelativeLayout
+    private val dialogWrapper: LinearLayout
     private val dialogContainer: LinearLayout
     private var titleTextView: TextView
     private var messageTextView: TextView
     internal var contentView: FrameLayout
     private var scrollingSeparator: View
+    internal var scrollView: LockableScrollView
     private var buttonsWrapper: LinearLayout
     private var noticeTextView: TextView
     private var closeButton: Button
@@ -50,13 +61,23 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
         updateButtonLayout()
     }
 
+    var dialogWidth = 320
+    set(value) {
+        field = value
+        val layoutParams = dialogWrapper.layoutParams
+        layoutParams.width = value
+        dialogWrapper.layoutParams = layoutParams
+    }
+
     init {
         setView(view)
+        dialogWrapper = view.findViewById(R.id.dialog_wrapper)
         dialogContainer = view.findViewById(R.id.dialog_container)
         titleTextView = view.findViewById(R.id.titleTextView)
         messageTextView = view.findViewById(R.id.messageTextView)
         contentView = view.findViewById(R.id.content_view)
         scrollingSeparator = view.findViewById(R.id.scrolling_separator)
+        scrollView = view.findViewById(R.id.main_scroll_view)
         buttonsWrapper = view.findViewById(R.id.buttons_wrapper)
         noticeTextView = view.findViewById(R.id.notice_text_view)
         closeButton = view.findViewById(R.id.close_button)
@@ -136,7 +157,7 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
     }
 
     private fun updateButtonLayout() {
-        if (isScrollingLayout) {
+        if (isScrollingLayout || buttonAxis == LinearLayout.HORIZONTAL) {
             scrollingSeparator.visibility = View.VISIBLE
             buttonsWrapper.orientation = LinearLayout.HORIZONTAL
             val padding = 16.dpToPx(context)
@@ -156,8 +177,8 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
 
     fun getContentView(): View? = additionalContentView
 
-    fun addButton(stringRes: Int, isPrimary: Boolean, isDestructive: Boolean = false, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): Button {
-        return addButton(context.getString(stringRes), isPrimary, isDestructive, true, function)
+    fun addButton(stringRes: Int, isPrimary: Boolean, isDestructive: Boolean = false, autoDismiss: Boolean = true, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): Button {
+        return addButton(context.getString(stringRes), isPrimary, isDestructive, autoDismiss, function)
     }
 
     fun addButton(string: String, isPrimary: Boolean, isDestructive: Boolean = false, autoDismiss: Boolean = true, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): Button {
@@ -170,19 +191,17 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
         } else {
             val button = buttonsWrapper.inflate(R.layout.dialog_habitica_secondary_button) as? Button
             if (isDestructive) {
-                button?.setTextColor(ContextCompat.getColor(context, R.color.red_100))
+                button?.setTextColor(ContextCompat.getColor(context, R.color.text_red))
             }
             button
         } ?: Button(context)
         button.text = string
-        button.minWidth = 147.dpToPx(context)
-        button.setScaledPadding(context, 20, 0, 20, 0)
         return addButton(button, autoDismiss, function) as Button
     }
 
 
     fun addButton(buttonView: View, autoDismiss: Boolean = true, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): View {
-        val weakThis = WeakReference<HabiticaAlertDialog>(this)
+        val weakThis = WeakReference(this)
         val buttonIndex = buttonsWrapper.childCount
         buttonView.setOnClickListener {
             weakThis.get()?.let { it1 ->
@@ -201,11 +220,11 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
 
     private fun configureButtonLayoutParams(buttonView: View) {
         val layoutParams = if (isScrollingLayout) {
-            val params = LinearLayout.LayoutParams(0, 38.dpToPx(context))
+            val params = LinearLayout.LayoutParams(0, 48.dpToPx(context))
             params.weight = 1f
             params
         } else {
-            LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, 38.dpToPx(context))
+            LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, 48.dpToPx(context))
         }
         buttonView.layoutParams = layoutParams
         buttonView.elevation = 10f
@@ -234,19 +253,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)
@@ -266,8 +285,11 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
                 dialogQueue.removeAt(0)
             }
             if (dialogQueue.size > 0) {
-                if ((dialogQueue[0].context as? Activity) == null || (dialogQueue[0].context as? Activity)?.isFinishing == false) {
-                    dialogQueue[0].show()
+                if ((dialogQueue[0].context as? Activity)?.isFinishing != true) {
+                    GlobalScope.launch(context = Dispatchers.Main) {
+                        delay(500L)
+                        dialogQueue[0].show()
+                    }
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/OpenedMysteryitemDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/OpenedMysteryitemDialog.kt
new file mode 100644
index 000000000..d1d2422ca
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/OpenedMysteryitemDialog.kt
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.ui.views.dialogs
+
+import android.content.Context
+import com.habitrpg.android.habitica.databinding.DialogOpenMysteryitemBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
+
+class OpenedMysteryitemDialog(context: Context): HabiticaAlertDialog(context) {
+
+    val binding = DialogOpenMysteryitemBinding.inflate(context.layoutInflater)
+
+    init {
+        setAdditionalContentView(binding.root)
+    }
+}
\ No newline at end of file
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..464ea98b4 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
@@ -4,13 +4,15 @@ import android.content.Context
 import android.graphics.drawable.BitmapDrawable
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.FrameLayout
+import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogPetSuggestHatchBinding
 import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Animal
 import com.habitrpg.android.habitica.models.inventory.Egg
@@ -19,10 +21,10 @@ import com.habitrpg.android.habitica.models.inventory.Item
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.views.CurrencyView
-import io.reactivex.Flowable
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import java.util.*
 
 
 class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
@@ -47,8 +49,8 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
         binding.eggView.alpha = if (hasEgg) 1.0f else 0.5f
         binding.hatchingPotionView.alpha = if (hasPotion) 1.0f else 0.5f
 
-        val eggName = egg?.text ?: pet.animal.capitalize()
-        val potionName = potion?.text ?: pet.color.capitalize()
+        val eggName = egg?.text ?: pet.animal.capitalize(Locale.getDefault())
+        val potionName = potion?.text ?: pet.color.capitalize(Locale.getDefault())
 
         if (hasEgg) {
             binding.eggCountView.visibility = View.VISIBLE
@@ -99,29 +101,22 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
 
             var hatchPrice = 0
             if (!hasEgg) {
-                hatchPrice = getItemPrice(pet, egg, hasUnlockedEgg)
+                hatchPrice += getItemPrice(pet, egg, hasUnlockedEgg)
             }
 
             if (!hasPotion) {
-                hatchPrice = getItemPrice(pet, potion, hasUnlockedPotion)
+                hatchPrice += getItemPrice(pet, potion, hasUnlockedPotion)
 
             }
 
             addButton(R.string.close, true)
 
             if (hatchPrice > 0) {
-                val linearLayout = LinearLayout(context)
-                val label = TextView(context)
-                label.setText(R.string.hatch)
-                label.setTextColor(ContextCompat.getColor(context, R.color.colorPrimary))
-                linearLayout.addView(label)
-                val layoutParams: LinearLayout.LayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-                        LinearLayout.LayoutParams.WRAP_CONTENT)
-                layoutParams.setMargins(0, 0, 4.dpToPx(context), 0)
-                label.layoutParams = layoutParams
-                val priceView = CurrencyView(context, "gems", true)
-                priceView.value = hatchPrice.toDouble()
-                linearLayout.addView(priceView)
+                val linearLayout = layoutInflater.inflate(R.layout.dialog_hatch_pet_button, null) as? LinearLayout ?: return
+
+                val priceView = linearLayout.findViewById<CurrencyView>(R.id.currencyView)
+                priceView?.value = hatchPrice.toDouble()
+                priceView?.currency = "gems"
                 addButton(linearLayout, true) { _, _ ->
                     val activity = (getActivity() as? MainActivity) ?: return@addButton
                     val thisPotion = potion ?: return@addButton
@@ -133,7 +128,9 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                     if (!hasPotion) {
                         observable = observable.flatMap { activity.inventoryRepository.purchaseItem("hatchingPotions", thisPotion.key, 1) }
                     }
-                    observable.subscribe(Consumer {
+                    observable
+                            .flatMap { activity.userRepository.retrieveUser(true, forced = true) }
+                            .subscribe({
                         (getActivity() as? MainActivity)?.hatchPet(thisPotion, thisEgg)
                     }, RxErrorHandler.handleEmptyError())
                 }
@@ -149,7 +146,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/dialogs/QuestCompletedDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
index 137586a8c..2ece0fe4c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
@@ -12,6 +12,7 @@ import android.widget.TextView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogCompletedQuestContentBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
@@ -39,8 +40,8 @@ class QuestCompletedDialogContent : LinearLayout {
     }
 
     fun setQuestContent(questContent: QuestContent) {
-        binding.titleTextView.text = questContent.text
-        binding.notesTextView.text = questContent.completion
+        binding.titleTextView.setText(questContent.text.fromHtml(), TextView.BufferType.SPANNABLE)
+        binding.notesTextView.setText(questContent.completion.fromHtml(), TextView.BufferType.SPANNABLE)
         DataBindingUtils.loadImage(binding.imageView, "quest_" + questContent.key)
 
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/WonChallengeDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/WonChallengeDialog.kt
new file mode 100644
index 000000000..b69442ce6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/WonChallengeDialog.kt
@@ -0,0 +1,38 @@
+package com.habitrpg.android.habitica.ui.views.dialogs
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import com.facebook.drawee.view.SimpleDraweeView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.fromHtml
+import com.habitrpg.android.habitica.models.notifications.ChallengeWonData
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+
+class WonChallengeDialog(context: Context) : HabiticaAlertDialog(context) {
+    fun configure(data: ChallengeWonData?) {
+        val imageView = additionalContentView?.findViewById<SimpleDraweeView>(R.id.achievement_view);
+        DataBindingUtils.loadImage(imageView, "achievement-karaoke-2x")
+
+        if (data?.name != null) {
+            additionalContentView?.findViewById<TextView>(R.id.description_view)?.text = context.getString(R.string.won_achievement_description, data.name).fromHtml()
+        }
+        if ((data?.prize ?: 0) > 0) {
+            addButton(context.getString(R.string.claim_x_gems, data?.prize), true)
+            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_left)?.visibility = View.GONE
+            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_right)?.visibility = View.GONE
+        } else {
+            addButton(R.string.hurray, true)
+            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_view)?.visibility = View.GONE
+        }
+    }
+
+    init {
+        val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
+        val view = inflater?.inflate(R.layout.dialog_won_challenge, null)
+        setTitle(R.string.you_won_challenge)
+        setAdditionalContentView(view)
+    }
+}
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/login/LockableScrollView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LockableScrollView.kt
index 4cf52a131..3b5711a79 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LockableScrollView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LockableScrollView.kt
@@ -3,15 +3,11 @@ package com.habitrpg.android.habitica.ui.views.login
 import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
-import android.widget.ScrollView
+import androidx.core.widget.NestedScrollView
 
-class LockableScrollView(context: Context, attrs: AttributeSet) : ScrollView(context, attrs) {
+class LockableScrollView(context: Context, attrs: AttributeSet) : NestedScrollView(context, attrs) {
 
-    private var isScrollable = true
-
-    fun setScrollingEnabled(enabled: Boolean) {
-        isScrollable = enabled
-    }
+    var isScrollable = true
 
     override fun onTouchEvent(ev: MotionEvent): Boolean {
         return if (ev.action == MotionEvent.ACTION_DOWN) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
index 10c172624..4d00285fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
@@ -12,14 +12,13 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import java.util.*
 
 class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayout(context, attrs) {
     private val random: Random = Random()
 
-    private val leftCloudView: ImageView by bindView(R.id.left_cloud_view)
-    private val rightCloudView: ImageView by bindView(R.id.right_cloud_view)
+    private lateinit var leftCloudView: ImageView
+    private lateinit var rightCloudView: ImageView
 
     private var starViews: MutableList<StarView>? = null
     private var viewWidth: Int = 0
@@ -47,6 +46,8 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
 
     override fun onFinishInflate() {
         super.onFinishInflate()
+        leftCloudView = findViewById(R.id.left_cloud_view)
+        rightCloudView = findViewById(R.id.right_cloud_view)
         starViews = ArrayList()
         generateStars()
         animateClouds()
@@ -120,7 +121,7 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
         if (viewWidth <= 0 ||viewHeight <= 0 || didLayoutStars || starViews?.size == 0) {
             return
         }
-        for (view in starViews ?: emptyList<StarView>()) {
+        for (view in starViews ?: emptyList()) {
             view.layoutParams = starParams
         }
         didLayoutStars = true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
index 52de669f8..bf0ed39d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
@@ -46,7 +46,7 @@ class StarView : AppCompatImageView {
         if (blinkIndex >= blinkDurations?.size ?: 0) {
             blinkIndex = 0
         }
-        val animator = ObjectAnimator.ofFloat<View>(this, View.ALPHA, 0f)
+        val animator = ObjectAnimator.ofFloat(this, View.ALPHA, 0f)
         animator.duration = 1000
         animator.startDelay = blinkDurations?.get(blinkIndex)?.toLong() ?: 0
         animator.repeatCount = 1
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
index 132db1afb..b69541490 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
@@ -2,40 +2,45 @@ package com.habitrpg.android.habitica.ui.views.navigation
 
 import android.content.Context
 import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.View
-import android.widget.ImageView
 import android.widget.RelativeLayout
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.BottomNavigationItemBinding
 import com.habitrpg.android.habitica.extensions.getThemeColor
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.extensions.setTintWith
 
 class BottomNavigationItem @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : RelativeLayout(context, attrs, defStyleAttr) {
+    private var selectedIcon: Drawable? = null
+    private var icon: Drawable? = null
+    private val binding = BottomNavigationItemBinding.inflate(context.layoutInflater, this)
 
-    private val iconView: ImageView by bindView(R.id.icon_view)
-    private val selectedTitleView: TextView by bindView(R.id.selected_title_view)
-    private val titleView: TextView by bindView(R.id.title_view)
-    private val badge: TextView by bindView(R.id.badge)
-
-    var selectedVisibility = View.VISIBLE
-    var deselectedVisibility = View.VISIBLE
+    private var selectedVisibility = View.VISIBLE
+    private var deselectedVisibility = View.VISIBLE
 
     var isActive = false
     set(value) {
         field = value
         if (isActive) {
-            selectedTitleView.visibility = selectedVisibility
-            titleView.visibility = View.GONE
-            iconView.drawable.setColorFilter(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.MULTIPLY )
+            binding.selectedTitleView.visibility = selectedVisibility
+            binding.titleView.visibility = View.GONE
+            binding.iconView.setImageDrawable(selectedIcon)
+            if (context.isUsingNightModeResources()) {
+                binding.iconView.drawable.setTintWith(context.getThemeColor(R.attr.colorPrimaryDistinct), PorterDuff.Mode.SRC_ATOP )
+            } else {
+                binding.iconView.drawable.setTintWith(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.SRC_ATOP )
+            }
         } else {
-            selectedTitleView.visibility = View.GONE
-            titleView.visibility = deselectedVisibility
-            iconView.drawable.setColorFilter(context.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY )
+            binding.selectedTitleView.visibility = View.GONE
+            binding.iconView.setImageDrawable(icon)
+            binding.titleView.visibility = deselectedVisibility
+            binding.iconView.drawable.setTintWith(context.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.SRC_ATOP )
         }
     }
 
@@ -43,24 +48,24 @@ class BottomNavigationItem @JvmOverloads constructor(
     set(value) {
         field = value
         if (value == 0) {
-            badge.visibility = View.INVISIBLE
+            binding.badge.visibility = View.INVISIBLE
         } else {
-            badge.visibility = View.VISIBLE
-            badge.text = value.toString()
+            binding.badge.visibility = View.VISIBLE
+            binding.badge.text = value.toString()
         }
     }
 
     init {
-        inflate(R.layout.bottom_navigation_item, true)
-
         val attributes = context.theme?.obtainStyledAttributes(
                 attrs,
                 R.styleable.BottomNavigationItem,
                 0, 0)
         if (attributes != null) {
-            iconView.setImageDrawable(attributes.getDrawable(R.styleable.BottomNavigationItem_iconDrawable))
-            titleView.text = attributes.getString(R.styleable.BottomNavigationItem_title)
-            selectedTitleView.text = attributes.getString(R.styleable.BottomNavigationItem_title)
+            icon = attributes.getDrawable(R.styleable.BottomNavigationItem_iconDrawable)
+            selectedIcon = attributes.getDrawable(R.styleable.BottomNavigationItem_selectedIconDrawable)
+            binding.iconView.setImageDrawable(icon)
+            binding.titleView.text = attributes.getString(R.styleable.BottomNavigationItem_title)
+            binding.selectedTitleView.text = attributes.getString(R.styleable.BottomNavigationItem_title)
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt
index 16ecf814e..047db3356 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt
@@ -3,48 +3,43 @@ package com.habitrpg.android.habitica.ui.views.navigation
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
-import android.widget.ImageView
 import android.widget.RelativeLayout
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.databinding.BottomNavigationSubmenuBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 
 class BottomNavigationSubmenuItem @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : RelativeLayout(context, attrs, defStyleAttr) {
+    private val binding = BottomNavigationSubmenuBinding.inflate(context.layoutInflater, this)
 
     var onAddListener: (() -> Unit)? = null
 
     val measuredTitleWidth: Int
     get() {
-        titleView.measure(width, height)
-        return titleView.measuredWidth
+        binding.titleView.measure(width, height)
+        return binding.titleView.measuredWidth
     }
-    private val iconView: ImageView by bindView(R.id.icon_view)
-    private val titleView: TextView by bindView(R.id.title_view)
 
     var icon: Drawable? = null
     set(value) {
         field = value
-        iconView.setImageDrawable(value)
+        binding.iconView.setImageDrawable(value)
     }
     var title: String? = null
     set(value) {
         field = value
-        titleView.text = title
+        binding.titleView.text = title
     }
 
     init {
-        inflate(R.layout.bottom_navigation_submenu, true)
-        iconView.setOnClickListener { onAddListener?.invoke() }
-        titleView.setOnClickListener { onAddListener?.invoke() }
+        binding.iconView.setOnClickListener { onAddListener?.invoke() }
+        binding.titleView.setOnClickListener { onAddListener?.invoke() }
     }
 
     fun setTitleWidth(width: Int) {
-        val layoutParams = titleView.layoutParams as? LayoutParams
+        val layoutParams = binding.titleView.layoutParams as? LayoutParams
         layoutParams?.width = width
-        titleView.layoutParams = layoutParams
+        binding.titleView.layoutParams = layoutParams
     }
 
 }
\ No newline at end of file
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..b25498494 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
@@ -5,29 +5,32 @@ import android.content.Context
 import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.view.MotionEvent
-import android.view.ViewGroup
+import android.view.View
 import android.view.animation.Animation
 import android.view.animation.BounceInterpolator
 import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
-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
+import com.habitrpg.android.habitica.databinding.MainNavigationViewBinding
 import com.habitrpg.android.habitica.extensions.getThemeColor
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.helpers.bindView
 
+interface HabiticaBottomNavigationViewListener {
+    fun onTabSelected(taskType: String)
+    fun onAdd(taskType: String)
+}
 
 class HabiticaBottomNavigationView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : RelativeLayout(context, attrs, defStyleAttr) {
+    private val binding = MainNavigationViewBinding.inflate(context.layoutInflater, this)
 
-    var flipAddBehaviour = true
     private var isShowingSubmenu: Boolean = false
     var selectedPosition: Int
     get() {
@@ -46,101 +49,98 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
             else -> Task.TYPE_HABIT
         }
     }
-    var onTabSelectedListener: ((String) -> Unit)? = null
-    var onAddListener:  ((String) -> Unit)? = null
+    var listener: HabiticaBottomNavigationViewListener? = null
     var activeTaskType: String = Task.TYPE_HABIT
     set(value) {
+        val wasChanged = field != value
         field = value
-        updateItemSelection()
-        onTabSelectedListener?.invoke(value)
+        if (wasChanged) {
+            updateItemSelection()
+            listener?.onTabSelected(value)
+        }
+    }
+
+    var canAddTasks = true
+    set(value) {
+        field = value
+        if (field) {
+            binding.cutoutWrapper.visibility = View.VISIBLE
+            binding.cutoutSpace.visibility = View.VISIBLE
+            binding.addButtonBackground.visibility = View.VISIBLE
+        } else {
+            binding.cutoutWrapper.visibility = View.GONE
+            binding.cutoutSpace.visibility = View.GONE
+            binding.addButtonBackground.visibility = View.GONE
+        }
     }
 
     val barHeight: Int
-        get() = itemWrapper.measuredHeight
-
-    private val cutoutBackgroundView: ImageView by bindView(R.id.cutout_background)
-    private val habitsTab: BottomNavigationItem by bindView(R.id.tab_habits)
-    private val dailiesTab: BottomNavigationItem by bindView(R.id.tab_dailies)
-    private val todosTab: BottomNavigationItem by bindView(R.id.tab_todos)
-    private val rewardsTab: BottomNavigationItem by bindView(R.id.tab_rewards)
-    private val addButton: ImageButton by bindView(R.id.add)
-    private val addButtonBackground: ViewGroup by bindView(R.id.add_wrapper)
-    private val submenuWrapper: LinearLayout by bindView(R.id.submenu_wrapper)
-    private val itemWrapper: ViewGroup by bindView(R.id.item_wrapper)
+        get() = binding.itemWrapper.measuredHeight
 
     init {
-        inflate(R.layout.main_navigation_view, true)
-        habitsTab.setOnClickListener { activeTaskType = Task.TYPE_HABIT }
-        dailiesTab.setOnClickListener { activeTaskType = Task.TYPE_DAILY }
-        todosTab.setOnClickListener { activeTaskType = Task.TYPE_TODO }
-        rewardsTab.setOnClickListener { activeTaskType = Task.TYPE_REWARD }
-        addButton.setOnClickListener {
-            if (flipAddBehaviour) {
-                if (isShowingSubmenu) {
-                    hideSubmenu()
-                } else {
-                    onAddListener?.invoke(activeTaskType)
-                }
+        binding.habitsTab.setOnClickListener { activeTaskType = Task.TYPE_HABIT }
+        binding.dailiesTab.setOnClickListener { activeTaskType = Task.TYPE_DAILY }
+        binding.todosTab.setOnClickListener { activeTaskType = Task.TYPE_TODO }
+        binding.rewardsTab.setOnClickListener { activeTaskType = Task.TYPE_REWARD }
+        binding.addButton.setOnClickListener {
+            if (isShowingSubmenu) {
+                hideSubmenu()
             } else {
-                showSubmenu()
+                listener?.onAdd(activeTaskType)
             }
             animateButtonTap()
         }
-        addButton.setOnLongClickListener {
-            if (flipAddBehaviour) {
-                showSubmenu()
-            } else {
-                onAddListener?.invoke(activeTaskType)
-            }
+        binding.addButton.setOnLongClickListener {
+            showSubmenu()
             animateButtonTap()
             true
         }
-        addButton.setOnTouchListener { _, event ->
+        binding.addButton.setOnTouchListener { view, event ->
             if (event.action == MotionEvent.ACTION_DOWN) {
-                val animX = ObjectAnimator.ofFloat(addButton, "scaleX", 1f, 1.1f)
+                val animX = ObjectAnimator.ofFloat(binding.addButton, "scaleX", 1f, 1.1f)
                 animX.duration = 100
                 animX.interpolator = LinearInterpolator()
                 animX.start()
-                val animY = ObjectAnimator.ofFloat(addButton, "scaleY", 1f, 1.1f)
+                val animY = ObjectAnimator.ofFloat(binding.addButton, "scaleY", 1f, 1.1f)
                 animY.duration = 100
                 animY.interpolator = LinearInterpolator()
                 animY.start()
-                val animXBackground = ObjectAnimator.ofFloat(addButtonBackground, "scaleX", 1f, 0.9f)
+                val animXBackground = ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleX", 1f, 0.9f)
                 animXBackground.duration = 100
                 animXBackground.interpolator = LinearInterpolator()
                 animXBackground.start()
-                val animYBackground = ObjectAnimator.ofFloat(addButtonBackground, "scaleY", 1f, 0.9f)
+                val animYBackground = ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleY", 1f, 0.9f)
                 animYBackground.duration = 100
                 animYBackground.interpolator = LinearInterpolator()
                 animYBackground.start()
             }
             false
         }
-        submenuWrapper.setOnClickListener { hideSubmenu() }
+        binding.submenuWrapper.setOnClickListener { hideSubmenu() }
         updateItemSelection()
 
-        val cutout = context.getDrawable(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)
-        fabBackground?.setColorFilter(context.getThemeColor(R.attr.colorAccent), PorterDuff.Mode.MULTIPLY)
-        addButtonBackground.background = fabBackground
+        val cutout = ContextCompat.getDrawable(context, R.drawable.bottom_navigation_inset)
+        cutout?.setTintWith(context.getThemeColor(R.attr.barColor), PorterDuff.Mode.MULTIPLY)
+        binding.cutoutBackground.setImageDrawable(cutout)
+        val fabBackground = ContextCompat.getDrawable(context, R.drawable.fab_background)
+        fabBackground?.setTintWith(context.getThemeColor(R.attr.colorAccent), PorterDuff.Mode.MULTIPLY)
+        binding.addButtonBackground.background = fabBackground
     }
 
     private fun animateButtonTap() {
-        val animX = ObjectAnimator.ofFloat(addButton, "scaleX", 1.3f, 1f)
+        val animX = ObjectAnimator.ofFloat(binding.addButton, "scaleX", 1.3f, 1f)
         animX.duration = 400
         animX.interpolator = BounceInterpolator()
         animX.start()
-        val animY = ObjectAnimator.ofFloat(addButton, "scaleY", 1.3f, 1f)
+        val animY = ObjectAnimator.ofFloat(binding.addButton, "scaleY", 1.3f, 1f)
         animY.duration = 400
         animY.interpolator = BounceInterpolator()
         animY.start()
-        val animXBackground = ObjectAnimator.ofFloat(addButtonBackground, "scaleX", 0.9f, 1f)
+        val animXBackground = ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleX", 0.9f, 1f)
         animXBackground.duration = 600
         animXBackground.interpolator = BounceInterpolator()
         animXBackground.start()
-        val animYBackground = ObjectAnimator.ofFloat(addButtonBackground, "scaleY", 0.9f, 1f)
+        val animYBackground = ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleY", 0.9f, 1f)
         animYBackground.duration = 600
         animYBackground.interpolator = BounceInterpolator()
         animYBackground.start()
@@ -154,35 +154,35 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
         rotate.duration = 250
         rotate.interpolator = LinearInterpolator()
         rotate.fillAfter = true
-        addButton.startAnimation(rotate)
+        binding.addButton.startAnimation(rotate)
 
         var pos = 4
-        submenuWrapper.removeAllViews()
+        binding.submenuWrapper.removeAllViews()
         for (taskType in listOf(Task.TYPE_HABIT, Task.TYPE_DAILY, Task.TYPE_TODO, Task.TYPE_REWARD)) {
             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)
                 }
             }
             view.onAddListener = {
-                onAddListener?.invoke(taskType)
+                listener?.onAdd(taskType)
                 hideSubmenu()
             }
-            submenuWrapper.addView(view)
+            binding.submenuWrapper.addView(view)
             view.alpha = 0f
             view.scaleY = 0.7f
             ViewCompat.animate(view).alpha(1f).setDuration(250.toLong()).startDelay = (100 * pos).toLong()
@@ -190,7 +190,7 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
             pos -= 1
         }
         var widestWidth = 0
-        for (view in submenuWrapper.children) {
+        for (view in binding.submenuWrapper.children) {
             if (view is BottomNavigationSubmenuItem) {
                 val width = view.measuredTitleWidth
                 if (widestWidth < width) {
@@ -198,7 +198,7 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
                 }
             }
         }
-        for (view in submenuWrapper.children) {
+        for (view in binding.submenuWrapper.children) {
             if (view is BottomNavigationSubmenuItem) {
                 view.setTitleWidth(widestWidth)
             }
@@ -213,31 +213,31 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
         rotate.duration = 250
         rotate.interpolator = LinearInterpolator()
         rotate.fillAfter = true
-        addButton.startAnimation(rotate)
+        binding.addButton.startAnimation(rotate)
 
-        for (view in submenuWrapper.children) {
+        for (view in binding.submenuWrapper.children) {
             view.alpha = 1f
             view.scaleY = 1f
             ViewCompat.animate(view).alpha(0f).setDuration(200.toLong()).startDelay = (150 * pos).toLong()
-            ViewCompat.animate(view).scaleY(0.7f).setDuration(250.toLong()).setStartDelay((100 * pos).toLong()).withEndAction { submenuWrapper.removeView(view) }
+            ViewCompat.animate(view).scaleY(0.7f).setDuration(250.toLong()).setStartDelay((100 * pos).toLong()).withEndAction { binding.submenuWrapper.removeView(view) }
             pos += 1
         }
     }
 
     fun tabWithId(id: Int): BottomNavigationItem? {
         return when(id) {
-            R.id.tab_habits -> habitsTab
-            R.id.tab_dailies -> dailiesTab
-            R.id.tab_todos -> rewardsTab
-            R.id.tab_rewards -> todosTab
+            R.id.habits_tab -> binding.habitsTab
+            R.id.dailies_tab -> binding.dailiesTab
+            R.id.todos_tab -> binding.todosTab
+            R.id.rewards_tab -> binding.rewardsTab
             else -> null
         }
     }
 
     private fun updateItemSelection() {
-        habitsTab.isActive = activeTaskType == Task.TYPE_HABIT
-        dailiesTab.isActive = activeTaskType == Task.TYPE_DAILY
-        todosTab.isActive = activeTaskType == Task.TYPE_TODO
-        rewardsTab.isActive = activeTaskType == Task.TYPE_REWARD
+        binding.habitsTab.isActive = activeTaskType == Task.TYPE_HABIT
+        binding.dailiesTab.isActive = activeTaskType == Task.TYPE_DAILY
+        binding.todosTab.isActive = activeTaskType == Task.TYPE_TODO
+        binding.rewardsTab.isActive = activeTaskType == Task.TYPE_REWARD
     }
 }
\ No newline at end of file
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..c9832154a 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
@@ -2,13 +2,13 @@ package com.habitrpg.android.habitica.ui.views.promo
 
 import android.content.Context
 import android.util.AttributeSet
+import android.widget.Button
 import android.widget.RelativeLayout
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import kotlinx.android.synthetic.main.promo_subscription_buy_gems.view.*
 
 class SubscriptionBuyGemsPromoView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
@@ -16,10 +16,10 @@ 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
-        button.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", true))) }
+        findViewById<Button>(R.id.button).setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", true))) }
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt
index abda534f4..6f9393c6f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt
@@ -10,6 +10,7 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.FixvaluesEdittextBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class FixValuesEditText(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
@@ -27,7 +28,7 @@ class FixValuesEditText(context: Context, attrs: AttributeSet) : FrameLayout(con
     set(value) {
         field = value
         val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg)
-        backgroundDrawable?.setColorFilter(field, PorterDuff.Mode.MULTIPLY)
+        backgroundDrawable?.setTintWith(field, PorterDuff.Mode.MULTIPLY)
         backgroundDrawable?.alpha = 50
         binding.iconBackgroundView.background = backgroundDrawable
     }
@@ -55,8 +56,4 @@ class FixValuesEditText(context: Context, attrs: AttributeSet) : FrameLayout(con
             "streak" -> binding.iconView.setImageResource(R.drawable.achievement_thermometer)
         }
     }
-
-    fun setIconBitmap(icon: Bitmap) {
-        binding.iconView.setImageBitmap(icon)
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt
index 480d7f4e7..4946999fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt
@@ -10,16 +10,17 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.extensions.setTintWith
 
 class AvatarCategoryView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
 
     private val icon: Drawable?
-    private val textView: TextView by bindView(R.id.text_view)
+    private val textView: TextView
 
     init {
         View.inflate(context, R.layout.avatar_category, this)
 
+        textView = findViewById(R.id.text_view)
         val a = context.theme.obtainStyledAttributes(
                 attrs,
                 R.styleable.AvatarCategoryView,
@@ -42,7 +43,7 @@ class AvatarCategoryView(context: Context, attrs: AttributeSet?) : LinearLayout(
         }
         textView.setTextColor(color)
         if (icon != null) {
-            icon.setColorFilter(color, PorterDuff.Mode.MULTIPLY)
+            icon.setTintWith(color, PorterDuff.Mode.MULTIPLY)
             textView.setCompoundDrawablesWithIntrinsicBounds(null, icon, null, null)
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt
index 5ee17545e..84dbf9f62 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt
@@ -4,11 +4,9 @@ package com.habitrpg.android.habitica.ui.views.setup
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.LinearLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.AvatarSetupDrawerBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 
 class AvatarCustomizationDrawer(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
-    init {
-        inflate(R.layout.avatar_setup_drawer, true)
-    }
+    val binding = AvatarSetupDrawerBinding.inflate(context.layoutInflater, this, true)
 }
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..2519494df 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
@@ -4,7 +4,8 @@ import android.content.Context
 import android.graphics.drawable.BitmapDrawable
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
@@ -20,15 +21,10 @@ 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
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.CurrencyView
 import com.habitrpg.android.habitica.ui.views.CurrencyViews
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
@@ -39,10 +35,9 @@ import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientG
 import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientHourglassesDialog
 import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientSubscriberGemsDialog
 import com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.realm.RealmResults
 import org.greenrobot.eventbus.EventBus
 import java.util.*
@@ -61,13 +56,15 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
     private val customHeader: View by lazy {
         LayoutInflater.from(context).inflate(R.layout.dialog_purchase_shopitem_header, null)
     }
-    private val currencyView: CurrencyViews by bindView(customHeader, R.id.currencyView)
-    private val limitedTextView: TextView by bindView(customHeader, R.id.limitedTextView)
+    private val currencyView: CurrencyViews
+    private val limitedTextView: TextView
     private val buyButton: View
     private val priceLabel: CurrencyView
     private val buyLabel: TextView
     private var amountErrorLabel: TextView? = null
-    private val pinButton: Button by bindView(customHeader, R.id.pin_button)
+    private val pinButton: LinearLayout
+    private val pinIcon: ImageView
+    private val pinTextView: TextView
 
     private var purchaseQuantity = 1
 
@@ -93,8 +90,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 +101,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)
@@ -128,6 +125,15 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 }
             }
 
+            val purchaseImmediatelyView = contentView.findViewById<View>(R.id.purchase_immediately_view)
+            if (purchaseImmediatelyView != null) {
+                if (item.key == "fortify" || item.key == "potion") {
+                    purchaseImmediatelyView.visibility = View.VISIBLE
+                } else {
+                    purchaseImmediatelyView.visibility = View.GONE
+                }
+            }
+
             amountErrorLabel = contentView.findViewById(R.id.amount_error_label)
 
             contentView.setItem(shopItem)
@@ -138,13 +144,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 +170,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
         }
@@ -177,13 +183,15 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         set(value) {
             field = value
             if (isPinned) {
-                pinButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfUnpinItem()), null, null, null)
-                pinButton.setTextColor(ContextCompat.getColor(context, R.color.red_10))
-                pinButton.text = context.getText(R.string.unpin)
+                pinIcon.setImageDrawable(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfUnpinItem()))
+                pinIcon.imageTintList = ContextCompat.getColorStateList(context, R.color.text_red)
+                pinTextView.setTextColor(ContextCompat.getColor(context, R.color.text_red))
+                pinTextView.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.text = context.getText(R.string.pin)
+                pinIcon.setImageDrawable(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfPinItem()))
+                pinIcon.imageTintList = ContextCompat.getColorStateList(context, R.color.text_brand)
+                pinTextView.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
+                pinTextView.text = context.getText(R.string.pin)
             }
         }
 
@@ -193,6 +201,11 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         forceScrollableLayout = true
 
         setCustomHeaderView(customHeader)
+        currencyView = customHeader.findViewById(R.id.currencyView)
+        limitedTextView = customHeader.findViewById(R.id.limitedTextView)
+        pinButton = customHeader.findViewById(R.id.pin_button)
+        pinIcon = customHeader.findViewById(R.id.pin_icon)
+        pinTextView = customHeader.findViewById(R.id.pin_text)
 
         addCloseButton()
         buyButton = addButton(layoutInflater.inflate(R.layout.dialog_purchase_shopitem_button, null), autoDismiss = false) { _, _ ->
@@ -200,11 +213,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 +241,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?.binding?.stepperView?.maxValue = (user.purchased?.plan?.numberOfGemsLeft() ?: 1).toDouble()
         }
 
         buyButton.elevation = 0f
@@ -288,12 +301,14 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         val observable: Flowable<Any>
         if (shopIdentifier != null && shopIdentifier == Shop.TIME_TRAVELERS_SHOP || "mystery_set" == shopItem.purchaseType || shopItem.currency == "hourglasses") {
             observable = if (shopItem.purchaseType == "gear") {
-                inventoryRepository.purchaseMysterySet(shopItem.key)
+                inventoryRepository.purchaseMysterySet(shopItem.key).cast(Any::class.java)
             } else {
-                inventoryRepository.purchaseHourglassItem(shopItem.purchaseType, shopItem.key)
+                inventoryRepository.purchaseHourglassItem(shopItem.purchaseType, shopItem.key).cast(Any::class.java)
             }
+        } else if (shopItem.purchaseType == "fortify") {
+            observable = userRepository.reroll().cast(Any::class.java)
         } else if (shopItem.purchaseType == "quests" && shopItem.currency == "gold") {
-            observable = inventoryRepository.purchaseQuest(shopItem.key)
+            observable = inventoryRepository.purchaseQuest(shopItem.key).cast(Any::class.java)
         } else if (shopItem.purchaseType == "debuffPotion") {
             observable = userRepository.useSkill(user, shopItem.key, null).cast(Any::class.java)
         } else if (shopItem.purchaseType == "card") {
@@ -312,7 +327,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 buyResponse
             }
         } else {
-            observable = inventoryRepository.purchaseItem(shopItem.purchaseType, shopItem.key, quantity)
+            observable = inventoryRepository.purchaseItem(shopItem.purchaseType, shopItem.key, quantity).cast(Any::class.java)
         }
         val subscription = observable
                 .doOnNext {
@@ -325,9 +340,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 +375,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 +438,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/PurchaseDialogBaseContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt
index e667a1929..85e70af87 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt
@@ -1,14 +1,15 @@
 package com.habitrpg.android.habitica.ui.views.shops
 
 import android.content.Context
-import android.util.AttributeSet
+import android.widget.TextView
+import com.facebook.drawee.view.SimpleDraweeView
+import com.habitrpg.android.habitica.databinding.DialogPurchaseContentItemBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 
-import com.habitrpg.android.habitica.R
-
-class PurchaseDialogBaseContent : PurchaseDialogContent {
-    override val viewId: Int
-        get() =  R.layout.dialog_purchase_content_item
-
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+class PurchaseDialogBaseContent(context: Context) : PurchaseDialogContent(context) {
+    val binding = DialogPurchaseContentItemBinding.inflate(context.layoutInflater, this)
+    override val imageView: SimpleDraweeView
+        get() = binding.imageView
+    override val titleTextView: TextView
+        get() = binding.titleTextView
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
index 0cf7b2576..d2d034234 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
@@ -7,37 +7,24 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.view.SimpleDraweeView
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 
+abstract class PurchaseDialogContent @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
 
-abstract class PurchaseDialogContent : LinearLayout {
+    abstract val imageView: SimpleDraweeView
+    abstract val titleTextView: TextView
 
-    private val imageView: SimpleDraweeView by bindView(R.id.imageView)
-    private val titleTextView: TextView by bindView(R.id.titleTextView)
-
-    protected abstract val viewId: Int
-
-    constructor(context: Context) : super(context) {
-        setupView()
-    }
-
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
-        setupView()
-    }
-
-    private fun setupView() {
+    init {
         orientation = VERTICAL
         gravity = Gravity.CENTER
-
-        inflate(context, viewId, this)
     }
 
-
     open fun setItem(item: ShopItem) {
         if (item.path?.contains("timeTravelBackgrounds") == true) {
             val controller = Fresco.newDraweeControllerBuilder()
@@ -57,6 +44,6 @@ abstract class PurchaseDialogContent : LinearLayout {
 
     open fun setQuestContentItem(questContent: QuestContent) {
         DataBindingUtils.loadImage(imageView, "inventory_quest_scroll_" + questContent.key)
-        titleTextView.text = questContent.text
+        titleTextView.setText(questContent.text.fromHtml(), TextView.BufferType.SPANNABLE)
     }
 }
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..85561fc57 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
@@ -1,57 +1,46 @@
 package com.habitrpg.android.habitica.ui.views.shops
 
 import android.content.Context
-import androidx.core.content.ContextCompat
-import android.util.AttributeSet
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.databinding.DialogPurchaseContentGearBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.models.shops.ShopItem
 
-internal class PurchaseDialogGearContent : PurchaseDialogContent {
-
-    private val notesTextView: TextView by bindView(R.id.notesTextView)
-    private val strLabel: TextView by bindView(R.id.str_label)
-    private val strValueTextView: TextView by bindView(R.id.str_value)
-    private val perLabel: TextView by bindView(R.id.per_label)
-    private val perValueTextView: TextView by bindView(R.id.per_value)
-    private val conLabel: TextView by bindView(R.id.con_label)
-    private val conValueTextView: TextView by bindView(R.id.con_value)
-    private val intLabel: TextView by bindView(R.id.int_label)
-    private val intValueTextView: TextView by bindView(R.id.int_value)
-
-    override val viewId: Int
-        get() = R.layout.dialog_purchase_content_gear
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+internal class PurchaseDialogGearContent(context: Context) : PurchaseDialogContent(context) {
+    val binding = DialogPurchaseContentGearBinding.inflate(context.layoutInflater, this)
+    override val imageView: SimpleDraweeView
+        get() = binding.imageView
+    override val titleTextView: TextView
+        get() = binding.titleTextView
 
     override fun setItem(item: ShopItem) {
         super.setItem(item)
-        notesTextView.text = item.notes
+        binding.notesTextView.text = item.notes
     }
 
     fun setEquipment(equipment: Equipment) {
         if (equipment.isValid) {
-            configureFieldsForValue(strLabel, strValueTextView, equipment.str)
-            configureFieldsForValue(perLabel, perValueTextView, equipment.per)
-            configureFieldsForValue(conLabel, conValueTextView, equipment.con)
-            configureFieldsForValue(intLabel, intValueTextView, equipment._int)
+            configureFieldsForValue(binding.strLabel, binding.strValue, equipment.str)
+            configureFieldsForValue(binding.perLabel, binding.perValue, equipment.per)
+            configureFieldsForValue(binding.conLabel, binding.conValue, equipment.con)
+            configureFieldsForValue(binding.intLabel, binding.intValue, equipment._int)
         } else {
-            configureFieldsForValue(strLabel, strValueTextView, 0)
-            configureFieldsForValue(perLabel, perValueTextView, 0)
-            configureFieldsForValue(conLabel, conValueTextView, 0)
-            configureFieldsForValue(intLabel, intValueTextView, 0)
+            configureFieldsForValue(binding.strLabel, binding.strValue, 0)
+            configureFieldsForValue(binding.perLabel, binding.perValue, 0)
+            configureFieldsForValue(binding.conLabel, binding.conValue, 0)
+            configureFieldsForValue(binding.intLabel, binding.intValue, 0)
         }
     }
 
     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/shops/PurchaseDialogGemsContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
index 0028cc084..142eaa350 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
@@ -2,28 +2,26 @@ package com.habitrpg.android.habitica.ui.views.shops
 
 import android.content.Context
 import android.widget.TextView
-import com.habitrpg.android.habitica.R
+import com.facebook.drawee.view.SimpleDraweeView
+import com.habitrpg.android.habitica.databinding.DialogPurchaseGemsBinding
 import com.habitrpg.android.habitica.extensions.asDrawable
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView
 
 internal class PurchaseDialogGemsContent(context: Context) : PurchaseDialogContent(context) {
-
-    val notesTextView: TextView by bindView(R.id.notesTextView)
-    val stepperView: StepperValueFormView by bindView(R.id.stepper_view)
-
-    override val viewId: Int
-        get() = R.layout.dialog_purchase_gems
+    internal val binding = DialogPurchaseGemsBinding.inflate(context.layoutInflater, this)
+    override val imageView: SimpleDraweeView
+        get() = binding.imageView
+    override val titleTextView: TextView
+        get() = binding.titleTextView
 
     init {
-        stepperView.iconDrawable = HabiticaIconsHelper.imageOfGem().asDrawable(context.resources)
+        binding.stepperView.iconDrawable = HabiticaIconsHelper.imageOfGem().asDrawable(context.resources)
     }
 
     override fun setItem(item: ShopItem) {
         super.setItem(item)
-
-        notesTextView.text = item.notes
+        binding.notesTextView.text = item.notes
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt
index 8b53010c7..4cbc83346 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt
@@ -1,30 +1,22 @@
 package com.habitrpg.android.habitica.ui.views.shops
 
 import android.content.Context
-import android.util.AttributeSet
 import android.widget.TextView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.asDrawable
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.facebook.drawee.view.SimpleDraweeView
+import com.habitrpg.android.habitica.databinding.DialogPurchaseContentItemBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView
 
-class PurchaseDialogItemContent : PurchaseDialogContent {
-
-    internal val notesTextView: TextView by bindView(R.id.notesTextView)
-    val stepperView: StepperValueFormView by bindView(R.id.stepper_view)
-
-    override val viewId: Int
-        get() = R.layout.dialog_purchase_content_item
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+class PurchaseDialogItemContent(context: Context) : PurchaseDialogContent(context) {
+    private val binding = DialogPurchaseContentItemBinding.inflate(context.layoutInflater, this)
+    override val imageView: SimpleDraweeView
+        get() = binding.imageView
+    override val titleTextView: TextView
+        get() = binding.titleTextView
 
     override fun setItem(item: ShopItem) {
         super.setItem(item)
-        notesTextView.text = item.notes
-        stepperView.iconDrawable = null
+        binding.notesTextView.text = item.notes
+        binding.stepperView.iconDrawable = null
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
index caadbdec0..7ff929403 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
@@ -2,101 +2,86 @@ package com.habitrpg.android.habitica.ui.views.shops
 
 import android.content.Context
 import android.text.TextUtils
-import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.RatingBar
 import android.widget.TextView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.DialogPurchaseContentQuestBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
-class PurchaseDialogQuestContent : PurchaseDialogContent {
-
-    private val questDetailView: View by bindView(R.id.questDetailView)
-    private val questTypeTextView: TextView by bindView(R.id.questTypeTextView)
-    private val bossHealthView: View by bindView(R.id.boss_health_view)
-    private val bossHealthTextView: TextView by bindView(R.id.boss_health_text)
-    private val questCollectView: View by bindView(R.id.quest_collect_view)
-    private val questCollectTextView: TextView by bindView(R.id.quest_collect_text)
-    private val questDifficultyView: RatingBar by bindView(R.id.quest_difficulty_view)
-    private val rageMeterView: View by bindView(R.id.rage_meter_view)
-    private val rewardsList: ViewGroup by bindView(R.id.rewardsList)
-    private val ownerRewardsTitle: View by bindView(R.id.ownerRewardsTitle)
-    private val ownerRewardsList: ViewGroup by bindView(R.id.ownerRewardsList)
-
-    override val viewId: Int
-        get() = R.layout.dialog_purchase_content_quest
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+class PurchaseDialogQuestContent(context: Context) : PurchaseDialogContent(context) {
+    private val binding = DialogPurchaseContentQuestBinding.inflate(context.layoutInflater, this)
+    override val imageView: SimpleDraweeView
+        get() = binding.imageView
+    override val titleTextView: TextView
+        get() = binding.titleTextView
 
     fun setQuestContent(questContent: QuestContent) {
-        rageMeterView.visibility = View.GONE
+        binding.rageMeterView.visibility = View.GONE
         if (questContent.isBossQuest) {
-            questTypeTextView.setText(R.string.boss_quest)
-            questCollectView.visibility = View.GONE
-            bossHealthTextView.text = questContent.boss?.hp.toString()
+            binding.questTypeTextView.setText(R.string.boss_quest)
+            binding.questCollectView.visibility = View.GONE
+            binding.bossHealthText.text = questContent.boss?.hp.toString()
             if (questContent.boss?.hasRage() == true) {
-                rageMeterView.visibility = View.VISIBLE
+                binding.rageMeterView.visibility = View.VISIBLE
             }
-            questDifficultyView.rating = questContent.boss?.str ?: 1f
+            binding.questDifficultyView.rating = questContent.boss?.str ?: 1f
         } else {
-            questTypeTextView.setText(R.string.collection_quest)
+            binding.questTypeTextView.setText(R.string.collection_quest)
             val collectionList = questContent.collect?.map { it.count.toString() + " " + it.text }
-            questCollectTextView.text = TextUtils.join(", ", collectionList ?: listOf<String>())
+            binding.questCollectText.text = TextUtils.join(", ", collectionList ?: listOf<String>())
 
-            bossHealthView.visibility = View.GONE
+            binding.bossHealthView.visibility = View.GONE
 
-            questDifficultyView.rating = 1f
+            binding.questDifficultyView.rating = 1f
         }
 
-        questDetailView.visibility = View.VISIBLE
+        binding.questDetailView.visibility = View.VISIBLE
 
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
 
         if (questContent.drop != null && questContent.drop?.items != null) {
             questContent.drop?.items
                     ?.filterNot { it.isOnlyOwner }
-                    ?.forEach { addRewardsRow(inflater, it, rewardsList) }
+                    ?.forEach { addRewardsRow(inflater, it, binding.rewardsList) }
 
             var hasOwnerRewards = false
             for (item in questContent.drop?.items ?: emptyList<QuestDropItem>()) {
                 if (item.isOnlyOwner) {
-                    addRewardsRow(inflater, item, ownerRewardsList)
+                    addRewardsRow(inflater, item, binding.ownerRewardsList)
                     hasOwnerRewards = true
                 }
             }
             if (!hasOwnerRewards) {
-                ownerRewardsTitle.visibility = View.GONE
-                ownerRewardsList.visibility = View.GONE
+                binding.ownerRewardsTitle.visibility = View.GONE
+                binding.ownerRewardsList.visibility = View.GONE
             }
 
             if (questContent.drop?.exp ?: 0 > 0) {
-                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, rewardsList, false) as? ViewGroup
+                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, binding.rewardsList, false) as? ViewGroup
                 val imageView = view?.findViewById<ImageView>(R.id.imageView)
                 imageView?.scaleType = ImageView.ScaleType.CENTER
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
                 val titleTextView = view?.findViewById<TextView>(R.id.titleTextView)
                 titleTextView?.text = context.getString(R.string.experience_reward, questContent.drop?.exp)
-                rewardsList.addView(view)
+                binding.rewardsList.addView(view)
             }
 
             if (questContent.drop?.gp ?: 0 > 0) {
-                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, rewardsList, false) as? ViewGroup
+                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, binding.rewardsList, false) as? ViewGroup
                 val imageView = view?.findViewById<ImageView>(R.id.imageView)
                 imageView?.scaleType = ImageView.ScaleType.CENTER
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
                 val titleTextView = view?.findViewById<TextView>(R.id.titleTextView)
                 titleTextView?.text = context.getString(R.string.gold_reward, questContent.drop?.gp)
-                rewardsList.addView(view)
+                binding.rewardsList.addView(view)
             }
         }
     }
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..f6e6aa0b7 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
@@ -2,38 +2,46 @@ package com.habitrpg.android.habitica.ui.views.social
 
 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 +63,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)
@@ -70,41 +78,46 @@ class ChatBarView : LinearLayout {
     private var autocompleteAdapter: AutocompleteAdapter? = null
 
     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)
-        this.setBackgroundResource(R.color.white)
+        orientation = VERTICAL
+        this.setBackgroundResource(R.color.content_background)
 
         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 +125,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/InvitationsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
index 9fa48cb00..22baf82af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
@@ -2,14 +2,10 @@ package com.habitrpg.android.habitica.ui.views.social
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.Button
 import android.widget.LinearLayout
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.ViewInvitationBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.invitations.GenericInvitation
-import com.habitrpg.android.habitica.ui.AvatarView
-import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class InvitationsView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
@@ -18,12 +14,9 @@ class InvitationsView @JvmOverloads constructor(
     var acceptCall: ((String) -> Unit)? = null
     var rejectCall: ((String) -> Unit)? = null
     var setLeader: ((String) -> Unit)? = null
-    val avatarView: AvatarView by bindView(R.id.groupleader_avatar_view)
-    val textView: TextView by bindView(R.id.groupleader_text_view)
     var leaderID: String? = null
     var groupName: String? = null
     var leaderName: String? = null
-    val view = inflate(R.layout.view_invitation, true)
 
     init {
         orientation = VERTICAL
@@ -34,17 +27,17 @@ class InvitationsView @JvmOverloads constructor(
         for (invitation in invitations) {
             leaderID = invitation.inviter
             groupName = invitation.name
-            val view = inflate(R.layout.view_invitation, true)
+            val binding = ViewInvitationBinding.inflate(context.layoutInflater, this, true)
 
             leaderID?.let {
                 setLeader?.invoke(it)
                 invalidate()
             }
 
-            view.findViewById<Button>(R.id.accept_button).setOnClickListener {
+            binding.acceptButton.setOnClickListener {
                 invitation.id?.let { it1 -> acceptCall?.invoke(it1) }
             }
-            view.findViewById<Button>(R.id.reject_button).setOnClickListener {
+            binding.rejectButton.setOnClickListener {
                 invitation.id?.let { it1 -> rejectCall?.invoke(it1) }
             }
         }
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..263c38dd0 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
@@ -6,37 +6,31 @@ import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.QuestProgressOldBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestProgress
 import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIcons
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.ValueBar
-import kotlinx.android.synthetic.main.value_bar.view.*
 
 class OldQuestProgressView : LinearLayout {
-
-    private val bossNameView: TextView by bindView(R.id.bossNameView)
-    private val bossHealthView: ValueBar by bindView(R.id.bossHealthView)
-    private val bossRageView: ValueBar by bindView(R.id.bossRageView)
-    private val collectionContainer: ViewGroup by bindView(R.id.collectionContainer)
+    private val binding = QuestProgressOldBinding.inflate(context.layoutInflater, this)
 
     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)
@@ -48,15 +42,13 @@ class OldQuestProgressView : LinearLayout {
 
     private fun setupView(context: Context) {
         setWillNotDraw(false)
-        inflate(R.layout.quest_progress_old, true)
-
         orientation = VERTICAL
 
         setScaledPadding(context, 16, 16, 16, 16)
 
-        bossHealthView.setSecondaryIcon(HabiticaIconsHelper.imageOfHeartLightBg())
-        bossHealthView.setDescriptionIcon(HabiticaIconsHelper.imageOfDamage())
-        bossRageView.setSecondaryIcon(HabiticaIconsHelper.imageOfRage())
+        binding.bossHealthView.setSecondaryIcon(HabiticaIconsHelper.imageOfHeartLightBg())
+        binding.bossHealthView.setDescriptionIcon(HabiticaIconsHelper.imageOfDamage())
+        binding.bossRageView.setSecondaryIcon(HabiticaIconsHelper.imageOfRage())
     }
 
     override fun onDraw(canvas: Canvas?) {
@@ -70,30 +62,32 @@ class OldQuestProgressView : LinearLayout {
     }
 
     fun setData(quest: QuestContent, progress: QuestProgress?) {
-        collectionContainer.removeAllViews()
+        binding.collectionContainer.removeAllViews()
         if (quest.isBossQuest) {
-            bossNameView.text = quest.boss?.name
+            binding.bossNameView.text = quest.boss?.name
             if (progress != null) {
-                bossHealthView.set(progress.hp, quest.boss?.hp?.toDouble() ?: 0.0)
+                binding.bossHealthView.set(progress.hp, quest.boss?.hp?.toDouble() ?: 0.0)
             }
             if (quest.boss?.hasRage() == true) {
-                bossRageView.visibility = View.VISIBLE
-                bossRageView.set(progress?.rage ?: 0.0, quest.boss?.rage?.value ?: 0.0)
+                binding.bossRageView.visibility = View.VISIBLE
+                binding.bossRageView.set(progress?.rage ?: 0.0, quest.boss?.rage?.value ?: 0.0)
             } else {
-                bossRageView.visibility = View.GONE
+                binding.bossRageView.visibility = View.GONE
             }
-            bossNameView.visibility = View.VISIBLE
-            bossHealthView.visibility = View.VISIBLE
+            binding.bossNameView.visibility = View.VISIBLE
+            binding.bossHealthView.visibility = View.VISIBLE
+            binding.collectedItemsNumberView.visibility = View.GONE
         } else {
-            bossNameView.visibility = View.GONE
-            bossHealthView.visibility = View.GONE
-            bossRageView.visibility = View.GONE
+            binding.bossNameView.visibility = View.GONE
+            binding.bossHealthView.visibility = View.GONE
+            binding.bossRageView.visibility = View.GONE
+            binding.collectedItemsNumberView.visibility = View.VISIBLE
 
             if (progress != null) {
                 val inflater = LayoutInflater.from(context)
                 for (collect in progress.collect ?: emptyList<QuestProgressCollect>()) {
                     val contentCollect = quest.getCollectWithKey(collect.key) ?: continue
-                    val view = inflater.inflate(R.layout.quest_collect, collectionContainer, false)
+                    val view = inflater.inflate(R.layout.quest_collect, binding.collectionContainer, false)
                     val iconView = view.findViewById(R.id.icon_view) as? SimpleDraweeView
                     val nameView = view.findViewById(R.id.name_view) as? TextView
                     val valueView = view.findViewById(R.id.value_view) as? ValueBar
@@ -101,7 +95,7 @@ class OldQuestProgressView : LinearLayout {
                     nameView?.text = contentCollect.text
                     valueView?.set(collect.count.toDouble(), contentCollect.count.toDouble())
 
-                    collectionContainer.addView(view)
+                    binding.collectionContainer.addView(view)
                 }
             }
         }
@@ -109,14 +103,17 @@ class OldQuestProgressView : LinearLayout {
 
     fun configure(user: User, userOnQuest: Boolean?) {
         val value = (user.party?.quest?.progress?.up ?: 0F).toDouble()
+        val collectedItems = user.party?.quest?.progress?.collectedItems
         if (userOnQuest == true) {
-            bossHealthView.pendingValue = value
-            bossHealthView.description = String.format("%.01f dmg pending", value)
-            bossHealthView.descriptionIconView.visibility = View.VISIBLE
+            binding.bossHealthView.pendingValue = value
+            binding.bossHealthView.description = String.format("%.01f dmg pending", value)
+            binding.bossHealthView.descriptionIconVisibility = View.VISIBLE
+            binding.collectedItemsNumberView.text = context.getString(R.string.quest_items_found, collectedItems)
         } else {
-            bossHealthView.pendingValue = 0.0
-            bossHealthView.description = ""
-            bossHealthView.descriptionIconView.visibility = View.GONE
+            binding.bossHealthView.pendingValue = 0.0
+            binding.bossHealthView.description = ""
+            binding.bossHealthView.descriptionIconVisibility = View.GONE
+            binding.collectedItemsNumberView.text = ""
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt
index 64d359b0f..aec59b226 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt
@@ -6,34 +6,20 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.appcompat.widget.AppCompatImageButton
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
-import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.QuestMenuViewBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaProgressBar
 
 class QuestMenuView : LinearLayout {
-
-    private val bossArtView: SimpleDraweeView by bindView(R.id.bossArtView)
-    private val bossNameView: TextView by bindView(R.id.bossNameView)
-    private val typeTextView: TextView by bindView(R.id.typeTextView)
-    private val heartIconView: ImageView by bindView(R.id.heartIconView)
-    private val healthBarView: HabiticaProgressBar by bindView(R.id.healthBarView)
-    private val topView: LinearLayout by bindView(R.id.topView)
-    private val closeButton: AppCompatImageButton by bindView(R.id.closeButton)
-    private val bottomView: ViewGroup by bindView(R.id.bottomView)
-    private val pendingDamageIconView: ImageView by bindView(R.id.pendingDamageIconView)
-    private val pendingDamageTextView: TextView by bindView(R.id.pendingDamageTextView)
+    private val binding = QuestMenuViewBinding.inflate(context.layoutInflater, this, true)
 
     private var questContent: QuestContent? = null
 
@@ -49,11 +35,11 @@ class QuestMenuView : LinearLayout {
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         inflater.inflate(R.layout.quest_menu_view, this)
 
-        heartIconView.setImageBitmap(HabiticaIconsHelper.imageOfHeartDarkBg())
+        binding.heartIconView.setImageBitmap(HabiticaIconsHelper.imageOfHeartDarkBg())
 
-        pendingDamageIconView.setImageBitmap(HabiticaIconsHelper.imageOfDamage())
+        binding.pendingDamageIconView.setImageBitmap(HabiticaIconsHelper.imageOfDamage())
 
-        closeButton.setOnClickListener {
+        binding.closeButton.setOnClickListener {
             hideBossArt()
             val preferences = context.getSharedPreferences("collapsible_sections", 0)
             preferences?.edit {
@@ -63,39 +49,39 @@ class QuestMenuView : LinearLayout {
     }
 
     fun configure(quest: Quest) {
-        healthBarView.setCurrentValue(quest.progress?.hp ?: 0.0)
+        binding.healthBarView.setCurrentValue(quest.progress?.hp ?: 0.0)
     }
 
     fun configure(questContent: QuestContent) {
         this.questContent = questContent
-        healthBarView.setMaxValue(questContent.boss?.hp?.toDouble() ?: 0.0)
-        bottomView.setBackgroundColor(questContent.colors?.darkColor ?: 0)
-        bossArtView.setBackgroundColor(questContent.colors?.mediumColor ?: 0)
-        DataBindingUtils.loadImage(bossArtView, "quest_"+questContent.key)
-        bossNameView.text = questContent.boss?.name
+        binding.healthBarView.setMaxValue(questContent.boss?.hp?.toDouble() ?: 0.0)
+        binding.bottomView.setBackgroundColor(questContent.colors?.darkColor ?: 0)
+        binding.bossArtView.setBackgroundColor(questContent.colors?.mediumColor ?: 0)
+        DataBindingUtils.loadImage(binding.bossArtView, "quest_"+questContent.key)
+        binding.bossNameView.text = questContent.boss?.name
     }
 
     fun configure(user: User) {
-        pendingDamageTextView.text = String.format("%.01f", (user.party?.quest?.progress?.up ?: 0f))
+        binding.pendingDamageTextView.text = String.format("%.01f", (user.party?.quest?.progress?.up ?: 0f))
     }
 
     fun hideBossArt() {
-        topView.orientation = HORIZONTAL
-        topView.setBackgroundColor(questContent?.colors?.mediumColor ?: 0)
-        bossNameView.gravity = Gravity.LEFT
-        bossNameView.layoutParams = LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1F)
-        bossArtView.visibility = View.GONE
-        typeTextView.setTextColor(questContent?.colors?.extraLightColor ?: 0)
-        closeButton.visibility = View.GONE
+        binding.topView.orientation = HORIZONTAL
+        binding.topView.setBackgroundColor(questContent?.colors?.mediumColor ?: 0)
+        binding.bossNameView.gravity = Gravity.START
+        binding.bossNameView.layoutParams = LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1F)
+        binding.bossArtView.visibility = View.GONE
+        binding.typeTextView.setTextColor(questContent?.colors?.extraLightColor ?: 0)
+        binding.closeButton.visibility = View.GONE
     }
 
     fun showBossArt() {
-        topView.orientation = VERTICAL
-        topView.setBackgroundColor(ContextCompat.getColor(context, R.color.transparent))
-        bossNameView.gravity = Gravity.RIGHT
-        bossNameView.layoutParams = LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        bossArtView.visibility = View.VISIBLE
-        typeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
-        closeButton.visibility = View.VISIBLE
+        binding.topView.orientation = VERTICAL
+        binding.topView.setBackgroundColor(ContextCompat.getColor(context, R.color.transparent))
+        binding.bossNameView.gravity = Gravity.END
+        binding.bossNameView.layoutParams = LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        binding.bossArtView.visibility = View.VISIBLE
+        binding.typeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
+        binding.closeButton.visibility = View.VISIBLE
     }
 }
\ No newline at end of file
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..94981243b 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
@@ -10,7 +10,6 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -19,42 +18,27 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.QuestProgressBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
-import com.habitrpg.android.habitica.ui.views.*
+import com.habitrpg.android.habitica.ui.views.HabiticaIcons
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.NPCBannerView
+import com.habitrpg.android.habitica.ui.views.ValueBar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.realm.RealmList
 
 
 class QuestProgressView : LinearLayout {
-
-    private val questImageWrapper: FrameLayout by bindView(R.id.questImageWrapper)
-    private val questImageView: SimpleDraweeView by bindView(R.id.questImageView)
-    private val questFlourishesImageView: SimpleDraweeView by bindView(R.id.questFlourishesImageView)
-    private val questImageTitle: View by bindView(R.id.questImageTitle)
-    private val artCreditTextView: TextView by bindView(R.id.artCreditTextView)
-    private val questImageSeparator: View by bindView(R.id.questImageSeparator)
-    private val questImageCaretView: ImageView by bindView(R.id.caretView)
-    private val bossNameView: TextView by bindView(R.id.bossNameView)
-    private val pendingDamageIconView: ImageView by bindView(R.id.pendingDamageIconView)
-    private val pendingDamageTextView: TextView by bindView(R.id.pendingDamageTextView)
-    private val bossHealthView: ValueBar by bindView(R.id.bossHealthView)
-    private val rageMeterView: TextView by bindView(R.id.rageMeterView)
-    private val bossRageView: ValueBar by bindView(R.id.bossRageView)
-    private val rageStrikeDescriptionView: TextView by bindView(R.id.rageStrikeDescriptionView)
-    private val rageStrikeContainer: LinearLayout by bindView(R.id.rageStrikeContainer)
-    private val collectionContainer: ViewGroup by bindView(R.id.collectionContainer)
-    private val questDescriptionSection: CollapsibleSectionView by bindView(R.id.questDescriptionSection)
-    private val questDescriptionView: TextView by bindView(R.id.questDescription)
+    private val binding = QuestProgressBinding.inflate(context.layoutInflater, this, true)
 
     private val rect = RectF()
     private val displayDensity = context.resources.displayMetrics.density
@@ -82,27 +66,25 @@ class QuestProgressView : LinearLayout {
 
     private fun setupView(context: Context) {
         setWillNotDraw(false)
-        val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
-        inflater?.inflate(R.layout.quest_progress, this)
 
-        questImageCaretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(ContextCompat.getColor(context, R.color.white), true))
-        questImageTitle.setOnClickListener {
-            if (questImageWrapper.visibility == View.VISIBLE) {
+        binding.caretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(ContextCompat.getColor(context, R.color.white), true))
+        binding.questImageTitle.setOnClickListener {
+            if (binding.questImageWrapper.visibility == View.VISIBLE) {
                 hideQuestImage()
             } else {
                 showQuestImage()
             }
         }
 
-        pendingDamageIconView.setImageBitmap(HabiticaIconsHelper.imageOfDamage())
-        bossHealthView.setSecondaryIcon(HabiticaIconsHelper.imageOfHeartDarkBg())
-        bossRageView.setSecondaryIcon(HabiticaIconsHelper.imageOfRage())
+        binding.pendingDamageIconView.setImageBitmap(HabiticaIconsHelper.imageOfDamage())
+        binding.bossHealthView.setSecondaryIcon(HabiticaIconsHelper.imageOfHeartDarkBg())
+        binding.bossRageView.setSecondaryIcon(HabiticaIconsHelper.imageOfRage())
 
-        rageStrikeDescriptionView.setOnClickListener { showStrikeDescriptionAlert() }
+        binding.rageStrikeDescriptionView.setOnClickListener { showStrikeDescriptionAlert() }
 
         val density = resources.displayMetrics.density
 
-        questDescriptionSection.setCaretOffset((12 * density).toInt())
+        binding.questDescriptionSection.setCaretOffset((12 * density).toInt())
 
         preferences = context.getSharedPreferences("collapsible_sections", 0)
         if (preferences?.getBoolean("boss_art_collapsed", false) == true) {
@@ -131,75 +113,79 @@ class QuestProgressView : LinearLayout {
         if (quest == null || progress == null || !quest.isValid || !progress.isValid) {
             return
         }
-        collectionContainer.removeAllViews()
+        binding.collectionContainer.removeAllViews()
         if (quest.isBossQuest) {
-            bossNameView.text = quest.boss?.name
-            bossNameView.visibility = View.VISIBLE
-            bossHealthView.visibility = View.VISIBLE
-            bossHealthView.set(progress.progress?.hp ?: 0.0, quest.boss?.hp?.toDouble() ?: 0.0)
+            binding.bossNameView.text = quest.boss?.name
+            binding.bossNameView.visibility = View.VISIBLE
+            binding.bossHealthView.visibility = View.VISIBLE
+            binding.bossHealthView.set(progress.progress?.hp ?: 0.0, quest.boss?.hp?.toDouble() ?: 0.0)
+            binding.collectedItemsNumberView.visibility = View.GONE
 
             if (quest.boss?.hasRage() == true) {
-                rageMeterView.visibility = View.VISIBLE
-                bossRageView.visibility = View.VISIBLE
-                rageMeterView.text = quest.boss?.rage?.title
-                bossRageView.set(progress.progress?.rage ?: 0.0, quest.boss?.rage?.value ?: 0.0)
+                binding.rageMeterView.visibility = View.VISIBLE
+                binding.bossRageView.visibility = View.VISIBLE
+                binding.rageMeterView.text = quest.boss?.rage?.title
+                binding.bossRageView.set(progress.progress?.rage ?: 0.0, quest.boss?.rage?.value ?: 0.0)
                 if (progress.hasRageStrikes()) {
                     setupRageStrikeViews()
                 } else {
-                    rageStrikeDescriptionView.visibility = View.GONE
+                    binding.rageStrikeDescriptionView.visibility = View.GONE
                 }
             } else {
-                rageMeterView.visibility = View.GONE
-                bossRageView.visibility = View.GONE
-                rageStrikeDescriptionView.visibility = View.GONE
+                binding.rageMeterView.visibility = View.GONE
+                binding.bossRageView.visibility = View.GONE
+                binding.rageStrikeDescriptionView.visibility = View.GONE
             }
         } else {
-            bossNameView.visibility = View.GONE
-            bossHealthView.visibility = View.GONE
-            rageMeterView.visibility = View.GONE
-            bossRageView.visibility = View.GONE
-            rageStrikeDescriptionView.visibility = View.GONE
+            binding.bossNameView.visibility = View.GONE
+            binding.bossHealthView.visibility = View.GONE
+            binding.rageMeterView.visibility = View.GONE
+            binding.bossRageView.visibility = View.GONE
+            binding.rageStrikeDescriptionView.visibility = View.GONE
+            binding.collectedItemsNumberView.visibility = View.VISIBLE
 
             val collection = progress.progress?.collect
             if (collection != null) {
                 setCollectionViews(collection, quest)
             }
         }
-        questDescriptionView.setMarkdown(quest.notes)
-        DataBindingUtils.loadImage(questImageView, "quest_"+quest.key, "gif")
-        DataBindingUtils.loadImage(questFlourishesImageView, "quest_"+quest.key+"_flourishes")
+        binding.questDescription.setMarkdown(quest.notes)
+        DataBindingUtils.loadImage(binding.questImageView, "quest_"+quest.key, "gif")
+        DataBindingUtils.loadImage(binding.questFlourishesImageView, "quest_"+quest.key+"_flourishes")
         val lightColor =  quest.colors?.lightColor
         if (lightColor != null) {
-            questDescriptionSection.separatorColor = lightColor
-            questImageSeparator.setBackgroundColor(lightColor)
+            binding.questDescriptionSection.separatorColor = lightColor
+            binding.questImageSeparator.setBackgroundColor(lightColor)
 
             val gradientDrawable = GradientDrawable(
                     GradientDrawable.Orientation.TOP_BOTTOM,
                     intArrayOf(ContextCompat.getColor(context, R.color.transparent), lightColor))
             gradientDrawable.cornerRadius = 0f
-            questImageWrapper.background = gradientDrawable
+            binding.questImageWrapper.background = gradientDrawable
         }
         updateCaretImage()
-        questDescriptionSection.caretColor = quest.colors?.extraLightColor ?: 0
-        artCreditTextView.setTextColor(quest.colors?.extraLightColor ?: 0)
+        binding.questDescriptionSection.caretColor = quest.colors?.extraLightColor ?: 0
+        binding.artCreditTextView.setTextColor(quest.colors?.extraLightColor ?: 0)
     }
 
     fun configure(user: User) {
-        pendingDamageTextView.text = String.format("%.01f dmg pending", (user.party?.quest?.progress?.up ?: 0F) )
+        binding.pendingDamageTextView.text = String.format("%.01f dmg pending", (user.party?.quest?.progress?.up ?: 0F) )
+        val collectedItems = user.party?.quest?.progress?.collectedItems ?: 0
+        binding.collectedItemsNumberView.text = context.getString(R.string.quest_items_found, collectedItems)
     }
 
     private fun setupRageStrikeViews() {
-        rageStrikeDescriptionView.visibility = View.VISIBLE
-        rageStrikeDescriptionView.text = context.getString(R.string.rage_strike_count, progress?.activeRageStrikeNumber, progress?.rageStrikes?.size ?: 0)
+        binding.rageStrikeDescriptionView.visibility = View.VISIBLE
+        binding.rageStrikeDescriptionView.text = context.getString(R.string.rage_strike_count, progress?.activeRageStrikeNumber, progress?.rageStrikes?.size ?: 0)
 
-        rageStrikeContainer.removeAllViews()
+        binding.rageStrikeContainer.removeAllViews()
         progress?.rageStrikes?.sortedByDescending { it.wasHit }?.forEach { strike ->
             val iconView = ImageView(context)
             if (strike.wasHit) {
                 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
@@ -217,7 +203,7 @@ class QuestProgressView : LinearLayout {
             val params = LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
             val spacing = context.resources.getDimension(R.dimen.spacing_medium).toInt()
             params.setMargins(spacing, 0, spacing, 0)
-            rageStrikeContainer.addView(iconView, params)
+            binding.rageStrikeContainer.addView(iconView, params)
         }
     }
 
@@ -264,7 +250,7 @@ class QuestProgressView : LinearLayout {
         val inflater = LayoutInflater.from(context)
         for (collect in collection) {
             val contentCollect = quest.getCollectWithKey(collect.key) ?: continue
-            val view = inflater.inflate(R.layout.quest_collect, collectionContainer, false)
+            val view = inflater.inflate(R.layout.quest_collect, binding.collectionContainer, false)
             val iconView: SimpleDraweeView = view.findViewById(R.id.icon_view)
             val nameView: TextView = view.findViewById(R.id.name_view)
             val valueView: ValueBar = view.findViewById(R.id.value_view)
@@ -272,18 +258,7 @@ class QuestProgressView : LinearLayout {
             nameView.text = contentCollect.text
             valueView.set(collect.count.toDouble(), contentCollect.count.toDouble())
 
-            collectionContainer.addView(view)
-        }
-    }
-
-    private fun getNpcName(key: String): String {
-        return when (key) {
-            "market" -> context.getString(R.string.market_owner)
-            "tavern" -> context.getString(R.string.tavern_owner)
-            "questShop" -> context.getString(R.string.questShop_owner)
-            "seasonalShop" -> context.getString(R.string.seasonalShop_owner)
-            "stable" -> context.getString(R.string.stable_owner)
-            else -> ""
+            binding.collectionContainer.addView(view)
         }
     }
 
@@ -311,24 +286,24 @@ class QuestProgressView : LinearLayout {
 
 
     private fun showQuestImage() {
-        questImageWrapper.visibility = View.VISIBLE
-        DataBindingUtils.loadImage(questImageView, "quest_"+quest?.key)
+        binding.questImageWrapper.visibility = View.VISIBLE
+        DataBindingUtils.loadImage(binding.questImageView, "quest_"+quest?.key)
         preferences?.edit { putBoolean("boss_art_collapsed", false) }
         updateCaretImage()
     }
 
     private fun hideQuestImage() {
-        questImageWrapper.visibility = View.GONE
+        binding.questImageWrapper.visibility = View.GONE
         preferences?.edit { putBoolean("boss_art_collapsed", true) }
 
         updateCaretImage()
     }
 
     private fun updateCaretImage() {
-        if (questImageWrapper.visibility == View.VISIBLE) {
-            questImageCaretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(quest?.colors?.extraLightColor ?: 0, true))
+        if (binding.questImageWrapper.visibility == View.VISIBLE) {
+            binding.caretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(quest?.colors?.extraLightColor ?: 0, true))
         } else {
-            questImageCaretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(quest?.colors?.extraLightColor ?: 0, false))
+            binding.caretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(quest?.colors?.extraLightColor ?: 0, false))
         }
     }
 }
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..735d79982 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
@@ -3,22 +3,21 @@ package com.habitrpg.android.habitica.ui.views.stats
 import android.app.ProgressDialog
 import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.DialogBulkAllocateBinding
 import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.dialog_bulk_allocate.*
+import io.reactivex.rxjava3.disposables.Disposable
 import javax.inject.Inject
 
 class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : AlertDialog(context) {
-
+    private val binding = DialogBulkAllocateBinding.inflate(context.layoutInflater)
     @Inject
     lateinit var userRepository: UserRepository
 
@@ -27,10 +26,10 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     private val allocatedPoints: Int
         get() {
         var value = 0
-        value += strengthSliderView.currentValue
-        value += intelligenceSliderView.currentValue
-        value += constitutionSliderView.currentValue
-        value += perceptionSliderView.currentValue
+        value += binding.strengthSliderView.currentValue
+        value += binding.intelligenceSliderView.currentValue
+        value += binding.constitutionSliderView.currentValue
+        value += binding.perceptionSliderView.currentValue
         return value
     }
 
@@ -38,29 +37,26 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     set(value) {
         field = value
         updateTitle()
-        strengthSliderView.maxValue = pointsToAllocate
-        intelligenceSliderView.maxValue = pointsToAllocate
-        constitutionSliderView.maxValue = pointsToAllocate
-        perceptionSliderView.maxValue = pointsToAllocate
+        binding.strengthSliderView.maxValue = pointsToAllocate
+        binding.intelligenceSliderView.maxValue = pointsToAllocate
+        binding.constitutionSliderView.maxValue = pointsToAllocate
+        binding.perceptionSliderView.maxValue = pointsToAllocate
     }
 
     private var user: User? = null
     set(value) {
         field = value
         pointsToAllocate = user?.stats?.points ?: 0
-        strengthSliderView.previousValue = user?.stats?.strength ?: 0
-        intelligenceSliderView.previousValue = user?.stats?.intelligence ?: 0
-        constitutionSliderView.previousValue = user?.stats?.constitution ?: 0
-        perceptionSliderView.previousValue = user?.stats?.per ?: 0
+        binding.strengthSliderView.previousValue = user?.stats?.strength ?: 0
+        binding.intelligenceSliderView.previousValue = user?.stats?.intelligence ?: 0
+        binding.constitutionSliderView.previousValue = user?.stats?.constitution ?: 0
+        binding.perceptionSliderView.previousValue = user?.stats?.per ?: 0
     }
 
     init {
         component?.inject(this)
 
-        val inflater = LayoutInflater.from(context)
-        val view = inflater.inflate(R.layout.dialog_bulk_allocate, null)
-
-        setView(view)
+        setView(binding.root)
         this.setButton(BUTTON_POSITIVE, context.getString(R.string.save)) { _, _ ->
             saveChanges()
         }
@@ -72,7 +68,10 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     private fun saveChanges() {
         @Suppress("DEPRECATION")
         val progressDialog = ProgressDialog.show(context, context.getString(R.string.allocating_points), null, true)
-        userRepository.bulkAllocatePoints(user, strengthSliderView.currentValue, intelligenceSliderView.currentValue, constitutionSliderView.currentValue, perceptionSliderView.currentValue)
+        userRepository.bulkAllocatePoints(user, binding.strengthSliderView.currentValue,
+                binding.intelligenceSliderView.currentValue,
+                binding.constitutionSliderView.currentValue,
+                binding.perceptionSliderView.currentValue)
                 .subscribe({
                     progressDialog.dismiss()
                     this.dismiss()
@@ -85,24 +84,24 @@ 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())
 
-        strengthSliderView.allocateAction = {
-            checkRedistribution(strengthSliderView)
+        binding.strengthSliderView.allocateAction = {
+            checkRedistribution(binding.strengthSliderView)
             updateTitle()
         }
-        intelligenceSliderView.allocateAction = {
-            checkRedistribution(intelligenceSliderView)
+        binding.intelligenceSliderView.allocateAction = {
+            checkRedistribution(binding.intelligenceSliderView)
             updateTitle()
         }
-        constitutionSliderView.allocateAction = {
-            checkRedistribution(constitutionSliderView)
+        binding.constitutionSliderView.allocateAction = {
+            checkRedistribution(binding.constitutionSliderView)
             updateTitle()
         }
-        perceptionSliderView.allocateAction = {
-            checkRedistribution(perceptionSliderView)
+        binding.perceptionSliderView.allocateAction = {
+            checkRedistribution(binding.perceptionSliderView)
             updateTitle()
         }
     }
@@ -111,17 +110,17 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
         val diff = allocatedPoints - pointsToAllocate
         if (diff > 0) {
             var highestSlider: StatsSliderView? = null
-            if (excludedSlider != strengthSliderView) {
-                highestSlider = getSliderWithHigherValue(highestSlider, strengthSliderView)
+            if (excludedSlider != binding.strengthSliderView) {
+                highestSlider = getSliderWithHigherValue(highestSlider, binding.strengthSliderView)
             }
-            if (excludedSlider != intelligenceSliderView) {
-                highestSlider = getSliderWithHigherValue(highestSlider, intelligenceSliderView)
+            if (excludedSlider != binding.intelligenceSliderView) {
+                highestSlider = getSliderWithHigherValue(highestSlider, binding.intelligenceSliderView)
             }
-            if (excludedSlider != constitutionSliderView) {
-                highestSlider = getSliderWithHigherValue(highestSlider, constitutionSliderView)
+            if (excludedSlider != binding.constitutionSliderView) {
+                highestSlider = getSliderWithHigherValue(highestSlider, binding.constitutionSliderView)
             }
-            if (excludedSlider != perceptionSliderView) {
-                highestSlider = getSliderWithHigherValue(highestSlider, perceptionSliderView)
+            if (excludedSlider != binding.perceptionSliderView) {
+                highestSlider = getSliderWithHigherValue(highestSlider, binding.perceptionSliderView)
             }
             if (highestSlider != null) {
                 highestSlider.currentValue -= diff
@@ -143,11 +142,11 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     }
 
     private fun updateTitle() {
-        allocatedTitle.text = "$allocatedPoints/$pointsToAllocate"
+        binding.allocatedTitle.text = "$allocatedPoints/$pointsToAllocate"
         if (allocatedPoints > 0) {
-            titleView.setBackgroundColor(context.getThemeColor(R.attr.colorAccent))
+            binding.titleView.setBackgroundColor(context.getThemeColor(R.attr.colorAccent))
         } else {
-            titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_400))
+            binding.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/StatsSliderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt
index f0bf376c5..cd12cd67a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt
@@ -6,62 +6,59 @@ import android.graphics.PorterDuff
 import android.os.Build
 import android.util.AttributeSet
 import android.view.Gravity
-import android.view.View
 import android.widget.LinearLayout
 import android.widget.SeekBar
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.StatsSliderViewBinding
 import com.habitrpg.android.habitica.extensions.AfterChangeTextWatcher
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.extensions.styledAttributes
-import kotlinx.android.synthetic.main.stats_slider_view.view.*
 
 class StatsSliderView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+    private val binding = StatsSliderViewBinding.inflate(context.layoutInflater, this)
 
     var previousValue = 0
     set(value) {
         field = value
-        previousValueTextView.text = value.toString()
+        binding.previousValueTextView.text = value.toString()
     }
 
     var maxValue = 0
     set(value) {
         field = value
-        statsSeekBar.max = field
+        binding.statsSeekBar.max = field
     }
 
     var currentValue = 0
     set(value) {
         field = value
-        statsSeekBar.progress = value
-        valueEditText.setText(value.toString())
-        if (valueEditText.isFocused) {
-            valueEditText.setSelection(valueEditText.length())
+        binding.statsSeekBar.progress = value
+        binding.valueEditText.setText(value.toString())
+        if (binding.valueEditText.isFocused) {
+            binding.valueEditText.setSelection(binding.valueEditText.length())
         }
     }
 
     var allocateAction: ((Int) -> Unit)? = null
 
     init {
-        View.inflate(context, R.layout.stats_slider_view, this)
         gravity = Gravity.CENTER_VERTICAL
 
         val attributes = attrs?.styledAttributes(context, R.styleable.StatsSliderView)
 
         if (attributes != null) {
-            statTypeTitle.text = attributes.getString(R.styleable.StatsSliderView_statsTitle)
+            binding.statTypeTitle.text = attributes.getString(R.styleable.StatsSliderView_statsTitle)
             val statColor = attributes.getColor(R.styleable.StatsSliderView_statsColor, 0)
-            statTypeTitle.setTextColor(attributes.getColor(R.styleable.StatsSliderView_statsTextColor, 0))
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                statsSeekBar.progressTintList = ColorStateList.valueOf(statColor)
-            } else {
-                statsSeekBar.progressDrawable.setColorFilter(statColor, PorterDuff.Mode.SRC_IN)
-            }
+            binding.statTypeTitle.setTextColor(attributes.getColor(R.styleable.StatsSliderView_statsTextColor, 0))
+            binding.statsSeekBar.progressTintList = ColorStateList.valueOf(statColor)
             val thumbDrawable = ContextCompat.getDrawable(context, R.drawable.seekbar_thumb)
-            thumbDrawable?.setColorFilter(statColor, PorterDuff.Mode.MULTIPLY)
-            statsSeekBar.thumb = thumbDrawable
+            thumbDrawable?.setTintWith(statColor, PorterDuff.Mode.MULTIPLY)
+            binding.statsSeekBar.thumb = thumbDrawable
         }
 
-        valueEditText.addTextChangedListener(AfterChangeTextWatcher {s ->
+        binding.valueEditText.addTextChangedListener(AfterChangeTextWatcher {s ->
                 val newValue = try {
                     s.toString().toInt()
                 } catch (e: NumberFormatException) {
@@ -71,12 +68,12 @@ class StatsSliderView(context: Context, attrs: AttributeSet?) : LinearLayout(con
                     currentValue = newValue
                     allocateAction?.invoke(currentValue)
                 } else if (newValue > maxValue || newValue < 0) {
-                    valueEditText.setText(currentValue.toString())
-                    valueEditText.setSelection(valueEditText.length())
+                    binding.valueEditText.setText(currentValue.toString())
+                    binding.valueEditText.setSelection(binding.valueEditText.length())
                 }
         })
 
-        statsSeekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+        binding.statsSeekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
                 currentValue = progress
                 if (fromUser) {
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..3753e4845 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
@@ -7,52 +7,55 @@ import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.StatsViewBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import kotlinx.android.synthetic.main.stats_view.view.*
 
-class StatsView(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+    private val binding = StatsViewBinding.inflate(context.layoutInflater, this, true)
 
     var levelValue: Int = 0
         set(value) {
             field = value
-            levelValueTextView.text = value.toString()
+            binding.levelValueTextView.text = value.toString()
         }
     var equipmentValue: Int = 0
         set(value) {
             field = value
-            equipmentValueTextView.text = value.toString()
+            binding.equipmentValueTextView.text = value.toString()
         }
     var buffValue: Int = 0
         set(value) {
             field = value
-            buffValueTextView.text = value.toString()
+            binding.buffValueTextView.text = value.toString()
         }
     var allocatedValue: Int = 0
         set(value) {
             field = value
-            allocatedValueTextView.text = value.toString()
+            binding.allocatedValueTextView.text = value.toString()
         }
 
     var totalValue: Int = 0
         set(value) {
             field = value
-            totalValueTextView.text = value.toString()
+            binding.totalValueTextView.text = value.toString()
         }
 
     var canDistributePoints: Boolean = false
         set(value) {
             field = value
-            allocateButton.visibility = if (value) View.VISIBLE else View.GONE
+            binding.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))
-                allocatedValueTextView.setTextColor(statColor)
-                allocatedLabelView.setTextColor(statColor)
+                binding.allocatedWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background_30))
+                binding.allocateButton.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background_30))
+                binding.allocatedValueTextView.setTextColor(statColor)
+                binding.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))
+                binding.allocatedWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
+                binding.allocateButton.setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
+                binding.allocatedValueTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+                binding.allocatedLabelView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
             }
         }
 
@@ -61,27 +64,24 @@ class StatsView(context: Context?, attrs: AttributeSet?) : LinearLayout(context,
     private var statColor: Int = 0
 
     init {
-        View.inflate(context, R.layout.stats_view, this)
 
-        val attributes = context?.theme?.obtainStyledAttributes(
+        val attributes = context.theme?.obtainStyledAttributes(
                 attrs,
                 R.styleable.StatsView,
                 0, 0)
 
-        if (context != null) {
-            val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layout_top_rounded_bg)
-            if (attributes != null) {
-                statColor = attributes.getColor(R.styleable.StatsView_statsColor, 0)
-                backgroundDrawable?.setColorFilter(attributes.getColor(R.styleable.StatsView_titleBackgroundColor, 0), PorterDuff.Mode.MULTIPLY)
-                titleTextView.text = attributes.getString(R.styleable.StatsView_statsTitle)
-            }
-            titleWrapper.background = backgroundDrawable
+        val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layout_top_rounded_bg_white)
+        if (attributes != null) {
+            statColor = attributes.getColor(R.styleable.StatsView_statsColor, 0)
+            backgroundDrawable?.setTintWith(attributes.getColor(R.styleable.StatsView_titleBackgroundColor, 0), PorterDuff.Mode.MULTIPLY)
+            binding.titleTextView.text = attributes.getString(R.styleable.StatsView_statsTitle)
         }
+        binding.titleWrapper.background = backgroundDrawable
 
-        allocateButton.setOnClickListener {
+        binding.allocateButton.setOnClickListener {
             allocateAction?.invoke()
         }
 
-        allocateButton.setImageBitmap(HabiticaIconsHelper.imageOfAttributeAllocateButton())
+        binding.allocateButton.setImageBitmap(HabiticaIconsHelper.imageOfAttributeAllocateButton())
     }
 }
\ No newline at end of file
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..6028f5b00 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.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.gemCapTextView.setBackgroundResource(R.drawable.pill_bg_gray)
+            binding.gemCapTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            binding.hourglassTextView.setBackgroundResource(R.drawable.pill_bg_gray)
+            binding.hourglassTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
+            binding.descriptionTextView.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
         }
         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..f88964961 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
@@ -4,14 +4,12 @@ import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.drawable.Drawable
-import android.os.Bundle
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager
 import android.widget.*
 import androidx.annotation.IdRes
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.AppCompatCheckBox
 import androidx.core.content.ContextCompat
 import androidx.core.widget.CompoundButtonCompat
@@ -23,12 +21,14 @@ import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.tasks.Task
-import io.reactivex.Observable
-import io.reactivex.functions.Consumer
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import io.reactivex.rxjava3.core.Observable
 import java.util.*
 import javax.inject.Inject
 
-class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialog(context), RadioGroup.OnCheckedChangeListener {
+class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaAlertDialog(context), RadioGroup.OnCheckedChangeListener {
+
+    private var clearButton: Button
 
     @Inject
     lateinit var repository: TagRepository
@@ -61,7 +61,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
         val inflater = LayoutInflater.from(context)
         val view = inflater.inflate(R.layout.dialog_task_filter, null)
         setTitle(R.string.filters)
-        setView(view)
+        this.setAdditionalContentView(view)
 
         taskTypeTitle = view.findViewById(R.id.task_type_title)
         taskFilters = view.findViewById(R.id.task_filter_wrapper)
@@ -73,34 +73,26 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
 
         taskFilters.setOnCheckedChangeListener(this)
 
-        this.setButton(BUTTON_POSITIVE, context.getString(R.string.done)) { _, _ ->
+        clearButton = addButton(R.string.clear, false, false, false) { _, _ ->
+            if (isEditing) {
+                stopEditing()
+            }
+            setActiveFilter(null)
+            setActiveTags(null)
+        }
+
+        addButton(R.string.done, false) { _, _ ->
             if (isEditing) {
                 stopEditing()
             }
             listener?.onFilterCompleted(filterType, activeTags)
             this.dismiss()
         }
-
-        setButton(BUTTON_NEUTRAL, getContext().getString(R.string.clear)) { _, _ -> }
+        buttonAxis = LinearLayout.HORIZONTAL
 
         tagsEditButton.setOnClickListener { editButtonClicked() }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val clearButton = getButton(BUTTON_NEUTRAL)
-        if (clearButton != null) {
-            clearButton.setOnClickListener {
-                if (isEditing) {
-                    stopEditing()
-                }
-                setActiveFilter(null)
-                setActiveTags(null)
-            }
-            clearButton.isEnabled = hasActiveFilters()
-        }
-    }
-
     override fun show() {
         super.show()
         this.window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
@@ -127,11 +119,12 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
             val tagCheckbox = AppCompatCheckBox(context)
             tagCheckbox.text = tag.name
             tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
+            tagCheckbox.isChecked = activeTags.contains(tag.id)
             tagCheckbox.setPadding(tagCheckbox.paddingLeft + leftPadding,
                     verticalPadding,
                     tagCheckbox.paddingRight,
                     verticalPadding)
-            tagCheckbox.setTextColor(ContextCompat.getColor(context, R.color.textColorLight))
+            tagCheckbox.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
             CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList)
             tagCheckbox.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
@@ -155,8 +148,11 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
         button.setText(R.string.add_tag)
         button.setOnClickListener { createTag() }
         button.setCompoundDrawablesWithIntrinsicBounds(addIcon, null, null, null)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            button.compoundDrawableTintList = ColorStateList.valueOf(context.getThemeColor(R.attr.colorPrimary))
+        }
         button.setBackgroundResource(R.drawable.layout_rounded_bg_lighter_gray)
-        button.setTextColor(ContextCompat.getColor(context, R.color.text_light))
+        button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
         tagsList.addView(button)
     }
 
@@ -182,9 +178,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() {
@@ -213,7 +209,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
                 }
                 tags[index] = changedTag
         })
-        val deleteButton = wrapper?.findViewById<View>(R.id.delete_button) as? Button
+        val deleteButton = wrapper?.findViewById<View>(R.id.delete_button) as? ImageButton
         deleteButton?.setOnClickListener {
             deletedTags.add(tag.id)
             if (createdTags.containsKey(tag.id)) {
@@ -240,7 +236,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
         for (tagId in this.activeTags) {
             val index = indexForId(tagId)
             if (index >= 0) {
-                (tagsList.getChildAt(index) as? CheckBox)?.isChecked = true
+                (tagsList.getChildAt(index) as? AppCompatCheckBox)?.isChecked = true
             }
         }
         filtersChanged()
@@ -335,10 +331,12 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
     }
 
     private fun filtersChanged() {
-        val clearButton = getButton(BUTTON_NEUTRAL)
-        if (clearButton != null) {
-            clearButton.isEnabled = hasActiveFilters()
-        }
+        clearButton.isEnabled = hasActiveFilters()
+        clearButton.setTextColor(if (clearButton.isEnabled) {
+            context.getThemeColor(R.attr.colorAccent)
+        } else {
+            ContextCompat.getColor(context, R.color.text_dimmed)
+        })
     }
 
     private fun hasActiveFilters(): Boolean {
@@ -350,7 +348,6 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
     }
 
     interface OnFilterCompletedListener {
-
         fun onFilterCompleted(activeTaskFilter: String?, activeTags: MutableList<String>)
     }
 }
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..c5c0c3654 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
@@ -8,32 +8,25 @@ import android.view.ViewGroup
 import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
-import android.widget.ImageButton
 import android.widget.LinearLayout
-import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
-import com.habitrpg.android.habitica.extensions.dpToPx
-import com.habitrpg.android.habitica.extensions.getThemeColor
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.TaskFormChecklistItemBinding
+import com.habitrpg.android.habitica.extensions.*
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
-import com.habitrpg.android.habitica.ui.helpers.bindView
 
 
 class ChecklistItemFormView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : LinearLayout(context, attrs, defStyleAttr) {
-
-
-    private val button: ImageButton by bindView(R.id.button)
-    private val editText: AppCompatEditText by bindView(R.id.edit_text)
-    internal val dragGrip: View by bindView(R.id.drag_grip)
+    val dragGrip: View
+    get() = binding.dragGrip
+    val binding = TaskFormChecklistItemBinding.inflate(context.layoutInflater, this)
 
     var item: ChecklistItem = ChecklistItem()
     set(value) {
         field = value
-        editText.setText(item.text)
+        binding.editText.setText(item.text)
     }
 
     var tintColor: Int = context.getThemeColor(R.attr.taskFormTint)
@@ -43,19 +36,19 @@ class ChecklistItemFormView @JvmOverloads constructor(
     set(value) {
         // Button is only clickable when it is *not* an add button (ie when it is a delete button),
         // so make screenreaders skip it when it is an add button.
-        button.importantForAccessibility =
+        binding.button.importantForAccessibility =
                 if (value) View.IMPORTANT_FOR_ACCESSIBILITY_NO
                 else View.IMPORTANT_FOR_ACCESSIBILITY_YES
         if (field == value) {
             return
         }
         field = value
-        editText.hint = context.getString(if (value) R.string.new_checklist_item else R.string.checklist_text)
+        binding.editText.hint = context.getString(if (value) R.string.new_checklist_item else R.string.checklist_text)
         val rotate = if (value) {
-            dragGrip.visibility = View.GONE
+            binding.dragGrip.visibility = View.GONE
             RotateAnimation(135f, 0f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
         } else {
-            dragGrip.visibility = View.VISIBLE
+            binding.dragGrip.visibility = View.VISIBLE
             RotateAnimation(0f, 135f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
         }
         rotate.duration = animDuration
@@ -64,7 +57,7 @@ class ChecklistItemFormView @JvmOverloads constructor(
             override fun onAnimationRepeat(animation: Animation?) { /* no-on */ }
 
             override fun onAnimationEnd(animation: Animation?) {
-                button.rotation = if (value) {
+                binding.button.rotation = if (value) {
                     0f
                 } else {
                     135f
@@ -73,30 +66,29 @@ class ChecklistItemFormView @JvmOverloads constructor(
 
             override fun onAnimationStart(animation: Animation?) { /* no-on */ }
         })
-        button.startAnimation(rotate)
+        binding.button.startAnimation(rotate)
     }
 
     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
 
-        button.setOnClickListener {
+        binding.button.setOnClickListener {
             if (!isAddButton) {
                 (parent as? ViewGroup)?.removeView(this)
             }
         }
         // It's ok to make the description always be 'Delete ..' because when this button is
         // a plus button we set it as 'unimportant for accessibility' so it can't be focused.
-        button.contentDescription = context.getString(R.string.delete_checklist_entry)
-        button.drawable.mutate().setTint(tintColor)
+        binding.button.contentDescription = context.getString(R.string.delete_checklist_entry)
+        binding.button.drawable.mutate().setTint(tintColor)
 
-        editText.addTextChangedListener(OnChangeTextWatcher { s, _, _, _ ->
+        binding.editText.addTextChangedListener(OnChangeTextWatcher { s, _, _, _ ->
             item.text = s.toString()
             textChangedListener?.let { it(s.toString()) }
         })
-        editText.labelFor = button.id
+        binding.editText.labelFor = binding.button.id
     }
 }
\ No newline at end of file
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..2ab1036cb 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
@@ -4,29 +4,19 @@ import android.content.Context
 import android.graphics.Typeface
 import android.util.AttributeSet
 import android.view.Gravity
-import android.view.View
-import android.view.ViewGroup
 import android.view.accessibility.AccessibilityEvent
-import android.widget.ImageView
 import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.TaskFormHabitScoringBinding
 import com.habitrpg.android.habitica.extensions.asDrawable
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class HabitScoringButtonsView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : LinearLayout(context, attrs, defStyleAttr) {
-
-    private val positiveView: ViewGroup by bindView(R.id.positive_view)
-    private val negativeView: ViewGroup by bindView(R.id.negative_view)
-    private val positiveImageView: ImageView by bindView(R.id.positive_image_view)
-    private val negativeImageView: ImageView by bindView(R.id.negative_image_view)
-    private val positiveTextView: TextView by bindView(R.id.positive_text_view)
-    private val negativeTextView: TextView by bindView(R.id.negative_text_view)
-
+    private val binding = TaskFormHabitScoringBinding.inflate(context.layoutInflater, this)
 
     var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
     var textTintColor: Int? = null
@@ -34,30 +24,30 @@ class HabitScoringButtonsView @JvmOverloads constructor(
     var isPositive = true
         set(value) {
             field = value
-            positiveImageView.setImageDrawable(HabiticaIconsHelper.imageOfHabitControlPlus(tintColor, value).asDrawable(resources))
+            binding.positiveImageView.setImageDrawable(HabiticaIconsHelper.imageOfHabitControlPlus(tintColor, value).asDrawable(resources))
             if (value) {
-                positiveTextView.setTextColor(textTintColor ?: tintColor)
-                positiveView.contentDescription = toContentDescription(R.string.positive_habit_form, R.string.on)
-                positiveTextView.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
+                binding.positiveTextView.setTextColor(textTintColor ?: tintColor)
+                binding.positiveView.contentDescription = toContentDescription(R.string.positive_habit_form, R.string.on)
+                binding.positiveTextView.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
             } else {
-                positiveTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
-                positiveView.contentDescription = toContentDescription(R.string.positive_habit_form, R.string.off)
-                positiveTextView.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
+                binding.positiveTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+                binding.positiveView.contentDescription = toContentDescription(R.string.positive_habit_form, R.string.off)
+                binding.positiveTextView.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
             }
         }
 
     var isNegative = true
         set(value) {
             field = value
-            negativeImageView.setImageDrawable(HabiticaIconsHelper.imageOfHabitControlMinus(tintColor, value).asDrawable(resources))
+            binding.negativeImageView.setImageDrawable(HabiticaIconsHelper.imageOfHabitControlMinus(tintColor, value).asDrawable(resources))
             if (value) {
-                negativeTextView.setTextColor(textTintColor ?: tintColor)
-                negativeView.contentDescription = toContentDescription(R.string.negative_habit_form, R.string.on)
-                negativeTextView.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
+                binding.negativeTextView.setTextColor(textTintColor ?: tintColor)
+                binding.negativeView.contentDescription = toContentDescription(R.string.negative_habit_form, R.string.on)
+                binding.negativeTextView.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
             } else {
-                negativeTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
-                negativeView.contentDescription = toContentDescription(R.string.negative_habit_form, R.string.off)
-                negativeTextView.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
+                binding.negativeTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+                binding.negativeView.contentDescription = toContentDescription(R.string.negative_habit_form, R.string.off)
+                binding.negativeTextView.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
             }
         }
 
@@ -66,16 +56,15 @@ class HabitScoringButtonsView @JvmOverloads constructor(
     }
 
     init {
-        View.inflate(context, R.layout.task_form_habit_scoring, this)
         gravity = Gravity.CENTER
 
-        positiveView.setOnClickListener {
+        binding.positiveView.setOnClickListener {
             isPositive = !isPositive
             sendAccessibilityEvent(AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION)
         }
-        negativeView.setOnClickListener {
+        binding.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/ReminderContainer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt
index 49a2e018f..c45607e6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt
@@ -53,6 +53,8 @@ class ReminderContainer @JvmOverloads constructor(
             layoutTransition = animatedTransitions
         }
 
+    var firstDayOfWeek: Int? = null
+
     init {
         orientation = VERTICAL
 
@@ -61,6 +63,7 @@ class ReminderContainer @JvmOverloads constructor(
 
     private fun addReminderViewAt(index: Int, item: RemindersItem? = null) {
         val view = ReminderItemFormView(context)
+        view.firstDayOfWeek = firstDayOfWeek
         view.taskType = taskType
         item?.let {
             view.item = it
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..e24f98ce7 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
@@ -10,15 +10,17 @@ import android.view.ViewGroup
 import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
-import android.widget.*
+import android.widget.DatePicker
+import android.widget.LinearLayout
+import android.widget.TimePicker
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.TaskFormReminderItemBinding
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.getThemeColor
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.tasks.RemindersItem
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import java.text.DateFormat
 import java.util.*
 
@@ -26,10 +28,16 @@ import java.util.*
 class ReminderItemFormView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : LinearLayout(context, attrs, defStyleAttr), TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
-
-
-    private val button: ImageButton by bindView(R.id.button)
-    private val textView: TextView by bindView(R.id.text_view)
+    private val formattedTime: CharSequence?
+    get() {
+        val time = item.time
+        return if (time != null) {
+            formatter.format(time)
+        } else {
+            ""
+        }
+    }
+    private val binding = TaskFormReminderItemBinding.inflate(context.layoutInflater, this)
 
     private val formatter: DateFormat
         get() {
@@ -44,53 +52,54 @@ class ReminderItemFormView @JvmOverloads constructor(
     var item: RemindersItem = RemindersItem()
         set(value) {
             field = value
-            textView.text = formatter.format(item.time)
+            binding.textView.text = formattedTime
         }
 
+    var firstDayOfWeek: Int? = null
+
     var tintColor: Int = context.getThemeColor(R.attr.taskFormTint)
     var valueChangedListener: ((Date) -> Unit)? = null
     var animDuration = 0L
     var isAddButton: Boolean = true
         set(value) {
             field = value
-            textView.text = if (value) context.getString(R.string.new_reminder) else formatter.format(item.time)
+            binding.textView.text = if (value) context.getString(R.string.new_reminder) else formattedTime
             if (value) {
                 val rotate = RotateAnimation(135f, 0f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
                 rotate.duration = animDuration
                 rotate.interpolator = LinearInterpolator()
                 rotate.fillAfter = true
-                button.startAnimation(rotate)
+                binding.button.startAnimation(rotate)
                 // This button is not clickable in this state, so make screen readers skip it.
-                button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+                binding.button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
             } else {
                 val rotate = RotateAnimation(0f, 135f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
                 rotate.duration = animDuration
                 rotate.interpolator = LinearInterpolator()
                 rotate.fillAfter = true
-                button.startAnimation(rotate)
+                binding.button.startAnimation(rotate)
                 // This button IS now clickable, so allow screen readers to focus it.
-                button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
+                binding.button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
             }
         }
 
     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
 
-        button.setOnClickListener {
+        binding.button.setOnClickListener {
             if (!isAddButton) {
                 (parent as? ViewGroup)?.removeView(this)
             }
         }
         // It's ok to make the description always be 'Delete Reminder' because when this button is
         // a plus button we set it as 'unimportant for accessibility' so it can't be focused.
-        button.contentDescription = context.getString(R.string.delete_reminder)
-        button.drawable.mutate().setTint(tintColor)
+        binding.button.contentDescription = context.getString(R.string.delete_reminder)
+        binding.button.drawable.mutate().setTint(tintColor)
 
-        textView.setOnClickListener {
+        binding.textView.setOnClickListener {
             val calendar = Calendar.getInstance()
             item.time?.let { calendar.time = it }
             if (taskType == Task.TYPE_DAILY) {
@@ -104,10 +113,13 @@ class ReminderItemFormView @JvmOverloads constructor(
                         calendar.get(Calendar.YEAR),
                         calendar.get(Calendar.MONTH),
                         calendar.get(Calendar.DAY_OF_MONTH))
+                if ((firstDayOfWeek ?: -1) >= 0) {
+                    timePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek ?: 0
+                }
                 timePickerDialog.show()
             }
         }
-        textView.labelFor = button.id
+        binding.textView.labelFor = binding.button.id
     }
     override fun onTimeSet(view: TimePicker?, hourOfDay: Int, minute: Int) {
         valueChangedListener?.let {
@@ -116,7 +128,7 @@ class ReminderItemFormView @JvmOverloads constructor(
             calendar.set(Calendar.HOUR_OF_DAY, hourOfDay)
             calendar.set(Calendar.MINUTE, minute)
             item.time = calendar.time
-            textView.text = formatter.format(item.time)
+            binding.textView.text = formattedTime
             item.time?.let { date -> it(date) }
         }
     }
@@ -129,7 +141,7 @@ class ReminderItemFormView @JvmOverloads constructor(
             calendar.set(Calendar.MONTH, month)
             calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth)
             item.time = calendar.time
-            textView.text = formatter.format(item.time)
+            binding.textView.text = formattedTime
             item.time?.let { date -> it(date) }
 
             val timePickerDialog = TimePickerDialog(context, this,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
index 9474944a1..32749bfad 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
@@ -3,24 +3,19 @@ package com.habitrpg.android.habitica.ui.views.tasks.form
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
-import android.widget.EditText
-import android.widget.ImageButton
 import android.widget.RelativeLayout
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.FormStepperValueBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.asDrawable
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.text.DecimalFormat
 
 class StepperValueFormView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : RelativeLayout(context, attrs, defStyleAttr) {
-
-    private val editText: EditText by bindView(R.id.edit_text)
-    private val upButton: ImageButton by bindView(R.id.up_button)
-    private val downButton: ImageButton by bindView(R.id.down_button)
+    private val binding = FormStepperValueBinding.inflate(context.layoutInflater, this)
 
     var onValueChanged: ((Double) -> Unit)? = null
 
@@ -40,10 +35,10 @@ class StepperValueFormView @JvmOverloads constructor(
         if (oldValue != new) {
             valueString = decimalFormat.format(newValue)
         }
-        downButton.isEnabled = field > minValue
+        binding.downButton.isEnabled = field > minValue
         maxValue?.let {
             if (it == 0.0) return@let
-            upButton.isEnabled = value < it
+            binding.upButton.isEnabled = value < it
         }
 
         onValueChanged?.invoke(value)
@@ -54,7 +49,7 @@ class StepperValueFormView @JvmOverloads constructor(
 
     private var valueString = ""
     set(value) {
-        val hasChanged = field != value || editText.text.toString() != field
+        val hasChanged = field != value || binding.editText.text.toString() != field
         field = value
         if (value.isEmpty()) {
             onValueChanged?.invoke(0.0)
@@ -62,9 +57,9 @@ class StepperValueFormView @JvmOverloads constructor(
         }
 
         if (hasChanged) {
-            editText.setText(field)
+            binding.editText.setText(field)
             if (editTextIsFocused) {
-                editText.setSelection(field.length)
+                binding.editText.setSelection(field.length)
             }
         }
         val newValue = field.toDoubleOrNull() ?: 0.0
@@ -75,15 +70,13 @@ class StepperValueFormView @JvmOverloads constructor(
 
     var iconDrawable: Drawable?
     get() {
-        return editText.compoundDrawables.firstOrNull()
+        return binding.editText.compoundDrawables.firstOrNull()
     }
     set(value) {
-        editText.setCompoundDrawablesWithIntrinsicBounds(value, null, null, null)
+        binding.editText.setCompoundDrawablesWithIntrinsicBounds(value, null, null, null)
     }
 
     init {
-        inflate(R.layout.form_stepper_value, true)
-
         val attributes = context.theme?.obtainStyledAttributes(
                 attrs,
                 R.styleable.StepperValueFormView,
@@ -96,16 +89,16 @@ class StepperValueFormView @JvmOverloads constructor(
         iconDrawable = attributes?.getDrawable(R.styleable.StepperValueFormView_iconDrawable) ?: HabiticaIconsHelper.imageOfGold().asDrawable(context.resources)
 
 
-        upButton.setOnClickListener {
+        binding.upButton.setOnClickListener {
             value += 1
         }
-        downButton.setOnClickListener {
+        binding.downButton.setOnClickListener {
             value -= 1
         }
 
-        editText.addTextChangedListener(OnChangeTextWatcher { s, _, _, _ ->
+        binding.editText.addTextChangedListener(OnChangeTextWatcher { s, _, _, _ ->
             valueString = s.toString()
         })
-        editText.setOnFocusChangeListener { _, hasFocus -> editTextIsFocused = hasFocus }
+        binding.editText.setOnFocusChangeListener { _, hasFocus -> editTextIsFocused = hasFocus }
     }
 }
\ No newline at end of file
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..d1d05120f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
@@ -31,7 +31,9 @@ class TaskDifficultyButtons @JvmOverloads constructor(
     }
     private lateinit var selectedButton: View
 
-    init {
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        removeAllViews()
         addAllButtons()
     }
 
@@ -48,7 +50,7 @@ class TaskDifficultyButtons @JvmOverloads constructor(
                 addView(space)
             }
             if (difficulty.value == selectedDifficulty) {
-                selectedButton = button;
+                selectedButton = button
             }
         }
     }
@@ -63,8 +65,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..f208eb473 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
@@ -8,18 +8,16 @@ import android.os.Build
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
-import android.view.ViewGroup
 import android.view.accessibility.AccessibilityEvent
 import android.widget.*
-import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.TaskFormTaskSchedulingBinding
 import com.habitrpg.android.habitica.extensions.dpToPx
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.tasks.Days
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.adapter.SimpleSpinnerAdapter
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import java.text.DateFormat
 import java.text.DateFormatSymbols
 import java.util.*
@@ -27,22 +25,9 @@ import java.util.*
 class TaskSchedulingControls @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : LinearLayout(context, attrs, defStyleAttr), DatePickerDialog.OnDateSetListener {
-
+    private val binding = TaskFormTaskSchedulingBinding.inflate(context.layoutInflater, this)
     var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
 
-    private val startDateWrapper: ViewGroup by bindView(R.id.start_date_wrapper)
-    private val startDateTitleView: TextView by bindView(R.id.start_date_title)
-    private val startDateTextView: TextView by bindView(R.id.start_date_textview)
-    private val repeatsEveryWrapper: ViewGroup by bindView(R.id.repeats_every_wrapper)
-    private val repeatsEverySpinner: Spinner by bindView(R.id.repeats_every_spinner)
-    private val repeatsEveryEdittext: AppCompatEditText by bindView(R.id.repeats_every_edittext)
-    private val repeatsEveryTitleView: TextView by bindView(R.id.repeats_every_title)
-    private val weeklyRepeatWrapper: ViewGroup by bindView(R.id.weekly_repeat_wrapper)
-    private val monthlyRepeatWrapper: ViewGroup by bindView(R.id.monthly_repeat_wrapper)
-    private val monthlyRepeatDaysButton: TextView by bindView(R.id.monthly_repeat_days)
-    private val monthlyRepeatWeeksButton: TextView by bindView(R.id.monthly_repeat_weeks)
-    private val summaryTextView: TextView by bindView(R.id.summary_textview)
-
     private val dateFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM)
     private val frequencyAdapter = SimpleSpinnerAdapter(context, R.array.repeatables_frequencies)
 
@@ -57,7 +42,7 @@ class TaskSchedulingControls @JvmOverloads constructor(
     var startDate = Date()
     set(value) {
         field = value
-        startDateTextView.text = dateFormatter.format(value)
+        binding.startDateTextview.text = dateFormatter.format(value)
         startDateCalendar.time = value
         generateSummary()
     }
@@ -66,15 +51,15 @@ class TaskSchedulingControls @JvmOverloads constructor(
     set(value) {
         field = value
         if (value != null) {
-            startDateTextView.text = dateFormatter.format(value)
+            binding.startDateTextview.text = dateFormatter.format(value)
         } else {
-            startDateTextView.text = null
+            binding.startDateTextview.text = null
         }
     }
     var frequency = Task.FREQUENCY_DAILY
     set(value) {
         field = value
-        repeatsEverySpinner.setSelection(when (value) {
+        binding.repeatsEverySpinner.setSelection(when (value) {
             Task.FREQUENCY_WEEKLY -> 1
             Task.FREQUENCY_MONTHLY -> 2
             Task.FREQUENCY_YEARLY -> 3
@@ -84,12 +69,12 @@ class TaskSchedulingControls @JvmOverloads constructor(
         generateSummary()
     }
     var everyX
-        get() = (repeatsEveryEdittext.text ?: "1").toString().toIntOrNull() ?: 1
+        get() = (binding.repeatsEveryEdittext.text ?: "1").toString().toIntOrNull() ?: 1
     set(value) {
         try {
-            repeatsEveryEdittext.setText(value.toString())
+            binding.repeatsEveryEdittext.setText(value.toString())
         } catch (e: NumberFormatException) {
-            repeatsEveryEdittext.setText("1")
+            binding.repeatsEveryEdittext.setText("1")
         }
         generateSummary()
     }
@@ -113,6 +98,8 @@ class TaskSchedulingControls @JvmOverloads constructor(
         generateSummary()
     }
 
+    var firstDayOfWeek: Int? = null
+
     private val weekdays: Array<String> by lazy {
         DateFormatSymbols().weekdays
     }
@@ -123,15 +110,14 @@ class TaskSchedulingControls @JvmOverloads constructor(
     }
 
     init {
-        inflate(R.layout.task_form_task_scheduling, true)
-        repeatsEverySpinner.adapter = frequencyAdapter
+        binding.repeatsEverySpinner.adapter = frequencyAdapter
 
         frequency = Task.FREQUENCY_WEEKLY
         startDate = Date()
         everyX = 1
         weeklyRepeat = Days()
 
-        repeatsEverySpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        binding.repeatsEverySpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
                 frequency = frequency
             }
@@ -146,7 +132,7 @@ class TaskSchedulingControls @JvmOverloads constructor(
             }
         }
 
-        startDateWrapper.setOnClickListener {
+        binding.startDateWrapper.setOnClickListener {
             val datePickerDialog = DatePickerDialog(context, this,
                     startDateCalendar.get(Calendar.YEAR),
                     startDateCalendar.get(Calendar.MONTH),
@@ -158,6 +144,10 @@ class TaskSchedulingControls @JvmOverloads constructor(
                     startDate = Date()
                 }
             }
+
+            if ((firstDayOfWeek ?: -1) >= 0) {
+                datePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek ?: 0
+            }
             if (taskType == Task.TYPE_TODO) {
                 datePickerDialog.setButton(DialogInterface.BUTTON_NEUTRAL, resources.getString(R.string.clear)) { _, _ ->
                     dueDate = null
@@ -166,12 +156,12 @@ class TaskSchedulingControls @JvmOverloads constructor(
             datePickerDialog.show()
         }
 
-        monthlyRepeatDaysButton.setOnClickListener {
+        binding.monthlyRepeatDays.setOnClickListener {
             daysOfMonth = mutableListOf(startDateCalendar.get(Calendar.DATE))
             weeksOfMonth = null
             generateSummary()
         }
-        monthlyRepeatWeeksButton.setOnClickListener {
+        binding.monthlyRepeatWeeks.setOnClickListener {
             weeksOfMonth = mutableListOf(startDateCalendar.get(Calendar.WEEK_OF_MONTH) - 1)
             daysOfMonth = null
             generateSummary()
@@ -183,10 +173,10 @@ class TaskSchedulingControls @JvmOverloads constructor(
     }
 
     private fun configureViewsForType() {
-        startDateTitleView.text = context.getString(if (taskType == Task.TYPE_DAILY) R.string.start_date else R.string.due_date)
-        repeatsEveryWrapper.visibility = if (taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
-        summaryTextView.visibility =  if (taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
-        weeklyRepeatWrapper.visibility = if (taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
+        binding.startDateTitle.text = context.getString(if (taskType == Task.TYPE_DAILY) R.string.start_date else R.string.due_date)
+        binding.repeatsEveryWrapper.visibility = if (taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
+        binding.summaryTextview.visibility =  if (taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
+        binding.weeklyRepeatWrapper.visibility = if (taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
     }
 
     override fun onDateSet(view: DatePicker?, year: Int, month: Int, dayOfMonth: Int) {
@@ -199,14 +189,14 @@ class TaskSchedulingControls @JvmOverloads constructor(
     }
 
     private fun configureViewsForFrequency() {
-        repeatsEveryTitleView.text = context.getText(when (frequency) {
+        binding.repeatsEveryTitle.text = context.getText(when (frequency) {
             Task.FREQUENCY_WEEKLY -> R.string.weeks
             Task.FREQUENCY_MONTHLY -> R.string.months
             Task.FREQUENCY_YEARLY -> R.string.years
             else -> R.string.days
         })
-        weeklyRepeatWrapper.visibility = if (frequency == Task.FREQUENCY_WEEKLY && taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
-        monthlyRepeatWrapper.visibility = if (frequency == Task.FREQUENCY_MONTHLY && taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
+        binding.weeklyRepeatWrapper.visibility = if (frequency == Task.FREQUENCY_WEEKLY && taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
+        binding.monthlyRepeatWrapper.visibility = if (frequency == Task.FREQUENCY_MONTHLY && taskType == Task.TYPE_DAILY) View.VISIBLE else View.GONE
         if (frequency == Task.FREQUENCY_WEEKLY) {
             createWeeklyRepeatViews()
         } else if (frequency == Task.FREQUENCY_MONTHLY) {
@@ -227,7 +217,7 @@ class TaskSchedulingControls @JvmOverloads constructor(
             1 -> weeklyRepeat.su = isActive
         }
         createWeeklyRepeatViews()
-        weeklyRepeatWrapper.findViewWithTag<TextView>(weekday).sendAccessibilityEvent(
+        binding.weeklyRepeatWrapper.findViewWithTag<TextView>(weekday).sendAccessibilityEvent(
                 AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION)
         generateSummary()
     }
@@ -246,7 +236,7 @@ class TaskSchedulingControls @JvmOverloads constructor(
     }
 
     private fun createWeeklyRepeatViews() {
-        weeklyRepeatWrapper.removeAllViews()
+        binding.weeklyRepeatWrapper.removeAllViews()
         val size = 32.dpToPx(context)
         val lastWeekday = weekdayOrder.last()
         for (weekdayCode in weekdayOrder) {
@@ -258,37 +248,37 @@ 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)
             }
-            weeklyRepeatWrapper.addView(button)
+            binding.weeklyRepeatWrapper.addView(button)
             if (weekdayCode != lastWeekday) {
                 val space = Space(context)
                 val spaceLayoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT)
                 spaceLayoutParams.weight = 1f
                 space.layoutParams = spaceLayoutParams
-                weeklyRepeatWrapper.addView(space)
+                binding.weeklyRepeatWrapper.addView(space)
             }
         }
     }
 
     private fun configureMonthlyRepeatViews() {
         if (daysOfMonth != null && daysOfMonth?.isEmpty() != true) {
-            styleButtonAsActive(monthlyRepeatDaysButton)
+            styleButtonAsActive(binding.monthlyRepeatDays)
         } else {
-            styleButtonAsInactive(monthlyRepeatDaysButton)
+            styleButtonAsInactive(binding.monthlyRepeatDays)
         }
         if (weeksOfMonth != null && weeksOfMonth?.isEmpty() != true) {
-            styleButtonAsActive(monthlyRepeatWeeksButton)
+            styleButtonAsActive(binding.monthlyRepeatWeeks)
         } else {
-            styleButtonAsInactive(monthlyRepeatWeeksButton)
+            styleButtonAsInactive(binding.monthlyRepeatWeeks)
         }
     }
 
@@ -299,7 +289,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)
     }
@@ -371,6 +361,6 @@ class TaskSchedulingControls @JvmOverloads constructor(
         val everyXString = if (everyX == 1) "" else "$everyX "
 
         val summary = resources.getString(R.string.repeat_summary, frequency, everyXString, frequencyQualifier, weekdays)
-        summaryTextView.text = summary
+        binding.summaryTextview.text = summary
     }
 }
\ No newline at end of file
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..81d9777d0 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
@@ -2,27 +2,28 @@ package com.habitrpg.android.habitica.ui.views.yesterdailies
 
 import android.app.Activity
 import android.content.Context
-import android.os.Build
+import android.graphics.PorterDuff
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.CheckBox
+import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.helpers.bindColor
 import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
@@ -30,9 +31,6 @@ import kotlin.math.abs
 class YesterdailyDialog private constructor(context: Context, private val userRepository: UserRepository, private val taskRepository: TaskRepository, private val tasks: List<Task>) : HabiticaAlertDialog(context) {
 
     private lateinit var yesterdailiesList: LinearLayout
-
-    private val taskGray: Int by bindColor(context, R.color.task_gray)
-
     init {
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
         val view = inflater?.inflate(R.layout.dialog_yesterdaily, null)
@@ -49,7 +47,6 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
             runCron()
         }
 
-        //Can't use by bindView() because the view doesn't seem to be available through that yet
         val listView = view?.findViewById(R.id.yesterdailies_list) as? LinearLayout
         if (listView != null) {
             yesterdailiesList = listView
@@ -57,6 +54,8 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
         if (inflater != null) {
             createTaskViews(inflater)
         }
+
+        dialogWidth = 360.dpToPx(context)
     }
 
     override fun onAttachedToWindow() {
@@ -85,58 +84,80 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
             taskContainer.setOnClickListener {
                 task.completed = !task.completed
                 configureTaskView(taskView, task)
+
+                if (task.checklist?.size ?: 0 > 0) {
+                    val checklistContainer = taskView.findViewById<ViewGroup>(R.id.checklistView)
+                    checklistContainer.removeAllViews()
+                    for (item in task.checklist ?: emptyList<ChecklistItem>()) {
+                        val checklistView = inflater.inflate(R.layout.checklist_item_row, checklistContainer, false) as ViewGroup
+                        configureChecklistView(checklistView, task, item)
+                        checklistContainer.addView(checklistView)
+                    }
+                }
             }
 
             if (task.checklist?.size ?: 0 > 0) {
-                val checklistDivider = taskView.findViewById<View>(R.id.checklistDivider)
-                checklistDivider.visibility = View.VISIBLE
                 val checklistContainer = taskView.findViewById<ViewGroup>(R.id.checklistView)
                 for (item in task.checklist ?: emptyList<ChecklistItem>()) {
-                    val checklistView = inflater.inflate(R.layout.checklist_item_row, yesterdailiesList, false)
+                    val checklistView = inflater.inflate(R.layout.checklist_item_row, checklistContainer, false) as ViewGroup
                     configureChecklistView(checklistView, task, item)
                     checklistContainer.addView(checklistView)
                 }
             }
-            val checkBox = taskView.findViewById(R.id.checkBox) as? CheckBox
-            checkBox?.isEnabled = false
-            checkBox?.isClickable = false
             yesterdailiesList.addView(taskView)
         }
     }
 
-    private fun configureChecklistView(checklistView: View, task: Task, item: ChecklistItem) {
-        val checkbox = checklistView.findViewById(R.id.checkBox) as? CheckBox
-        checkbox?.isChecked = item.completed
-        checkbox?.setOnCheckedChangeListener { _, isChecked ->
-            item.completed = isChecked
-            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+    private fun configureChecklistView(checklistView: ViewGroup, task: Task, item: ChecklistItem) {
+        val checkmark = checklistView.findViewById<ImageView>(R.id.checkmark)
+        checkmark?.drawable?.setTint(task.darkestTaskColor)
+        checkmark?.visibility = if (item.completed) View.VISIBLE else View.GONE
+        val checkboxHolder = checklistView.findViewById<View>(R.id.checkBoxHolder) as? ViewGroup
+        checkboxHolder?.setOnClickListener { _ ->
+            item.completed = !item.completed
+            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(if (task.completed) {
+            R.color.offset_background
+        } else {
+            task.extraLightTaskColor
+        })
         val textView = checklistView.findViewById(R.id.checkedTextView) as? TextView
         textView?.text = item.text
+        val checkboxBackground = checklistView.findViewById<View>(R.id.checkBoxBackground)
+        checkboxBackground?.backgroundTintList = ContextCompat.getColorStateList(context, (if (context.isUsingNightModeResources()) {
+            if (task.completed) {
+                R.color.checkbox_fill
+            } else {
+                task.lightTaskColor
+            }
+        } else {
+            R.color.checkbox_fill
+        }))
     }
 
     private fun configureTaskView(taskView: View, task: Task) {
         val completed = !task.isDisplayedActive
-        val checkbox = taskView.findViewById(R.id.checkBox) as? CheckBox
+        val checkmark = taskView.findViewById<View>(R.id.checkmark)
         val checkboxHolder = taskView.findViewById<View>(R.id.checkBoxHolder)
-        checkbox?.isChecked = completed
+        val checkboxBackground = taskView.findViewById<View>(R.id.checkbox_background)
+        checkmark?.visibility = if (completed) View.VISIBLE else View.GONE
         if (completed) {
-            checkboxHolder.setBackgroundColor(this.taskGray)
+            checkboxHolder.setBackgroundResource(R.color.window_background)
+            checkboxBackground.setBackgroundResource(R.drawable.daily_checked)
         } else {
             checkboxHolder.setBackgroundResource(task.lightTaskColor)
+            checkboxBackground.setBackgroundResource(R.drawable.daily_unchecked)
         }
 
         val emojiView = taskView.findViewById<View>(R.id.text_view) as? HabiticaEmojiTextView
         emojiView?.text = task.markdownText { emojiView?.text = it }
-
     }
 
 
@@ -168,14 +189,27 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
                         }
                         .retry(1)
                         .throttleFirst(2, TimeUnit.SECONDS)
-                        .subscribe(Consumer { tasks ->
+                        .filter {
                             if (isDisplaying) {
-                                return@Consumer
+                                return@filter false
                             }
 
                             if (abs((lastCronRun?.time ?: 0) - Date().time) < 60 * 60 * 1000L) {
-                                return@Consumer
+                                return@filter false
                             }
+                            return@filter true
+                        }
+                        .firstElement()
+                        .zipWith(taskRepository.getTasks(Task.TYPE_DAILY).firstElement()
+                                .map {
+                                    val taskMap = mutableMapOf<String, Int>()
+                                    it.forEachIndexed { index, task -> taskMap[task.id ?: ""] = index }
+                                    taskMap
+                                }
+                        ) { yesterdayTasks, dailies ->
+                            yesterdayTasks.sortedBy { dailies[it.id ?: ""] }
+                        }
+                        .subscribe({ tasks ->
                             val additionalData = HashMap<String, Any>()
                             additionalData["task count"] = tasks.size
                             AmplitudeManager.sendEvent("show cron", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
index ebeb26846..5ce780352 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
@@ -51,10 +51,6 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
             pet.key = petObj.getAsString("key")
             pet.text = petObj.getAsString("text")
             pet.type = petObj.getAsString("type")
-            if (pet.type == "special") {
-                pet.animal = pet.key.split("-")[0]
-                pet.color = pet.key.split("-")[1]
-            }
             if (pet.type == "premium") {
                 pet.premium = true
             }
@@ -70,10 +66,6 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
             mount.key = mountObj.getAsString("key")
             mount.text = mountObj.getAsString("text")
             mount.type = mountObj.getAsString("type")
-            if (mount.type == "special") {
-                mount.animal = mount.key.split("-")[0]
-                mount.color = mount.key.split("-")[1]
-            }
             if (mount.type == "premium") {
                 mount.premium = true
             }
@@ -104,6 +96,13 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
         }
         result.appearances = context.deserialize(obj.get("appearances"), object : TypeToken<RealmList<Customization>>() {}.type)
         result.backgrounds = context.deserialize(obj.get("backgrounds"), object : TypeToken<RealmList<Customization>>() {}.type)
+        val noBackground = Customization()
+        noBackground.customizationSet = "incentiveBackgrounds"
+        noBackground.customizationSetName = "Login Incentive"
+        noBackground.identifier = ""
+        noBackground.price = 0
+        noBackground.type = "background"
+        result.backgrounds.add(noBackground)
 
         result.faq = context.deserialize(obj.get("faq"), object : TypeToken<RealmList<FAQArticle>>() {}.type)
         deserializeTrace.stop()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
index ff5c4e42c..4e2f82c62 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.utils
 
+import android.os.Build
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
@@ -17,18 +18,25 @@ import java.util.TimeZone
 
 class DateDeserializer : JsonDeserializer<Date>, JsonSerializer<Date> {
 
-    private val dateFormat: DateFormat
-    private val alternativeFormat: DateFormat
-    private val nextDueFormat: DateFormat
+    private var dateFormats = mutableListOf<DateFormat>()
 
     init {
-        dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
-        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
-        alternativeFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US)
-        alternativeFormat.timeZone = TimeZone.getTimeZone("UTC")
-        nextDueFormat = SimpleDateFormat("E MMM dd yyyy HH:mm:ss zzzz", Locale.US)
-        nextDueFormat.timeZone = TimeZone.getTimeZone("UTC")
+        addFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+        addFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
+        addFormat("E MMM dd yyyy HH:mm:ss zzzz")
+        addFormat("yyyy-MM-dd'T'HH:mm:sszzz")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            addFormat("yyyy-MM-dd'T'HH:mmX")
+        } else {
+            addFormat("yyyy-MM-dd'T'HH:mm")
+        }
+        addFormat("yyyy-MM-dd")
+    }
 
+    private fun addFormat(s: String) {
+        val dateFormat = SimpleDateFormat(s, Locale.US)
+        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
+        dateFormats.add(dateFormat)
     }
 
     @Synchronized
@@ -45,37 +53,27 @@ class DateDeserializer : JsonDeserializer<Date>, JsonSerializer<Date> {
             return null
         }
         val jsonString = element.asString
-        return try {
-            dateFormat.parse(jsonString)
-        } catch (e: ParseException) {
+        var date: Date? = null
+        var index = 0
+        while (index < dateFormats.size && date == null) {
             try {
-                alternativeFormat.parse(jsonString)
-            } catch (e1: ParseException) {
-                try {
-                    nextDueFormat.parse(jsonString)
-                } catch (e2: ParseException) {
-                    try {
-                        val timestamp = jsonElement.asLong
-                        if (timestamp > 0) {
-                            Date(timestamp)
-                        } else {
-                            null
-                        }
-                    } catch (e3: NumberFormatException) {
-                        null
-                    }
-
-                }
-
-            }
-
+                date = dateFormats[index].parse(jsonString)
+            } catch (_: ParseException) {}
+            index += 1
         }
-
+        if (date == null) {
+            date = try {
+                Date(element.asLong)
+            } catch (e3: NumberFormatException) {
+                null
+            }
+        }
+        return date
     }
 
     override fun serialize(src: Date?, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
         return if (src == null) {
             JsonPrimitive("")
-        } else JsonPrimitive(this.dateFormat.format(src))
+        } else JsonPrimitive(this.dateFormats[0].format(src))
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt
index b9e61c8cd..574283a73 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt
@@ -6,6 +6,7 @@ import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestRageStrike
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.tasks.TasksOrder
 import io.realm.Realm
 import io.realm.RealmList
 import java.lang.reflect.Type
@@ -107,6 +108,11 @@ class GroupSerialization : JsonDeserializer<Group>, JsonSerializer<Group> {
                 group.leaderOnlyGetGems = leaderOnly.get("getGems").asBoolean
             }
         }
+
+        if (obj.has("tasksOrder")) {
+            group.tasksOrder = context.deserialize(obj.get("tasksOrder"), TasksOrder::class.java)
+        }
+
         return group
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
index 1e0dd78e1..d7eb91821 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
@@ -60,10 +60,10 @@ class MemberSerialization : JsonDeserializer<Member> {
 
             val items = obj.getAsJsonObject("items")
             if (items.has("currentMount") && items.get("currentMount").isJsonPrimitive) {
-                member.setCurrentMount(items.get("currentMount").asString)
+                member.currentMount = items.get("currentMount").asString
             }
             if (items.has("currentPet") && items.get("currentPet").isJsonPrimitive) {
-                member.setCurrentPet(items.get("currentPet").asString)
+                member.currentPet = items.get("currentPet").asString
             }
             if (items.has("gear")) {
                 val gear = items.getAsJsonObject("gear")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt
index 346919239..eecff35b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt
@@ -33,6 +33,9 @@ class QuestDeserializer : JsonDeserializer<Quest> {
             if (progressObj.has("down")) {
                 progress.down = progressObj.get("down").asFloat
             }
+            if (progressObj.has("collectedItems")) {
+                progress.collectedItems = progressObj.get("collectedItems").asInt
+            }
             if (progressObj.has("collect")) {
                 progress.collect = RealmList()
                 for ((key, value) in progressObj.getAsJsonObject("collect").entrySet()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
index 7a89a3d58..57584e183 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
@@ -120,13 +120,15 @@ class TaskListDeserializer : JsonDeserializer<TaskList> {
                     }
 
                     if (obj.has("group")) {
-                        val group = TaskGroupPlan()
                         val groupObject = obj.getAsJsonObject("group")
-                        val approvalObject = groupObject.getAsJsonObject("approval")
-                        group.approvalRequested = approvalObject.getAsJsonPrimitive("requested").asBoolean
-                        group.approvalApproved = approvalObject.getAsJsonPrimitive("approved").asBoolean
-                        group.approvalRequired = approvalObject.getAsJsonPrimitive("required").asBoolean
-                        task.group = group
+                        val group: TaskGroupPlan = ctx.deserialize(groupObject, TaskGroupPlan::class.java)
+                        if (group.groupID?.isNotBlank() == true) {
+                            val approvalObject = groupObject.getAsJsonObject("approval")
+                            if (approvalObject.has("requested")) group.approvalRequested = approvalObject.getAsJsonPrimitive("requested").asBoolean
+                            if (approvalObject.has("approved")) group.approvalApproved = approvalObject.getAsJsonPrimitive("approved").asBoolean
+                            if (approvalObject.has("required")) group.approvalRequired = approvalObject.getAsJsonPrimitive("required").asBoolean
+                            task.group = group
+                        }
                     }
                     // Work around since Realm does not support Arrays of ints
                     getMonthlyDays(e, task)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
index eb4389494..68b1ab729 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
@@ -179,6 +179,13 @@ class UserDeserializer : JsonDeserializer<User> {
                 }
                 user.questAchievements = questAchievements
             }
+            if (achievements.has("challenges")) {
+                val challengeAchievements = RealmList<String>()
+                for (entry in achievements.getAsJsonArray("challenges")) {
+                    challengeAchievements.add(entry.asString)
+                }
+                user.challengeAchievements = challengeAchievements
+            }
         }
 
         if (obj.has("_ABTests")) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
index b22125571..01f2a0f67 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
@@ -3,47 +3,63 @@ package com.habitrpg.android.habitica.utils
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
+import com.habitrpg.android.habitica.extensions.getAsString
 import com.habitrpg.android.habitica.models.WorldState
 import com.habitrpg.android.habitica.models.inventory.QuestProgress
 import com.habitrpg.android.habitica.models.inventory.QuestRageStrike
 import java.lang.reflect.Type
+import java.util.*
 
 class WorldStateSerialization: JsonDeserializer<WorldState> {
 
     override fun deserialize(json: JsonElement?, typeOfT: Type?, context: JsonDeserializationContext?): WorldState {
         val worldBossObject = json?.asJsonObject?.get("worldBoss")?.asJsonObject
         val state = WorldState()
-        if (worldBossObject == null) {
-            return state
-        }
-        if (worldBossObject.has("active") && !worldBossObject["active"].isJsonNull) {
-            state.worldBossActive = worldBossObject["active"].asBoolean
-        }
-        if (worldBossObject.has("key") && !worldBossObject["key"].isJsonNull) {
-            state.worldBossKey = worldBossObject["key"].asString
-        }
-        if (worldBossObject.has("progress")) {
-            val progress = QuestProgress()
-            val progressObj = worldBossObject.getAsJsonObject("progress")
-            if (progressObj.has("hp")) {
-                progress.hp = progressObj["hp"].asDouble
+        if (worldBossObject != null) {
+            if (worldBossObject.has("active") && !worldBossObject["active"].isJsonNull) {
+                state.worldBossActive = worldBossObject["active"].asBoolean
             }
-            if (progressObj.has("rage")) {
-                progress.rage = progressObj["rage"].asDouble
+            if (worldBossObject.has("key") && !worldBossObject["key"].isJsonNull) {
+                state.worldBossKey = worldBossObject["key"].asString
             }
-            state.progress = progress
-        }
-        if (worldBossObject.has("extra")) {
-            val extra = worldBossObject["extra"].asJsonObject
-            if (extra.has("worldDmg")) {
-                val worldDmg = extra["worldDmg"].asJsonObject
-                state.rageStrikes = mutableListOf()
-                worldDmg.entrySet().forEach { (key, value) ->
-                    val strike = QuestRageStrike(key, value.asBoolean)
-                    state.rageStrikes?.add(strike)
+            if (worldBossObject.has("progress")) {
+                val progress = QuestProgress()
+                val progressObj = worldBossObject.getAsJsonObject("progress")
+                if (progressObj.has("hp")) {
+                    progress.hp = progressObj["hp"].asDouble
+                }
+                if (progressObj.has("rage")) {
+                    progress.rage = progressObj["rage"].asDouble
+                }
+                state.progress = progress
+            }
+            if (worldBossObject.has("extra")) {
+                val extra = worldBossObject["extra"].asJsonObject
+                if (extra.has("worldDmg")) {
+                    val worldDmg = extra["worldDmg"].asJsonObject
+                    state.rageStrikes = mutableListOf()
+                    worldDmg.entrySet().forEach { (key, value) ->
+                        val strike = QuestRageStrike(key, value.asBoolean)
+                        state.rageStrikes?.add(strike)
+                    }
                 }
             }
         }
+
+        try {
+            if (json?.asJsonObject?.has("currentEvent") == true && json.asJsonObject?.get("currentEvent")?.isJsonObject == true) {
+                val event = json.asJsonObject?.getAsJsonObject("currentEvent")
+                if (event != null) {
+                    state.currentEventKey = event.getAsString("event")
+                    state.currentEventPromo = if (event.has("promo")) event.getAsString("promo") else null
+                    state.currentEventStartDate = context?.deserialize(event.get("start"), Date::class.java)
+                    state.currentEventEndDate = context?.deserialize(event.get("end"), Date::class.java)
+                }
+            }
+        } catch (e: Exception) {
+
+        }
+
         return state
     }
 
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..bdc920cb8 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
@@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.functions.Consumer
 
 class AvatarStatsWidgetProvider : BaseWidgetProvider() {
 
@@ -41,7 +40,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,10 +113,10 @@ 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)
-            })
+            }
 
             //If user click on life and xp: open the app
             val openAppIntent = Intent(context.applicationContext, MainActivity::class.java)
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..2380b4f9e 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
@@ -10,8 +10,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.responses.TaskDirection
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 class HabitButtonWidgetProvider : BaseWidgetProvider() {
@@ -65,7 +63,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..78a05c28b 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
@@ -20,8 +20,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import io.reactivex.functions.Consumer
-import net.pherth.android.emoji_library.EmojiHandler
 import java.util.*
 import javax.inject.Inject
 
@@ -45,12 +43,12 @@ 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()
 
-        return Service.START_STICKY
+        return START_STICKY
     }
 
     private fun updateData(task: Task?) {
@@ -59,7 +57,6 @@ class HabitButtonWidgetService : Service() {
             val parsedText = MarkdownParser.parseMarkdown(task.text)
 
             val builder = SpannableStringBuilder(parsedText)
-            EmojiHandler.addEmojis(this.context, builder, 16, DynamicDrawableSpan.ALIGN_BASELINE, 16, 0, -1, false)
 
             remoteViews.setTextViewText(R.id.habit_title, builder)
 
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..f94b36da2 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
@@ -15,10 +15,8 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import net.pherth.android.emoji_library.EmojiHandler
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import java.util.*
 import javax.inject.Inject
 
@@ -50,7 +48,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)
@@ -84,7 +82,6 @@ abstract class TaskListFactory internal constructor(val context: Context, intent
             val parsedText = MarkdownParser.parseMarkdown(task.text)
 
             val builder = SpannableStringBuilder(parsedText)
-            EmojiHandler.addEmojis(this.context, builder, 16, DynamicDrawableSpan.ALIGN_BASELINE, 16, 0, -1, false)
 
             remoteView.setTextViewText(listItemTextResId, builder)
             remoteView.setInt(R.id.checkbox_background, "setBackgroundResource", task.lightTaskColor)
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..94a20fcff 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
@@ -12,7 +12,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
 abstract class TaskListWidgetProvider : BaseWidgetProvider() {
@@ -42,7 +41,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/helpers/RemindersManagerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/RemindersManagerTest.java
index ef0d2a2f1..f3b279713 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/RemindersManagerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/RemindersManagerTest.java
@@ -11,12 +11,7 @@ public class RemindersManagerTest {
 
     @Test
     public void itCreatesRemindersItemFromDateString() {
- //       RemindersManager remindersManager = new RemindersManager("habits");
 
-//        RemindersItem remindersItem = remindersManager.createReminderFromDateString("dd MMMM yyyy HH:mm:ss")
-
-        // assert statements
-        assertEquals("10 x 0 must be 0", 0, 10 * 0 );
     }
 
 }
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
index f99496bf0..3af3fb80e 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.helpers;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.HabitRpgClass;
 import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.members.Member;
 import com.habitrpg.android.habitica.models.user.Stats;
@@ -61,8 +60,8 @@ public class UserStatComputerTest {
 
     @Test
     public void shouldReturnClassBonusRowWhenClassMatches () {
-        user.getStats().setHabitClass(HabitRpgClass.rogue);
-        equipment.setKlass(HabitRpgClass.rogue.toString());
+        user.getStats().setHabitClass(Stats.ROGUE);
+        equipment.setKlass(Stats.ROGUE);
 
         List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
@@ -78,9 +77,9 @@ public class UserStatComputerTest {
 
     @Test
     public void ShouldReturnClassBonusRowWhenSpecialClassMatches () {
-        user.getStats().setHabitClass(HabitRpgClass.rogue);
+        user.getStats().setHabitClass(Stats.ROGUE);
         equipment.setKlass("");
-        equipment.setSpecialClass(HabitRpgClass.rogue.toString());
+        equipment.setSpecialClass(Stats.ROGUE);
 
         List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
@@ -96,7 +95,7 @@ public class UserStatComputerTest {
 
     @Test
     public void shouldNotReturnClassBonusWhenClassDoesNotMatch () {
-        user.getStats().setHabitClass(HabitRpgClass.rogue);
+        user.getStats().setHabitClass(Stats.ROGUE);
         equipment.setKlass("");
         equipment.setSpecialClass("");
 
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
index 207068303..9beab9368 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
@@ -1,8 +1,5 @@
 package com.habitrpg.android.habitica.models;
 
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.OwnedMount;
 import com.habitrpg.android.habitica.models.user.OwnedPet;
@@ -10,9 +7,6 @@ import com.habitrpg.android.habitica.models.user.User;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import io.realm.RealmList;
 
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..e9b761533 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
@@ -22,7 +22,7 @@ class MountTest {
         mount.type = "drop"
         `when`(mockContext.getString(R.string.standard)).thenReturn(FAKE_STANDARD)
 
-        val result: String = mount.getTranslatedType(mockContext)
+        val result = mount.getTranslatedType(mockContext)
 
         assertThat(result).isEqualTo(FAKE_STANDARD)
     }
@@ -31,7 +31,7 @@ class MountTest {
     fun testGetTranslatedStringReturnsPremiumWhenContextIsNull() {
         mount.type = "premium"
 
-        val result: String = mount.getTranslatedType(null)
+        val result = mount.getTranslatedType(null)
 
         assertThat(result).isEqualTo(FAKE_PREMIUM)
     }
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..f0a4fe04c 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
@@ -22,7 +22,7 @@ class PetTest {
         pet.type = "drop"
         `when`(mockContext.getString(R.string.standard)).thenReturn(FAKE_STANDARD)
 
-        val result: String = pet.getTranslatedType(mockContext)
+        val result = pet.getTranslatedType(mockContext)
 
         assertThat(result).isEqualTo(FAKE_STANDARD)
     }
@@ -31,7 +31,7 @@ class PetTest {
     fun testGetTranslatedStringReturnsPremiumWhenContextIsNull() {
         pet.type = "premium"
 
-        val result: String = pet.getTranslatedType(null)
+        val result = pet.getTranslatedType(null)
 
         assertThat(result).isEqualTo(FAKE_PREMIUM)
     }
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
index b0635f4b2..bb60cd864 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
@@ -6,13 +6,8 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 
-import com.habitrpg.android.habitica.BuildConfig;
-
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.lang.reflect.Type;
 import java.util.Date;
diff --git a/Habitica/staff/release/output-metadata.json b/Habitica/staff/release/output-metadata.json
new file mode 100644
index 000000000..dbd35fc2b
--- /dev/null
+++ b/Habitica/staff/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.habitrpg.android.habitica",
+  "variantName": "processStaffReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 2685,
+      "versionName": "3.1.1",
+      "outputFile": "Habitica-staff-release.apk"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 2435ac223..7aab545bb 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,14 @@ For an introduction to the technologies used and how the software is organized,
 
 Thank you very much [to all contributors](https://github.com/HabitRPG/habitrpg-android/graphs/contributors).
 
+#### How mobile releases work
+
+All major mobile releases are organized by Milestones labeled with the release number. The 'Help Wanted' is added to any issue we feel would be okay for a contributor to work on, so look for that tag first! We do our best to answer any questions contributors may have regarding issues marked with that tag. If an issue does not have the 'Help Wanted' tag, that means staff will handle it when we have the availability. 
+
+The mobile team consists of one developer and one designer for both Android and iOS. Because of this, we switch back and forth for releases. While we work on one platform, the other will be put on hold. This may result in a wait time for PRs to be reviewed or questions to be answered. Any PRs submitted while we're working on a different platform will be assigned to the next Milestone and we will review it when we come back!
+
+Given that our team is stretched pretty thin, it can be difficult for us to take an active role in helping to troubleshoot how to fix issues, but we always do our best to help as much as possible :) With this in mind, when selecting issues to work on it may be best to pick up issues you already have a good idea how to handle and test. Thank you for putting in your time to help make Habitica the best it can be!
+
 #### Steps for contributing to this repository:
 
 1. Fork it
@@ -78,4 +86,4 @@ You can install our code style scheme to Intellij and/or Android Studio via this
 
 
 
-3. If using Android Studio, click Sync Project with Gradle Files. Update Android Studio if it asks you to update. Run Habitica.
\ No newline at end of file
+3. If using Android Studio, click Sync Project with Gradle Files. Update Android Studio if it asks you to update. Run Habitica.
diff --git a/build.gradle b/build.gradle
index 501f17995..8a0656d40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,9 @@
 // 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.21'
     ext.build_tools_version = '29.0.0'
-    ext.sdk_version = 28
+    ext.sdk_version = 30
 
     repositories {
         google()
@@ -11,15 +11,15 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         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 "io.realm:realm-gradle-plugin:6.0.2"
+        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
+        classpath "io.realm:realm-gradle-plugin:10.3.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.1.0"
         classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"
-        classpath 'com.google.firebase:perf-plugin:1.3.1'
+        classpath 'com.google.firebase:perf-plugin:1.3.4'
     }
 }
 
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index 25826cb08..c37397f06 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,3 +1 @@
-Thank you for helping us with beta testing!
-
-Be sure to download this update now for a better Habitica experience!
+This update is full of bug fixes and quality of life upgrades. You can now use the Fortify Potion! If your tasks are getting out of hand and you’re overwhelmed with red, just get a Fortify Potion from the Market and it will reset all tasks to a neutral value. You’ll now receive an in-app message when you’ve won a Challenge and won Challenges will be listed in your Achievements. We’ve also improved the flow for hatching Pets, receiving Pet Achievements, starting Quests, and creating Challenges.
diff --git a/gradle.properties b/gradle.properties
index c87c025fb..a90b57c59 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=true
 android.debug.obsoleteApi=true
 org.gradle.configureondemand=true
 org.gradle.daemon=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b0cd6c560..da26324ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 03 15:04:01 CEST 2020
+#Tue Oct 27 17:32:09 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip