diff --git a/Gemfile.lock b/Gemfile.lock
index 7ad7fbb7d..cbf714ee3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-properties (1.1.2)
       java-properties
-    fastlane-plugin-semantic_release (1.14.1)
+    fastlane-plugin-semantic_release (1.18.0)
     fastlane-plugin-versioning_android (0.1.0)
     gh_inspector (1.1.3)
     google-api-client (0.38.0)
diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 2ca257b22..798548e15 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <application
         android:name=".HabiticaApplication"
@@ -29,7 +30,6 @@
             android:value="@string/application_ad_id"/>
         <activity
             android:name=".ui.activities.MainActivity"
-            android:label="@string/app_name"
             android:theme="@style/LaunchAppTheme"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="screenSize | smallestScreenSize | screenLayout | orientation"
@@ -148,6 +148,16 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.activities.MainActivity" />
         </activity>
+        <activity
+            android:name=".ui.activities.TaskSummaryActivity"
+            android:parentActivityName=".ui.activities.MainActivity"
+            tools:ignore="UnusedAttribute"
+            android:configChanges="screenSize | smallestScreenSize | screenLayout | orientation"
+            android:windowSoftInputMode="stateVisible|adjustResize">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.activities.MainActivity" />
+        </activity>
         <activity
             android:name=".ui.activities.GroupFormActivity"
             android:parentActivityName=".ui.activities.MainActivity"
@@ -204,9 +214,6 @@
                   android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity android:name=".ui.activities.GemPurchaseActivity"
                   android:screenOrientation="unspecified" />
-        <activity android:name=".ui.activities.VerifyUsernameActivity"
-            android:screenOrientation="unspecified"
-            android:windowSoftInputMode="stateHidden" />
         <receiver android:name=".receivers.NotificationPublisher" />
 
         <receiver android:name=".receivers.TaskReceiver" android:enabled="true" android:exported="true">
@@ -256,6 +263,12 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_gryphon_white" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/brand_300" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="@string/content_provider"
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 356787ad7..babbc5ce3 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -35,7 +35,6 @@ dependencies {
         exclude module: 'okhttp'
     }
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
 
     //Dependency Injection
     implementation "com.google.dagger:dagger:$daggerhilt_version"
@@ -43,7 +42,7 @@ dependencies {
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
     //App Compatibility and Material Design
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.7.0'
     implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
     implementation "androidx.preference:preference-ktx:$preferences_version"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -54,17 +53,11 @@ dependencies {
     implementation('com.jaredrummler:android-device-names:2.1.0')
 
     // IAP Handling / Verification
-    implementation "com.android.billingclient:billing-ktx:5.0.0"
+    implementation "com.android.billingclient:billing-ktx:5.1.0"
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
-    //RxJava
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.4'
-    implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
-    implementation "com.github.akarnokd:rxjava3-bridge:3.0.2"
 
     //Analytics
-    implementation "com.amplitude:android-sdk:$amplitude_version"
+    implementation "com.amplitude:analytics-android:$amplitude_version"
 
     //Tests
     testImplementation 'io.kotest:kotest-runner-junit5:5.3.0'
@@ -79,10 +72,10 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
-    debugImplementation 'androidx.fragment:fragment-testing:1.5.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    debugImplementation 'androidx.fragment:fragment-testing:1.5.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test:core-ktx:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.4'
     androidTestImplementation 'io.mockk:mockk-android:1.12.3'
     androidTestImplementation 'io.kotest:kotest-assertions-core:5.3.0'
     androidTestUtil("androidx.test:orchestrator:1.4.1")
@@ -98,7 +91,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.google.firebase:firebase-config-ktx'
     implementation 'com.google.firebase:firebase-perf-ktx'
-    implementation 'com.google.android.gms:play-services-ads:21.1.0'
+    implementation 'com.google.android.gms:play-services-ads:21.3.0'
     implementation "com.google.android.gms:play-services-auth:$play_auth_version"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation "com.google.android.gms:play-services-wearable:$play_wearables_version"
@@ -107,12 +100,22 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
-    implementation "androidx.fragment:fragment-ktx:1.5.2"
+    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
+    implementation "androidx.fragment:fragment-ktx:1.5.4"
     implementation "androidx.paging:paging-runtime-ktx:3.1.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    implementation "com.google.android.material:compose-theme-adapter:1.1.21"
+    implementation "androidx.compose.material3:material3:1.0.1"
+    implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.1"
+
+    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.animation:animation:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling:$compose_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
 
     implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
 
@@ -139,7 +142,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion min_sdk
         applicationId "com.habitrpg.android.habitica"
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "STORE", "\"google\""
@@ -160,6 +163,11 @@ android {
 
     buildFeatures {
         viewBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.0-alpha02"
     }
 
     signingConfigs {
diff --git a/Habitica/res/drawable-hdpi/assign.png b/Habitica/res/drawable-hdpi/assign.png
new file mode 100644
index 000000000..7350842d7
Binary files /dev/null and b/Habitica/res/drawable-hdpi/assign.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_21.png b/Habitica/res/drawable-hdpi/fall_gems_21.png
new file mode 100644
index 000000000..f766d9486
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_4.png b/Habitica/res/drawable-hdpi/fall_gems_4.png
new file mode 100644
index 000000000..8c09f0cd5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_42.png b/Habitica/res/drawable-hdpi/fall_gems_42.png
new file mode 100644
index 000000000..7025fcba3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_84.png b/Habitica/res/drawable-hdpi/fall_gems_84.png
new file mode 100644
index 000000000..e5409b7fc
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_21.png b/Habitica/res/drawable-hdpi/spooky_gems_21.png
new file mode 100644
index 000000000..3a17e23c9
Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_4.png b/Habitica/res/drawable-hdpi/spooky_gems_4.png
new file mode 100644
index 000000000..479663474
Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_42.png b/Habitica/res/drawable-hdpi/spooky_gems_42.png
new file mode 100644
index 000000000..8434f2cc5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_84.png b/Habitica/res/drawable-hdpi/spooky_gems_84.png
new file mode 100644
index 000000000..fc52ff518
Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-mdpi/arrow_back.png b/Habitica/res/drawable-mdpi/arrow_back.png
new file mode 100644
index 000000000..5a6ce17d7
Binary files /dev/null and b/Habitica/res/drawable-mdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-mdpi/assign.png b/Habitica/res/drawable-mdpi/assign.png
new file mode 100644
index 000000000..20b6a498e
Binary files /dev/null and b/Habitica/res/drawable-mdpi/assign.png differ
diff --git a/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png b/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png
deleted file mode 100644
index 6ab2cf339..000000000
Binary files a/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/completed.png b/Habitica/res/drawable-mdpi/completed.png
new file mode 100644
index 000000000..128347272
Binary files /dev/null and b/Habitica/res/drawable-mdpi/completed.png differ
diff --git a/Habitica/res/drawable-night-hdpi/assign.png b/Habitica/res/drawable-night-hdpi/assign.png
new file mode 100644
index 000000000..df03c6189
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/assign.png differ
diff --git a/Habitica/res/drawable-night-mdpi/assign.png b/Habitica/res/drawable-night-mdpi/assign.png
new file mode 100644
index 000000000..dd618cb06
Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/assign.png differ
diff --git a/Habitica/res/drawable-night-xhdpi/assign.png b/Habitica/res/drawable-night-xhdpi/assign.png
new file mode 100644
index 000000000..521040778
Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/assign.png differ
diff --git a/Habitica/res/drawable-night-xxhdpi/assign.png b/Habitica/res/drawable-night-xxhdpi/assign.png
new file mode 100644
index 000000000..b336e5fbe
Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xhdpi/arrow_back.png b/Habitica/res/drawable-xhdpi/arrow_back.png
new file mode 100644
index 000000000..eb2fd3b18
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-xhdpi/assign.png b/Habitica/res/drawable-xhdpi/assign.png
new file mode 100644
index 000000000..bb10ca5ef
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xhdpi/completed.png b/Habitica/res/drawable-xhdpi/completed.png
new file mode 100644
index 000000000..21bcf2a91
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/completed.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_21.png b/Habitica/res/drawable-xhdpi/fall_gems_21.png
new file mode 100644
index 000000000..69b81a672
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_4.png b/Habitica/res/drawable-xhdpi/fall_gems_4.png
new file mode 100644
index 000000000..cad6e540d
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_42.png b/Habitica/res/drawable-xhdpi/fall_gems_42.png
new file mode 100644
index 000000000..02f8c8343
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_84.png b/Habitica/res/drawable-xhdpi/fall_gems_84.png
new file mode 100644
index 000000000..97768873e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_21.png b/Habitica/res/drawable-xhdpi/spooky_gems_21.png
new file mode 100644
index 000000000..c9ff5ba6b
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_4.png b/Habitica/res/drawable-xhdpi/spooky_gems_4.png
new file mode 100644
index 000000000..81241006e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_42.png b/Habitica/res/drawable-xhdpi/spooky_gems_42.png
new file mode 100644
index 000000000..3bce039f5
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_84.png b/Habitica/res/drawable-xhdpi/spooky_gems_84.png
new file mode 100644
index 000000000..a8d3a378e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/arrow_back.png b/Habitica/res/drawable-xxhdpi/arrow_back.png
new file mode 100644
index 000000000..92e71e95d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-xxhdpi/assign.png b/Habitica/res/drawable-xxhdpi/assign.png
new file mode 100644
index 000000000..bf0578c8c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xxhdpi/completed.png b/Habitica/res/drawable-xxhdpi/completed.png
new file mode 100644
index 000000000..d84b65cb2
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/completed.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_21.png b/Habitica/res/drawable-xxhdpi/fall_gems_21.png
new file mode 100644
index 000000000..2e59c48c6
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_4.png b/Habitica/res/drawable-xxhdpi/fall_gems_4.png
new file mode 100644
index 000000000..3b54a666d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_42.png b/Habitica/res/drawable-xxhdpi/fall_gems_42.png
new file mode 100644
index 000000000..8dd7c1aa8
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_84.png b/Habitica/res/drawable-xxhdpi/fall_gems_84.png
new file mode 100644
index 000000000..8757d1300
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_21.png b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png
new file mode 100644
index 000000000..701b30ff9
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_4.png b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png
new file mode 100644
index 000000000..6704caf80
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_42.png b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png
new file mode 100644
index 000000000..815b74f08
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_84.png b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png
new file mode 100644
index 000000000..ab73f510c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_21.png b/Habitica/res/drawable-xxxhdpi/fall_gems_21.png
new file mode 100644
index 000000000..d086b585a
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_4.png b/Habitica/res/drawable-xxxhdpi/fall_gems_4.png
new file mode 100644
index 000000000..b7b33acd4
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_42.png b/Habitica/res/drawable-xxxhdpi/fall_gems_42.png
new file mode 100644
index 000000000..fc13cf769
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_84.png b/Habitica/res/drawable-xxxhdpi/fall_gems_84.png
new file mode 100644
index 000000000..0ec58519d
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png
new file mode 100644
index 000000000..939b6149a
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png
new file mode 100644
index 000000000..428e4a0d8
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png
new file mode 100644
index 000000000..527bce18f
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png
new file mode 100644
index 000000000..e5ddaf737
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable/achievement_section_badge_bg.xml b/Habitica/res/drawable/achievement_section_badge_bg.xml
index d71c5e6da..f0068a78a 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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="12dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/ad_button_background_content.xml b/Habitica/res/drawable/ad_button_background_content.xml
index 37ba94ec0..a53d99aca 100644
--- a/Habitica/res/drawable/ad_button_background_content.xml
+++ b/Habitica/res/drawable/ad_button_background_content.xml
@@ -19,7 +19,7 @@
             android:shape="rectangle"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <solid android:color="@color/content_background" />
+            <solid android:color="?attr/colorContentBackground" />
             <corners android:radius="6dp" />
         </shape>
         <ripple android:color="@color/white" />
diff --git a/Habitica/res/drawable/adventure_guide_menu_card_gray.xml b/Habitica/res/drawable/adventure_guide_menu_card_gray.xml
index 264f19e60..79b4f0f0b 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/window_background" />
+        <solid android:color="?attr/colorWindowBackground" />
         <corners android:topRightRadius="8dp" android:bottomRightRadius="8dp" />
     </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/border_1f000000_white.xml b/Habitica/res/drawable/border_1f000000_white.xml
index feea4b815..476b164c6 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/content_background" />
+    <solid android:color="?attr/colorContentBackground" />
 
     <stroke
         android:width="0.5dip"
diff --git a/Habitica/res/drawable/bottom_sheet_background.xml b/Habitica/res/drawable/bottom_sheet_background.xml
index 24dc3804f..1532e6d26 100644
--- a/Habitica/res/drawable/bottom_sheet_background.xml
+++ b/Habitica/res/drawable/bottom_sheet_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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:topLeftRadius="@dimen/bottom_sheet_radius" android:topRightRadius="@dimen/bottom_sheet_radius" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/bottom_sheet_title.xml b/Habitica/res/drawable/bottom_sheet_title.xml
index 73543f65b..5d2292b95 100644
--- a/Habitica/res/drawable/bottom_sheet_title.xml
+++ b/Habitica/res/drawable/bottom_sheet_title.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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:topLeftRadius="@dimen/bottom_sheet_radius" android:topRightRadius="@dimen/bottom_sheet_radius" />
 </shape>
diff --git a/Habitica/res/drawable/button_background_gray_700.xml b/Habitica/res/drawable/button_background_gray_700.xml
index f3645d99d..9de2c19e0 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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <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/class_selection_inset_arrow.xml b/Habitica/res/drawable/class_selection_inset_arrow.xml
index f0ba3ac24..03e64cbf0 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/content_background"
-        android:fillColor="@color/content_background"/>
+        android:strokeColor="?attr/colorContentBackground"
+        android:fillColor="?attr/colorContentBackground"/>
 </vector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/edit.xml b/Habitica/res/drawable/edit.xml
new file mode 100644
index 000000000..d72a04c2a
--- /dev/null
+++ b/Habitica/res/drawable/edit.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16.188,7.542 L12.458,3.812 13.479,2.792Q14,2.271 14.719,2.271Q15.438,2.271 15.958,2.792L17.208,4.042Q17.708,4.542 17.708,5.281Q17.708,6.021 17.208,6.521ZM14.958,8.771 L6.229,17.5H2.5V13.771L11.229,5.042Z"/>
+</vector>
diff --git a/Habitica/res/drawable/gradient_white.xml b/Habitica/res/drawable/gradient_white.xml
index 23d57b8da..b4e0be097 100644
--- a/Habitica/res/drawable/gradient_white.xml
+++ b/Habitica/res/drawable/gradient_white.xml
@@ -3,6 +3,6 @@
     <gradient
         android:angle="90"
         android:endColor="@color/content_80_alpha"
-        android:startColor="@color/content_background"
+        android:startColor="?attr/colorContentBackground"
         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 16a7cd5c7..156cc2bd7 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/content_background_offset" android:width="2dp" />
+    <stroke android:color="?attr/colorContentBackgroundOffset" 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 170bb9a37..909dbeb54 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/content_background_offset" />
+    <stroke android:width="2dp" android:color="?colorTintedBackgroundOffset" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/icon_chat.xml b/Habitica/res/drawable/icon_chat.xml
new file mode 100644
index 000000000..42714253f
--- /dev/null
+++ b/Habitica/res/drawable/icon_chat.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
+</vector>
diff --git a/Habitica/res/drawable/layout_rounded_bg_content.xml b/Habitica/res/drawable/layout_rounded_bg_content.xml
index 9f6e1d1b0..9b650e7d2 100644
--- a/Habitica/res/drawable/layout_rounded_bg_content.xml
+++ b/Habitica/res/drawable/layout_rounded_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/content_background" />
+    <solid android:color="?attr/colorContentBackground" />
     <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 051bbab11..95c2ac391 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/content_background_offset" />
+    <solid android:color="?attr/colorContentBackgroundOffset" />
     <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_shopitem.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem.xml
index 026862756..b7da773d0 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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <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_task_form.xml b/Habitica/res/drawable/layout_rounded_bg_task_form.xml
index a9bd8afc2..68e8a515b 100644
--- a/Habitica/res/drawable/layout_rounded_bg_task_form.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_task_form.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/white" />
-    <corners android:radius="4dp" />
+    <corners android:radius="8dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_tinted.xml b/Habitica/res/drawable/layout_rounded_bg_tinted.xml
new file mode 100644
index 000000000..d65e9884c
--- /dev/null
+++ b/Habitica/res/drawable/layout_rounded_bg_tinted.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?colorTintedBackgroundOffset" />
+    <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_white.xml b/Habitica/res/drawable/layout_rounded_bg_white.xml
index 9f6e1d1b0..9b650e7d2 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="@color/content_background" />
+    <solid android:color="?attr/colorContentBackground" />
     <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_window.xml b/Habitica/res/drawable/layout_rounded_bg_window.xml
index f3645d99d..9de2c19e0 100644
--- a/Habitica/res/drawable/layout_rounded_bg_window.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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <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_window_blue_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml
index 8046a6e8e..e8d53e298 100644
--- a/Habitica/res/drawable/layout_rounded_bg_window_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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <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
index d2983eda5..d4f4cb619 100644
--- a/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <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" />
diff --git a/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml
index 2a67aca44..ee1f0310d 100644
--- a/Habitica/res/drawable/layout_rounded_bg_window_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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <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
index d896b0dc6..c114879b2 100644
--- a/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_window_tint_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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <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" />
diff --git a/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml
index 984a3d92f..e512ca539 100644
--- a/Habitica/res/drawable/layout_rounded_bg_window_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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <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/no_party_background_gradient.xml b/Habitica/res/drawable/no_party_background_gradient.xml
index a72529e44..e8558404b 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/content_background"
-        android:startColor="@color/content_background"
+        android:endColor="?attr/colorContentBackground"
+        android:startColor="?attr/colorContentBackground"
         android:type="linear"
         android:centerX="0.6"/>
 
diff --git a/Habitica/res/drawable/not_enough_gems_wave.xml b/Habitica/res/drawable/not_enough_gems_wave.xml
index 37b36c8c1..a16cfa176 100644
--- a/Habitica/res/drawable/not_enough_gems_wave.xml
+++ b/Habitica/res/drawable/not_enough_gems_wave.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="16">
   <path
       android:pathData="M0,15v-3l0.7,-0.34 1.05,-0.49 0.95,-0.43 0.84,-0.36 1.27,-0.54 1.07,-0.44 1.57,-0.63 1.28,-0.5 1.37,-0.51 0.96,-0.35 0.99,-0.35 1.03,-0.36 1.06,-0.36L15.25,6l1.7,-0.54 1.17,-0.36 1.2,-0.35 0.61,-0.18 1.24,-0.35 0.63,-0.17 1.28,-0.34c0.43,-0.11 0.87,-0.22 1.3,-0.33l1.33,-0.32a124.57,124.57 0,0 1,4.81 -1.05l1.42,-0.27C37.64,0.69 43.76,0 50,0c4.42,0 9.12,0.33 14.19,0.89l1.8,0.2 1.84,0.22 0.93,0.12 1.88,0.25 1.92,0.26 1.95,0.27 1.99,0.29 3.05,0.45 5.26,0.8 6.63,1.02 4.63,0.7 3.58,0.53 2.44,0.35 2.49,0.35 2.53,0.35 2.58,0.35 1.31,0.17 2.65,0.34c0.89,0.11 1.79,0.22 2.7,0.33l2.74,0.33 2.09,0.24 2.12,0.23 2.15,0.23 1.09,0.11 2.19,0.22 2.22,0.21 2.25,0.21 2.28,0.2 2.31,0.19c0.39,0.03 0.78,0.06 1.17,0.09l2.36,0.18 2.39,0.17 1.21,0.08 2.44,0.15 2.47,0.14 1.25,0.07 2.52,0.13 2.55,0.12c0.43,0.02 0.86,0.04 1.29,0.05l2.6,0.1 2.63,0.09 1.33,0.04 2.69,0.07c1.8,0.04 3.63,0.07 5.48,0.09l2.03,0.02h7.81c12.46,-0.09 24.81,-0.58 36.7,-1.3l3.39,-0.21 1.68,-0.11 3.35,-0.23 3.32,-0.24 1.65,-0.12 3.27,-0.25 4.04,-0.33 5.57,-0.48 3.13,-0.28 4.62,-0.43 4.52,-0.44 2.96,-0.29 4.35,-0.44 4.24,-0.44 5.46,-0.58 17.28,-1.87 3.29,-0.35 3.13,-0.32 2,-0.2 1.92,-0.19 1.84,-0.17 1.77,-0.16 2.09,-0.17 1.97,-0.14 1.48,-0.09c0.64,-0.04 1.25,-0.07 1.84,-0.1l1.14,-0.04 1.07,-0.03A57.3,57.3 0,0 1,316 2c7.31,0 12.87,1.52 16.94,3.38l0.61,0.29 0.59,0.29c0.19,0.1 0.38,0.2 0.57,0.29l0.54,0.3 0.52,0.3 0.5,0.3 0.71,0.45 0.44,0.3 0.42,0.29 0.4,0.29 0.38,0.28 0.53,0.42 0.33,0.27 0.3,0.26 0.28,0.25 0.26,0.24 0.24,0.23 0.33,0.32 0.37,0.38 0.29,0.32 0.33,0.39 0.11,0.14v3.68L174.15,15H0z"
-      android:fillColor="@color/content_background"
+      android:fillColor="?attr/colorContentBackground"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/Habitica/res/drawable/pill_bg.xml b/Habitica/res/drawable/pill_bg.xml
index 70382d6db..1d2a6714e 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/window_background"/>
+    <solid android:color="?attr/colorWindowBackground"/>
     <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_content.xml b/Habitica/res/drawable/pill_bg_content.xml
index 34654a9f6..84a1dd62a 100644
--- a/Habitica/res/drawable/pill_bg_content.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/content_background"/>
+    <solid android:color="?attr/colorContentBackground"/>
     <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_window.xml b/Habitica/res/drawable/pill_bg_window.xml
index 70382d6db..1d2a6714e 100644
--- a/Habitica/res/drawable/pill_bg_window.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/window_background"/>
+    <solid android:color="?attr/colorWindowBackground"/>
     <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/quest_difficulty_bg.xml b/Habitica/res/drawable/quest_difficulty_bg.xml
index 7bcd3ecde..c59d182ca 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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
 
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/rounded_border_content.xml b/Habitica/res/drawable/rounded_border_content.xml
index c768d51cf..9c06ba6d7 100644
--- a/Habitica/res/drawable/rounded_border_content.xml
+++ b/Habitica/res/drawable/rounded_border_content.xml
@@ -1,6 +1,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/content_background" />
+    <solid android:color="?attr/colorContentBackground" />
     <stroke
         android:width="1dp"
         android:color="@color/offset_background"/>
diff --git a/Habitica/res/drawable/seekbar_thumb.xml b/Habitica/res/drawable/seekbar_thumb.xml
index 74a3d4b0a..5218288c3 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/content_background" />
+            <solid android:color="?attr/colorContentBackground" />
             <stroke
                 android:width="1dp"
-                android:color="@color/content_background_offset" />
+                android:color="?attr/colorContentBackgroundOffset" />
         </shape>
     </rotate>
 </item>
diff --git a/Habitica/res/drawable/subscription_box_bg.xml b/Habitica/res/drawable/subscription_box_bg.xml
index bc7b82302..24df73ead 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/window_background"/>
+    <solid android:color="?attr/colorWindowBackground"/>
     <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 3051368c3..66e128860 100644
--- a/Habitica/res/drawable/subscription_box_bg_selected.xml
+++ b/Habitica/res/drawable/subscription_box_bg_selected.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background"/>
+    <solid android:color="?attr/colorWindowBackground"/>
     <corners android:radius="8dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
     <stroke android:color="@color/text_brand_neon" android:width="3dp" />
diff --git a/Habitica/res/drawable/system_chat_background.xml b/Habitica/res/drawable/system_chat_background.xml
index ca5a8cd52..5cd3969cb 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/content_background_offset" android:width="1dp" />
+    <stroke android:color="?attr/colorContentBackgroundOffset" android:width="1dp" />
     <corners android:radius="4dp" />
 </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 4e8a5ba4f..66ba48871 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/content_background_offset" />
+            <solid android:color="?colorPrimaryDark" />
             <corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
         </shape>
     </item>
 
-    <item android:bottom="4dp">
+    <item android:bottom="2dp">
         <shape android:shape="rectangle">
-            <solid android:color="@color/window_background" />
+            <solid android:color="?colorTintedBackgroundOffset" />
             <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
         </shape>
     </item>
diff --git a/Habitica/res/drawable/teams_title_bg.xml b/Habitica/res/drawable/teams_title_bg.xml
index 1f820214a..2d732c31a 100644
--- a/Habitica/res/drawable/teams_title_bg.xml
+++ b/Habitica/res/drawable/teams_title_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/window_background" />
+<solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="20dp" />
     <stroke android:color="?colorAccent" android:width="2dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/layout-w600dp/activity_main.xml b/Habitica/res/layout-w600dp/activity_main.xml
index 924f58cf8..e915d6836 100644
--- a/Habitica/res/layout-w600dp/activity_main.xml
+++ b/Habitica/res/layout-w600dp/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.habitrpg.android.habitica.ui.activities.MainActivity"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -22,7 +22,7 @@
         <View
             android:layout_width="1dp"
             android:layout_height="match_parent"
-            android:background="@color/window_background"/>
+            android:background="?attr/colorWindowBackground"/>
         <include layout="@layout/activity_main_content" android:id="@+id/content" />
     </LinearLayout>
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml
index 0bde38bc3..2bfff0e9a 100644
--- a/Habitica/res/layout/activity_armoire.xml
+++ b/Habitica/res/layout/activity_armoire.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
 <FrameLayout
     android:id="@+id/confetti_anchor"
     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml
index 9ec3980a7..72ebd0407 100644
--- a/Habitica/res/layout/activity_class_selection.xml
+++ b/Habitica/res/layout/activity_class_selection.xml
@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar"
-            android:background="@color/content_background"
+            android:background="?attr/colorContentBackground"
             app:layout_scrollFlags="scroll|enterAlways"
             app:title="@string/choose_class"
             app:titleTextColor="@color/text_primary"
diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml
index 18f8bbda0..be843acfe 100644
--- a/Habitica/res/layout/activity_create_challenge.xml
+++ b/Habitica/res/layout/activity_create_challenge.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -221,7 +221,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false"
-            android:background="@color/content_background"
+            android:background="?attr/colorContentBackground"
             android:id="@+id/create_challenge_task_list">
 
         </androidx.recyclerview.widget.RecyclerView>
diff --git a/Habitica/res/layout/activity_death.xml b/Habitica/res/layout/activity_death.xml
index 5c7e211f8..14358b84f 100644
--- a/Habitica/res/layout/activity_death.xml
+++ b/Habitica/res/layout/activity_death.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
     <FrameLayout
         android:id="@+id/confetti_container"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml
index 9be22045c..0150896ea 100644
--- a/Habitica/res/layout/activity_fixcharacter.xml
+++ b/Habitica/res/layout/activity_fixcharacter.xml
@@ -30,7 +30,7 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/outer_inset"
                         android:text="@string/fix_character_description"
-                        android:background="@color/window_background"
+                        android:background="?attr/colorWindowBackground"
                         android:layout_marginBottom="16dp"
                         />
                     <FrameLayout
@@ -73,7 +73,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="2dp"
                         android:layout_gravity="bottom"
-                        android:background="@color/content_background_offset"
+                        android:background="?attr/colorContentBackgroundOffset"
                         android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -115,7 +115,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -157,7 +157,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -199,7 +199,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -241,7 +241,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -284,7 +284,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                 </LinearLayout>
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index ad55e0dc3..e315be0ef 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="@color/content_background"
+                android:background="?attr/colorContentBackground"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
             <com.google.android.material.appbar.AppBarLayout
diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml
index 7509b18b8..2cc4042b3 100644
--- a/Habitica/res/layout/activity_gift_gems.xml
+++ b/Habitica/res/layout/activity_gift_gems.xml
@@ -8,7 +8,7 @@
         android:layout_height="match_parent"
         tools:context=".ui.activities.PrefsActivity"
         android:orientation="vertical"
-        android:background="@color/content_background">
+        android:background="?attr/colorContentBackground">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
@@ -78,6 +78,6 @@
             android:layout_width="match_parent"
             android:layout_height="0px"
             android:layout_weight="1"
-            android:background="@color/content_background" />
+            android:background="?attr/colorContentBackground" />
     </LinearLayout>
 </FrameLayout>
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 26adf6e6d..d722b3ec8 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/content_background">
+    android:background="?attr/colorContentBackground">
 
     <!-- As the main content view, the view below consumes the entire
          space available using match_parent in both dimensions. -->
diff --git a/Habitica/res/layout/activity_main_content.xml b/Habitica/res/layout/activity_main_content.xml
index 7553ad017..a575dd7e5 100644
--- a/Habitica/res/layout/activity_main_content.xml
+++ b/Habitica/res/layout/activity_main_content.xml
@@ -28,16 +28,15 @@
             app:expandedTitleMarginStart="0dp"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-            <include
-                android:id="@+id/avatar_with_bars"
-                layout="@layout/avatar_with_bars"
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/header_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 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" />
+                app:layout_collapseMode="parallax"/>
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
diff --git a/Habitica/res/layout/activity_party_invite.xml b/Habitica/res/layout/activity_party_invite.xml
index 425729cc2..f7b1fbf0c 100644
--- a/Habitica/res/layout/activity_party_invite.xml
+++ b/Habitica/res/layout/activity_party_invite.xml
@@ -8,7 +8,7 @@
         android:layout_height="match_parent"
         tools:context=".ui.activities.PrefsActivity"
         android:orientation="vertical"
-        android:background="@color/content_background">
+        android:background="?attr/colorContentBackground">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
@@ -30,7 +30,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
-        android:background="@color/window_background"
+        android:background="?attr/colorWindowBackground"
         android:elevation="0dp"
         android:fillViewport="false"
 
@@ -48,7 +48,7 @@
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="1"
-        android:background="@color/content_background" />
+        android:background="?attr/colorContentBackground" />
 
 </LinearLayout>
 
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index 27d2d2de9..f16c97117 100644
--- a/Habitica/res/layout/activity_report_message.xml
+++ b/Habitica/res/layout/activity_report_message.xml
@@ -28,7 +28,7 @@
                 android:minHeight="?attr/actionBarSize"
                 android:theme="@style/Toolbar"
                 app:title=""
-                android:background="@color/content_background"
+                android:background="?attr/colorContentBackground"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:titleTextColor="@color/text_primary"
                 app:theme="@style/ReportMessageToolbar"
diff --git a/Habitica/res/layout/activity_skill_tasks.xml b/Habitica/res/layout/activity_skill_tasks.xml
index 2d0563f77..9b97485b9 100644
--- a/Habitica/res/layout/activity_skill_tasks.xml
+++ b/Habitica/res/layout/activity_skill_tasks.xml
@@ -43,6 +43,6 @@
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="1"
-        android:background="@color/content_background" />
+        android:background="?attr/colorContentBackground" />
 
 </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 203cafad7..c0d324029 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="?attr/colorTintedBackground"
     tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity">
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -29,7 +30,6 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/colorContentBackground"
             android:paddingBottom="@dimen/spacing_large">
             <LinearLayout
                 android:id="@+id/upper_text_wrapper"
@@ -96,10 +96,11 @@
                 android:orientation="vertical"
                 android:layout_marginStart="@dimen/spacing_large"
                 android:layout_marginEnd="@dimen/spacing_large">
-                <com.habitrpg.android.habitica.ui.views.tasks.form.HabitScoringButtonsView
+                <androidx.compose.ui.platform.ComposeView
                     android:id="@+id/habit_scoring_buttons"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp" />
                 <TextView
                     android:id="@+id/reward_value_title_view"
                     android:layout_width="match_parent"
@@ -126,17 +127,27 @@
                     android:layout_height="wrap_content"
                     android:text="@string/difficulty"
                     style="@style/TaskFormSectionheader"/>
-                <com.habitrpg.android.habitica.ui.views.tasks.form.TaskDifficultyButtons
+                <androidx.compose.ui.platform.ComposeView
                     android:id="@+id/task_difficulty_buttons"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
+                <TextView
+                    android:id="@+id/assign_title_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/assign"
+                    style="@style/TaskFormSectionheader" />
+                <androidx.compose.ui.platform.ComposeView
+                    android:id="@+id/assign_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/habit_reset_streak_title_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/reset_counter"
                     style="@style/TaskFormSectionheader"/>
-                <com.habitrpg.android.habitica.ui.views.tasks.form.HabitResetStreakButtons
+                <androidx.compose.ui.platform.ComposeView
                     android:id="@+id/habit_reset_streak_buttons"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
@@ -165,6 +176,7 @@
                         android:id="@+id/habit_adjust_positive_input_layout"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        app:boxBackgroundColor="?attr/colorTintedBackgroundOffset"
                         android:hint="@string/positive_habit_form"
                         android:layout_weight="1">
                         <androidx.appcompat.widget.AppCompatEditText
@@ -181,6 +193,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:hint="@string/negative_habit_form"
+                        app:boxBackgroundColor="?attr/colorTintedBackgroundOffset"
                         android:layout_weight="1">
                         <androidx.appcompat.widget.AppCompatEditText
                             android:id="@+id/habit_adjust_negative_streak_view"
@@ -211,45 +224,10 @@
                         android:layout_height="wrap_content"
                         android:text="@string/assigned_stat"
                         style="@style/TaskFormSectionheader"/>
-                    <LinearLayout
+                    <androidx.compose.ui.platform.ComposeView
+                        android:id="@+id/stats_selector"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="@dimen/spacing_large">
-                        <TextView
-                            android:id="@+id/stat_strength_button"
-                            style="@style/TaskFormToggle"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:text="@string/strength"
-                            android:layout_marginEnd="@dimen/spacing_large"/>
-                        <TextView
-                            android:id="@+id/stat_constitution_button"
-                            style="@style/TaskFormToggle"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:text="@string/constitution"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:id="@+id/stat_intelligence_button"
-                            style="@style/TaskFormToggle"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:text="@string/intelligence"
-                            android:layout_marginEnd="@dimen/spacing_large"/>
-                        <TextView
-                            android:id="@+id/stat_perception_button"
-                            style="@style/TaskFormToggle"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:text="@string/perception"/>
-                    </LinearLayout>
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
                 <TextView
                     android:id="@+id/tags_title_view"
diff --git a/Habitica/res/layout/activity_verify_username.xml b/Habitica/res/layout/activity_verify_username.xml
index 22cf00636..4d70f4869 100644
--- a/Habitica/res/layout/activity_verify_username.xml
+++ b/Habitica/res/layout/activity_verify_username.xml
@@ -61,7 +61,7 @@
                             android:paddingStart="@dimen/spacing_medium"
                             android:paddingEnd="@dimen/spacing_medium"
                             android:layout_marginStart="1dp"
-                            android:background="@color/window_background"
+                            android:background="?attr/colorWindowBackground"
                             android:gravity="center_vertical"
                             />
                         <View android:background="@color/gray_600"
@@ -81,7 +81,7 @@
                     </TableRow>
                     <TableRow>
                         <TextView android:text="@string/username"
-                            android:background="@color/window_background"
+                            android:background="?attr/colorWindowBackground"
                             android:layout_height="41dp"
                             android:paddingStart="@dimen/spacing_medium"
                             android:paddingEnd="@dimen/spacing_medium"
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 1310342c5..abc1daef0 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/header_bar_spacing"
                 app:barForegroundColor="@color/background_red"
-                app:barBackgroundColor="@color/window_background"
+                app:barBackgroundColor="?attr/colorWindowBackground"
                 app:description="@string/HP_default"/>
 
             <com.habitrpg.common.habitica.views.ValueBar
@@ -45,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/header_bar_spacing"
                 app:barForegroundColor="@color/background_yellow"
-                app:barBackgroundColor="@color/window_background"
+                app:barBackgroundColor="?attr/colorWindowBackground"
                 app:description="@string/XP_default"/>
 
             <com.habitrpg.common.habitica.views.ValueBar
@@ -53,7 +53,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:barForegroundColor="@color/background_blue"
-                app:barBackgroundColor="@color/window_background"
+                app:barBackgroundColor="?attr/colorWindowBackground"
                 app:description="@string/MP_default"/>
 
         </LinearLayout>
diff --git a/Habitica/res/layout/challenge_task_divider.xml b/Habitica/res/layout/challenge_task_divider.xml
index b9c78a6e1..635b3b9ba 100644
--- a/Habitica/res/layout/challenge_task_divider.xml
+++ b/Habitica/res/layout/challenge_task_divider.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/window_background"
+    android:background="?attr/colorWindowBackground"
     android:orientation="vertical"
     android:gravity="center">
 
diff --git a/Habitica/res/layout/chat_item.xml b/Habitica/res/layout/chat_item.xml
index b5b158ed5..e569cd927 100644
--- a/Habitica/res/layout/chat_item.xml
+++ b/Habitica/res/layout/chat_item.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
-    android:background="@color/content_background"
+    android:background="?attr/colorContentBackground"
     android:paddingStart="@dimen/chat_horizontal_inset"
     android:paddingEnd="@dimen/chat_horizontal_inset"
     android:paddingTop="@dimen/spacing_small"
diff --git a/Habitica/res/layout/dialog_habitica_base.xml b/Habitica/res/layout/dialog_habitica_base.xml
index 8b668b742..bed7383c4 100644
--- a/Habitica/res/layout/dialog_habitica_base.xml
+++ b/Habitica/res/layout/dialog_habitica_base.xml
@@ -113,7 +113,7 @@
         android:layout_height="wrap_content"
         android:text="@string/close"
         android:background="@drawable/alert_dialog_background"
-        android:backgroundTint="@color/content_background"
+        android:backgroundTint="?attr/colorContentBackground"
         android:layout_marginTop="@dimen/spacing_large"
         android:visibility="gone"
         tools:visibility="visible"
diff --git a/Habitica/res/layout/dialog_pet_suggest_hatch.xml b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
index cda6fe648..608a0786e 100644
--- a/Habitica/res/layout/dialog_pet_suggest_hatch.xml
+++ b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
@@ -55,8 +55,8 @@
                 app:shimmer_repeat_delay="4000"
                 app:shimmer_duration="200"
                 app:shimmer_base_color="@color/text_dimmed"
-                app:shimmer_highlight_color="@color/content_background"
-                app:shimmer_highlight_alpha="0.8">
+                app:shimmer_highlight_color="?attr/colorContentBackground"
+                app:shimmer_highlight_alpha="0.4">
             <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/pet_view"
                 android:layout_width="@dimen/gear_image_size"
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_header.xml b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
index b6f2f1e2f..03284e158 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_header.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="12dp"
         android:paddingEnd="12dp"
-        android:background="@color/window_background"
+        android:background="?attr/colorWindowBackground"
         android:gravity="center_vertical">
         <LinearLayout
             android:id="@+id/pin_button"
diff --git a/Habitica/res/layout/dialog_yesterdaily.xml b/Habitica/res/layout/dialog_yesterdaily.xml
index ebf234050..97008542f 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/content_background"/>
+    android:background="?attr/colorContentBackground"/>
diff --git a/Habitica/res/layout/fixvalues_edittext.xml b/Habitica/res/layout/fixvalues_edittext.xml
index 8dcba41cf..1272e416e 100644
--- a/Habitica/res/layout/fixvalues_edittext.xml
+++ b/Habitica/res/layout/fixvalues_edittext.xml
@@ -41,6 +41,6 @@
         android:layout_width="match_parent"
         android:layout_height="2dp"
         android:layout_gravity="bottom"
-        android:background="@color/content_background_offset"
+        android:background="?attr/colorContentBackgroundOffset"
         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 488df39bf..e67bb83d4 100644
--- a/Habitica/res/layout/form_stepper_value.xml
+++ b/Habitica/res/layout/form_stepper_value.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"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
@@ -7,39 +8,36 @@
     tools:parentTag="android.widget.RelativeLayout">
     <View android:layout_width="match_parent"
         android:layout_height="match_parent"
-        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/content_background_offset"
+        android:background="@drawable/layout_rounded_bg_task_form"
+        android:backgroundTint="?colorTintedBackgroundOffset"
         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/offset_background"
+        android:background="@color/transparent"
         android:src="@drawable/ic_arrow_drop_down_gray_48dp_states"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        app:tint="?colorPrimaryDark"
         />
     <ImageButton
         android:id="@+id/up_button"
         android:layout_width="56dp"
         android:layout_height="match_parent"
-        android:background="@color/offset_background"
+        android:background="@color/transparent"
         android:src="@drawable/ic_arrow_drop_up_gray_48dp_states"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        />
+        app:tint="?colorPrimaryDark" />
     <EditText
         android:id="@+id/edit_text"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_centerHorizontal="true"
         android:background="@color/transparent"
-        android:textColor="@color/text_secondary"
+        android:textColor="?colorPrimaryDark"
         android:textSize="16sp"
         tools:text="100.0"
         android:inputType="numberDecimal"
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 378418a37..bc7dd0208 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -179,6 +179,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="11dp"
                 android:lineSpacingExtra="4sp"
+                android:background="@drawable/layout_rounded_bg_window"
+                android:padding="@dimen/spacing_large"
                 tools:text="There’s always more to learn! Maybe it’s a specialized topic you’re interested in, or maybe it’s the experiences of a notable contributor. Read about it and you may win 15 gems!" />
         </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
 
diff --git a/Habitica/res/layout/fragment_compose.xml b/Habitica/res/layout/fragment_compose.xml
new file mode 100644
index 000000000..3896c2c2f
--- /dev/null
+++ b/Habitica/res/layout/fragment_compose.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.compose.ui.platform.ComposeView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_compose_scrolling.xml b/Habitica/res/layout/fragment_compose_scrolling.xml
new file mode 100644
index 000000000..2418f8be3
--- /dev/null
+++ b/Habitica/res/layout/fragment_compose_scrolling.xml
@@ -0,0 +1,10 @@
+<?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">
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/compose_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml
index bc1bec4da..24ce17a89 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/content_background">
+    android:background="?attr/colorContentBackground">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
         android:paddingEnd="32dp"
         android:paddingBottom="32dp"
         android:orientation="vertical"
-        android:background="@color/window_background"
+        android:background="?attr/colorWindowBackground"
         android:layout_marginTop="@dimen/spacing_large"
         android:gravity="center">
         <TextView
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index 1333f53b4..b071f1d1e 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -17,6 +17,7 @@
             android:background="@drawable/g1g1_box"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginBottom="@dimen/spacing_large"
             android:clipChildren="true"
             android:clipToPadding="true"
             android:clickable="true"
@@ -29,14 +30,16 @@
                 android:scaleType="center"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentStart="true"
-                android:layout_alignParentBottom="false"/>
+                android:layout_alignParentBottom="false"
+                android:importantForAccessibility="no"/>
             <ImageView
                 android:id="@+id/promo_banner_right_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:scaleType="center"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"/>
+                android:layout_alignParentEnd="true"
+                android:importantForAccessibility="no"/>
             <LinearLayout
                 android:layout_centerInParent="true"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index b62f35db0..4774fb3bb 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/refreshLayout"
-    android:background="@color/window_background">
+    android:background="?attr/colorContentBackground">
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -101,10 +101,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:background="?attr/colorContentBackground">
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/content_background_offset" />
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -130,11 +126,6 @@
                         style="@style/HabiticaButton.Green"
                         android:layout_marginStart="@dimen/spacing_large"/>
                 </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/content_background_offset" />
                 <LinearLayout
                     android:id="@+id/leader_wrapper"
                     android:layout_width="match_parent"
@@ -183,7 +174,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         tools:text="@string/inn_description"
-                        android:layout_marginTop="@dimen/spacing_large" />
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:background="@drawable/layout_rounded_bg_window"
+                        android:padding="@dimen/spacing_large"/>
                 </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
                 <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
                     android:layout_width="match_parent"
@@ -195,14 +188,11 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         tools:text="@string/inn_description"
-                        android:layout_marginTop="@dimen/spacing_large" />
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:background="@drawable/layout_rounded_bg_window"
+                        android:padding="@dimen/spacing_large" />
                 </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/content_background_offset"
-                    android:layout_marginTop="@dimen/spacing_medium"/>
             </LinearLayout>
             <Button
                 android:id="@+id/leave_button"
diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index 6bdd962ee..e09f6dd3d 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         style="@style/FragmentDialogTitle"
         android:id="@+id/titleTextView"
-        android:background="@color/window_background"
+        android:background="?attr/colorWindowBackground"
         android:textColor="@color/text_primary" />
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/refreshLayout"
diff --git a/Habitica/res/layout/fragment_items_dialog.xml b/Habitica/res/layout/fragment_items_dialog.xml
index 028c965e1..5a3d0c5f8 100644
--- a/Habitica/res/layout/fragment_items_dialog.xml
+++ b/Habitica/res/layout/fragment_items_dialog.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         style="@style/FragmentDialogTitle"
         android:id="@+id/titleTextView"
-        android:background="@color/window_background"
+        android:background="?attr/colorWindowBackground"
         android:textColor="@color/text_primary" />
         <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
             android:id="@+id/recyclerView"
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index 180b168f4..c77318dda 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -38,9 +38,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:background="?attr/colorContentBackground"
-                android:showDividers="beginning|end|middle"
-                android:divider="@drawable/vertical_divider">
+                android:background="?attr/colorContentBackground">
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -180,7 +178,9 @@
                         android:id="@+id/description_view"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        tools:text="This is our super awesome party!"/>
+                        tools:text="This is our super awesome party!"
+                        android:background="@drawable/layout_rounded_bg_window"
+                        android:padding="@dimen/spacing_large"/>
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index 8cfdfda73..5d6c5be15 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -23,7 +23,7 @@
                 android:layout_height="63dp"
                 android:scaleType="fitCenter"
                 android:padding="6dp"
-                android:background="@color/window_background"/>
+                android:background="?attr/colorWindowBackground"/>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_stats.xml b/Habitica/res/layout/fragment_stats.xml
index 5701b7060..0f9a436e0 100644
--- a/Habitica/res/layout/fragment_stats.xml
+++ b/Habitica/res/layout/fragment_stats.xml
@@ -94,7 +94,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/content_border"
             android:paddingEnd="@dimen/content_border"
-            android:background="@color/window_background"
+            android:background="?attr/colorWindowBackground"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"
             android:orientation="vertical">
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index 52e85cc1e..951b73876 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -387,7 +387,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/window_background">
+            android:background="?attr/colorWindowBackground">
             <TextView android:id="@+id/supportTextView"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_support_bug_fix.xml b/Habitica/res/layout/fragment_support_bug_fix.xml
index 830f7d2cb..0b7c9528b 100644
--- a/Habitica/res/layout/fragment_support_bug_fix.xml
+++ b/Habitica/res/layout/fragment_support_bug_fix.xml
@@ -6,7 +6,7 @@
 <LinearLayout
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/content_background"
+    android:background="?attr/colorContentBackground"
     android:layout_marginBottom="@dimen/spacing_large">
     <TextView
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
index 808b91cca..5fae05eef 100644
--- a/Habitica/res/layout/fragment_support_main.xml
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@color/content_background"
+        android:background="?attr/colorContentBackground"
         android:paddingTop="@dimen/spacing_large"
         android:paddingBottom="@dimen/spacing_large">
         <LinearLayout
@@ -166,7 +166,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/content_background_offset"/>
+        android:background="?attr/colorContentBackgroundOffset"/>
     <Button
         android:id="@+id/reset_tutorial_button"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml
index 444aed9f5..854066e76 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -43,7 +43,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/inn_description"
-            android:layout_marginTop="@dimen/spacing_large"/>
+            android:layout_marginTop="@dimen/spacing_large"
+            android:background="@drawable/layout_rounded_bg_window"
+            android:padding="@dimen/spacing_large"/>
     </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
     <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
         android:layout_width="match_parent"
@@ -61,7 +63,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/guidelines_description"
-            android:layout_marginTop="@dimen/spacing_large"/>
+            android:layout_marginTop="@dimen/spacing_large"
+            android:background="@drawable/layout_rounded_bg_window"
+            android:padding="@dimen/spacing_large"/>
     </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
     <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
         android:layout_width="match_parent"
@@ -100,7 +104,9 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/tiers_descriptions"/>
+            android:text="@string/tiers_descriptions"
+            android:background="@drawable/layout_rounded_bg_window"
+            android:padding="@dimen/spacing_large"/>
     </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
 </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/help_header.xml b/Habitica/res/layout/help_header.xml
index 322510273..d881ad5e6 100644
--- a/Habitica/res/layout/help_header.xml
+++ b/Habitica/res/layout/help_header.xml
@@ -4,7 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/window_background"
+    android:background="?attr/colorWindowBackground"
     android:paddingTop="@dimen/spacing_large"
     android:paddingBottom="@dimen/spacing_large"
     android:paddingStart="@dimen/spacing_large"
diff --git a/Habitica/res/layout/notification_item_actionable.xml b/Habitica/res/layout/notification_item_actionable.xml
index fbb2bc48e..77a8a16e0 100644
--- a/Habitica/res/layout/notification_item_actionable.xml
+++ b/Habitica/res/layout/notification_item_actionable.xml
@@ -4,7 +4,7 @@
     android:id="@+id/notification_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/content_background"
+    android:background="?attr/colorContentBackground"
     android:orientation="vertical"
     android:paddingStart="20dp"
     android:paddingTop="10dp"
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index a208cc65f..14324c98a 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -5,9 +5,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
+    android:background="@drawable/layout_rounded_bg_window"
     android:padding="@dimen/spacing_large"
     android:foreground="?android:attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:layout_marginBottom="@dimen/spacing_medium">
     <com.habitrpg.common.habitica.views.AvatarView
         android:id="@+id/avatarView"
         android:layout_width="97dp"
@@ -88,7 +90,7 @@
                     android:layout_height="@dimen/bar_size"
                     android:id="@+id/health_bar"
                     app:barForegroundColor="@color/hpColor"
-                    app:barBackgroundColor="@color/window_background"/>
+                    app:barBackgroundColor="@color/offset_background"/>
                 <TextView
                     android:id="@+id/health_textview"
                     android:layout_width="wrap_content"
@@ -106,7 +108,7 @@
                     android:layout_height="@dimen/bar_size"
                     android:id="@+id/experience_bar"
                     app:barForegroundColor="@color/xpColor"
-                    app:barBackgroundColor="@color/window_background"/>
+                    app:barBackgroundColor="@color/offset_background"/>
                 <TextView
                     android:id="@+id/experience_textview"
                     android:layout_width="wrap_content"
@@ -124,7 +126,7 @@
                     android:layout_height="@dimen/bar_size"
                     android:id="@+id/mana_bar"
                     app:barForegroundColor="@color/mpColor"
-                    app:barBackgroundColor="@color/window_background"/>
+                    app:barBackgroundColor="@color/offset_background"/>
                 <TextView
                     android:id="@+id/mana_textview"
                     android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/promo_menu.xml b/Habitica/res/layout/promo_menu.xml
index 82eb45855..6c26538e4 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/window_background">
+    android:background="?attr/colorWindowBackground">
     <LinearLayout
         android:id="@+id/contentWrapper"
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/promo_subscription_buy_gems.xml b/Habitica/res/layout/promo_subscription_buy_gems.xml
index 37eaeb43d..0a71f50b5 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/window_background">
+    android:background="?attr/colorWindowBackground">
 <LinearLayout
     android:id="@+id/contentWrapper"
     android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/purchase_gem_view.xml b/Habitica/res/layout/purchase_gem_view.xml
index 6d64ad279..e979daf31 100644
--- a/Habitica/res/layout/purchase_gem_view.xml
+++ b/Habitica/res/layout/purchase_gem_view.xml
@@ -17,10 +17,6 @@
         android:contentDescription="@string/gems"
         android:layout_marginTop="20dp"/>
 
-    <com.habitrpg.android.habitica.ui.views.SparkView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -40,6 +36,7 @@
             android:layout_marginEnd="2dp"
             tools:text="21" />
         <com.habitrpg.android.habitica.ui.views.DayNightTextView
+            android:id="@+id/gem_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:dayTextColor="@color/white"
diff --git a/Habitica/res/layout/quest_progress.xml b/Habitica/res/layout/quest_progress.xml
index 9bd2d0e0c..b2b467d9d 100644
--- a/Habitica/res/layout/quest_progress.xml
+++ b/Habitica/res/layout/quest_progress.xml
@@ -180,7 +180,7 @@
         android:layout_height="wrap_content"
         app:title="@string/world_boss_description"
         app:identifier="questDescription"
-        app:color="@color/content_background">
+        app:color="?attr/colorContentBackground">
     <TextView
         android:id="@+id/questDescription"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index af9d3a58e..ddfeb32f9 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -49,7 +49,7 @@
                 android:paddingBottom="2dp"/>
             <TextView
                 android:id="@+id/priceLabel"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/yellow_10"
                 android:gravity="center_horizontal"
diff --git a/Habitica/res/layout/stats_slider_view.xml b/Habitica/res/layout/stats_slider_view.xml
index 437a5d719..364f2e299 100644
--- a/Habitica/res/layout/stats_slider_view.xml
+++ b/Habitica/res/layout/stats_slider_view.xml
@@ -50,7 +50,7 @@
         android:gravity="center_horizontal"
         android:textColor="@color/text_secondary"
         style="@style/Body1"
-        app:backgroundTint="@color/content_background_offset"
+        app:backgroundTint="?attr/colorContentBackgroundOffset"
         android:textSize="16sp"
         android:inputType="number"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index d6198d575..376d49775 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -29,7 +29,6 @@
             android:textColor="@color/green_50" />
 
     </com.google.android.material.card.MaterialCardView>
-
     <LinearLayout
         style="@style/subscriptionBox"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/task_form_checklist_item.xml b/Habitica/res/layout/task_form_checklist_item.xml
index 0fb0075d6..ad92d5b6b 100644
--- a/Habitica/res/layout/task_form_checklist_item.xml
+++ b/Habitica/res/layout/task_form_checklist_item.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/layout_rounded_bg_task_form"
-    android:minHeight="38dp"
+    android:minHeight="40dp"
     android:gravity="center_vertical"
     android:paddingStart="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_medium"
diff --git a/Habitica/res/layout/task_main_content.xml b/Habitica/res/layout/task_main_content.xml
index bf2e2f2ba..98b5befd8 100644
--- a/Habitica/res/layout/task_main_content.xml
+++ b/Habitica/res/layout/task_main_content.xml
@@ -12,6 +12,17 @@
     android:paddingBottom="@dimen/task_top_bottom_padding"
     android:layout_marginEnd="@dimen/task_text_padding"
     android:layout_marginStart="@dimen/task_text_padding">
+    <TextView
+        android:id="@+id/assigned_textview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Caption4"
+        android:text="@string/pending_approval"
+        android:textColor="@color/text_ternary"
+        android:drawableStart="@drawable/assign"
+        android:drawablePadding="@dimen/spacing_small"
+        android:layout_marginBottom="2dp"
+        />
         <com.habitrpg.android.habitica.ui.views.EllipsisTextView
             android:id="@+id/checkedTextView"
             style="@style/Subheader3"
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
index 0a62d984b..0f4553a3b 100644
--- a/Habitica/res/layout/view_collapsible_section.xml
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -5,11 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.LinearLayout">
-    <View
-        android:id="@+id/separator"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/content_background_offset"/>
     <LinearLayout
         android:id="@+id/section_title_view"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/widget_dailies_list_row.xml b/Habitica/res/layout/widget_dailies_list_row.xml
index 0c8b69088..2916bfb28 100644
--- a/Habitica/res/layout/widget_dailies_list_row.xml
+++ b/Habitica/res/layout/widget_dailies_list_row.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/content_background">
+        android:background="?attr/colorContentBackground">
 
         <FrameLayout
             android:id="@+id/checkbox_background"
diff --git a/Habitica/res/layout/widget_todo_list_row.xml b/Habitica/res/layout/widget_todo_list_row.xml
index a6d5a961c..38c3dee9d 100644
--- a/Habitica/res/layout/widget_todo_list_row.xml
+++ b/Habitica/res/layout/widget_todo_list_row.xml
@@ -8,7 +8,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/content_background">
+        android:background="?attr/colorContentBackground">
 
         <FrameLayout
             android:id="@+id/checkbox_background"
diff --git a/Habitica/res/menu/menu_team_board.xml b/Habitica/res/menu/menu_team_board.xml
index 132073bf9..41752feef 100644
--- a/Habitica/res/menu/menu_team_board.xml
+++ b/Habitica/res/menu/menu_team_board.xml
@@ -2,10 +2,6 @@
     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"
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index d192e2c80..1379c226f 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -4,16 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_nav"
     app:startDestination="@id/tasksFragment">
-
-    <fragment
-        android:id="@+id/equipmentOverviewFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment"
-        android:label="@string/sidebar_equipment" >
-        <deepLink app:uri="habitica.com/inventory/equipment" />
-        <action
-            android:id="@+id/openEquipmentDetail"
-            app:destination="@id/equipmentDetailFragment" />
-    </fragment>
     <fragment
         android:id="@+id/equipmentDetailFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment"
@@ -44,6 +34,16 @@
         <deepLink app:uri="habitica.com/tasks" />
         <deepLink app:uri="habitica.com" />
     </fragment>
+    <activity
+        android:id="@+id/taskFormActivity"
+        android:name="com.habitrpg.android.habitica.ui.activities.TaskFormActivity">
+
+    </activity>
+    <activity
+        android:id="@+id/taskSummaryActivity"
+        android:name="com.habitrpg.android.habitica.ui.activities.TaskSummaryActivity">
+
+    </activity>
     <fragment
         android:id="@+id/partyFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment"
@@ -121,8 +121,8 @@
             android:id="@+id/openAvatarDetail"
             app:destination="@id/avatarCustomizationFragment" />
         <action
-            android:id="@+id/openAvatarEquipment"
-            app:destination="@id/avatarEquipmentFragment" />
+            android:id="@+id/openEquipmentDetail"
+            app:destination="@id/equipmentDetailFragment" />
     </fragment>
     <fragment
         android:id="@+id/itemsFragment"
@@ -298,17 +298,6 @@
             android:name="category"
             app:argType="string" />
     </fragment>
-    <fragment
-        android:id="@+id/avatarEquipmentFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarEquipmentFragment"
-        android:label="@string/sidebar_avatar" >
-        <argument
-            android:name="type"
-            app:argType="string" />
-        <argument
-            android:name="category"
-            app:argType="string" />
-    </fragment>
     <activity
         android:id="@+id/prefsActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.PrefsActivity"
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
index ae964c275..c36efabc6 100644
--- a/Habitica/res/values-night/colors.xml
+++ b/Habitica/res/values-night/colors.xml
@@ -68,4 +68,5 @@
 
 
     <color name="widget_background">#2B203A</color>
+    <color name="text_gold">@color/yellow_100</color>
 </resources>
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 25b90dca7..00ab3b562 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -3,6 +3,8 @@
     <attr name="colorPrimaryDistinct" format="color" />
     <attr name="colorBadgeBackground" format="color" />
     <attr name="colorContentBackground" format="color" />
+    <attr name="colorTintedBackground" format="color" />
+    <attr name="colorTintedBackgroundOffset" format="color" />
     <attr name="colorContentBackgroundOffset" format="color" />
     <attr name="colorWindowBackground" format="color" />
     <attr name="textColorPrimary" format="color" />
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index c6be00303..15ebbeee3 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -19,7 +19,7 @@
     <color name="checkbox_checked_fill">#c8ffffff</color>
     <color name="checkbox_checklist_fill">#23000000</color>
 
-    <color name="habit_inactive_gray">#F9F9F9</color>
+    <color name="habit_inactive_gray">@color/window_background</color>
 
     <!-- buttons -->
     <color name="btn_success">@color/green_10</color>
@@ -119,4 +119,5 @@
     <color name="lightly_tinted_background">@color/brand_700</color>
     <color name="dialog_background">@color/white</color>
     <color name="error_banner_background">@color/maroon_5</color>
+    <color name="text_gold">@color/yellow_1</color>
 </resources>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index e60c9e39c..c8d580874 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -36,7 +36,7 @@
     <dimen name="checkbox_size">24dp</dimen>
     <dimen name="checkbox_compact_size">20dp</dimen>
 
-    <dimen name="task_top_bottom_padding">10dp</dimen>
+    <dimen name="task_top_bottom_padding">8dp</dimen>
     <dimen name="task_top_bottom_compact_padding">8dp</dimen>
     <dimen name="reward_spacing">8dp</dimen>
     <dimen name="grid_item_margin">6dp</dimen>
diff --git a/Habitica/res/values/strings.sidebar.xml b/Habitica/res/values/strings.sidebar.xml
index e6265a982..0f4224a3d 100644
--- a/Habitica/res/values/strings.sidebar.xml
+++ b/Habitica/res/values/strings.sidebar.xml
@@ -12,6 +12,7 @@
     <string name="sidebar_challenges">Challenges</string>
     <string name="sidebar_section_inventory">Inventory</string>
     <string name="sidebar_avatar">Avatar Customization</string>
+    <string name="sidebar_avatar_equipment">Avatar &amp; Equipment</string>
     <string name="sidebar_equipment">Equipment</string>
     <string name="sidebar_stable">Pets &amp; Mounts</string>
     <string name="sidebar_news">News</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 553e10ee4..95345f3f2 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -53,6 +53,7 @@
     <string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
     <string name="save_changes">Save</string>
     <string name="copy">Copy</string>
+    <string name="title">Title</string>
     <string name="notes">Notes</string>
     <string name="difficulty">Difficulty</string>
     <string name="tags">Tags</string>
@@ -1257,4 +1258,24 @@
     <string name="copy_tasks_description">Show assigned and open tasks on your personal task lists</string>
     <string name="copy_shared_tasks">Copy shared tasks</string>
     <string name="group_plan_settings">Group Plan Settings</string>
+    <string name="task_summary">Task Summary</string>
+    <string name="habit_summary_description">This is a **%s** Habit that is **%s**.</string>
+    <string name="todo_summary_description_duedate">This is a **%s** Task that is due **%s**.</string>
+    <string name="todo_summary_description">This is a **%s** Task that does not have a due date.</string>
+    <string name="daily_summary_description">This is a **%s** Task that repeats **%s**.</string>
+    <string name="positive_and_negative">positive and negative</string>
+    <string name="assigned_to">Assigned to</string>
+    <string name="completed_at">Completed at %s</string>
+    <string name="assign">Assign</string>
+    <string name="edit_assignees">Edit assignees</string>
+    <string name="assign_to">Assign to...</string>
+    <plurals name="you_x_others">
+        <item quantity="zero">You</item>
+        <item quantity="one">You, %d other</item>
+        <item quantity="other">You, %d others</item>
+    </plurals>
+    <plurals name="people">
+        <item quantity="one">%d Person</item>
+        <item quantity="other">%d People</item>
+    </plurals>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 599ae83dd..60edf5c76 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -4,7 +4,7 @@
     <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="android:elevation">0dp</item>
         <item name="elevation">0dp</item>
 
         <item name="android:windowContentOverlay">@null</item>
@@ -26,6 +26,7 @@
         <item name="colorPrimaryDistinct">@color/brand_500</item>
         <item name="colorBadgeBackground">@color/brand_400</item>
         <item name="taskFormTint">@color/brand_300</item>
+        <item name="colorSecondaryVariant">@color/brand</item>
 
         <item name="textColorPrimary">@color/text_primary</item>
         <item name="textColorSecondary">@color/text_secondary</item>
@@ -36,7 +37,10 @@
         <item name="barColor">@color/brand_300</item>
 
         <item name="colorContentBackground">@color/content_background</item>
+        <item name="colorContentBackgroundOffset">@color/content_background_offset</item>
         <item name="colorWindowBackground">@color/window_background</item>
+        <item name="colorTintedBackground">@color/brand_800</item>
+        <item name="colorTintedBackgroundOffset">@color/brand_700</item>
 
         <item name="popupMenuStyle">@style/PopupTheme</item>
         <item name="actionOverflowMenuStyle">@style/PopupTheme</item>
@@ -52,8 +56,8 @@
         <item name="toolbarContentColor">@color/text_primary</item>
         <item name="colorPrimaryText">@color/brand_50</item>
         <item name="colorBoxStroke">@color/brand_50</item>
-        <item name="headerBackgroundColor">@color/content_background</item>
-        <item name="headerOffsetColor">@color/window_background</item>
+        <item name="headerBackgroundColor">?attr/colorContentBackground</item>
+        <item name="headerOffsetColor">?attr/colorWindowBackground</item>
         <item name="headerTextColor">@color/text_primary</item>
     </style>
 
@@ -92,6 +96,8 @@
         <item name="taskFormTint">@color/red_50</item>
         <item name="toolbarContentColor">@color/red_1</item>
         <item name="colorPrimaryText">@color/red_1</item>
+        <item name="colorTintedBackground">@color/red_700</item>
+        <item name="colorTintedBackgroundOffset">@color/red_600</item>
     </style>
 
     <style name="MainAppTheme.Red.Dark">
@@ -100,6 +106,8 @@
         <item name="colorBoxStroke">@color/red_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
         <item name="toolbarContentColor">@color/red_100</item>
+        <item name="colorTintedBackground">@color/red_1</item>
+        <item name="colorTintedBackgroundOffset">@color/red_5</item>
     </style>
 
     <style name="MainAppTheme.Maroon">
@@ -119,6 +127,8 @@
         <item name="barColor">@color/red_1</item>
         <item name="taskFormTint">@color/maroon_50</item>
         <item name="colorPrimaryText">@color/maroon_1</item>
+        <item name="colorTintedBackground">@color/maroon_700</item>
+        <item name="colorTintedBackgroundOffset">@color/maroon_600</item>
     </style>
 
     <style name="MainAppTheme.Maroon.Dark">
@@ -126,6 +136,8 @@
         <item name="colorPrimaryOffset">@color/gray_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
         <item name="toolbarContentColor">@color/maroon_100</item>
+        <item name="colorTintedBackground">@color/maroon_1</item>
+        <item name="colorTintedBackgroundOffset">@color/maroon_5</item>
     </style>
 
     <style name="MainAppTheme.Orange">
@@ -146,6 +158,8 @@
         <item name="taskFormTint">@color/orange_50</item>
         <item name="toolbarContentColor">@color/orange_1</item>
         <item name="colorPrimaryText">@color/orange_1</item>
+        <item name="colorTintedBackground">@color/orange_700</item>
+        <item name="colorTintedBackgroundOffset">@color/orange_600</item>
     </style>
 
     <style name="MainAppTheme.Orange.Dark">
@@ -154,6 +168,8 @@
         <item name="colorBoxStroke">@color/orange_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
         <item name="toolbarContentColor">@color/orange_100</item>
+        <item name="colorTintedBackground">@color/orange_1</item>
+        <item name="colorTintedBackgroundOffset">@color/orange_5</item>
     </style>
 
     <style name="MainAppTheme.Yellow">
@@ -174,6 +190,8 @@
         <item name="taskFormTint">@color/yellow_10</item>
         <item name="toolbarContentColor">@color/yellow_1</item>
         <item name="colorPrimaryText">@color/yellow_1</item>
+        <item name="colorTintedBackground">@color/yellow_700</item>
+        <item name="colorTintedBackgroundOffset">@color/yellow_600</item>
     </style>
 
     <style name="MainAppTheme.Yellow.Dark">
@@ -182,6 +200,7 @@
         <item name="colorBoxStroke">@color/yellow_5</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
         <item name="toolbarContentColor">@color/yellow_100</item>
+        <item name="colorTintedBackground">@color/yellow_5</item>
     </style>
 
     <style name="MainAppTheme.Green">
@@ -202,6 +221,8 @@
         <item name="taskFormTint">@color/green_50</item>
         <item name="toolbarContentColor">@color/green_1</item>
         <item name="colorPrimaryText">@color/green_1</item>
+        <item name="colorTintedBackground">@color/green_700</item>
+        <item name="colorTintedBackgroundOffset">@color/green_600</item>
     </style>
 
     <style name="MainAppTheme.Green.Dark">
@@ -210,6 +231,8 @@
         <item name="colorBoxStroke">@color/green_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
         <item name="toolbarContentColor">@color/green_100</item>
+        <item name="colorTintedBackground">@color/green_1</item>
+        <item name="colorTintedBackgroundOffset">@color/green_5</item>
     </style>
 
     <style name="MainAppTheme.Teal">
@@ -230,6 +253,8 @@
         <item name="taskFormTint">@color/teal_50</item>
         <item name="toolbarContentColor">@color/teal_1</item>
         <item name="colorPrimaryText">@color/teal_1</item>
+        <item name="colorTintedBackground">@color/teal_700</item>
+        <item name="colorTintedBackgroundOffset">@color/teal_600</item>
     </style>
 
     <style name="MainAppTheme.Teal.Dark">
@@ -238,6 +263,8 @@
         <item name="colorBoxStroke">@color/teal_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
         <item name="toolbarContentColor">@color/teal_100</item>
+        <item name="colorTintedBackground">@color/teal_1</item>
+        <item name="colorTintedBackgroundOffset">@color/teal_5</item>
     </style>
 
     <style name="MainAppTheme.Blue">
@@ -258,6 +285,8 @@
         <item name="taskFormTint">@color/blue_50</item>
         <item name="toolbarContentColor">@color/blue_1</item>
         <item name="colorPrimaryText">@color/blue_1</item>
+        <item name="colorTintedBackground">@color/blue_700</item>
+        <item name="colorTintedBackgroundOffset">@color/blue_600</item>
     </style>
 
     <style name="MainAppTheme.Blue.Dark">
@@ -266,6 +295,8 @@
         <item name="textColorPrimaryDark">@color/gray_200</item>
         <item name="colorBoxStroke">@color/blue_10</item>
         <item name="toolbarContentColor">@color/blue_100</item>
+        <item name="colorTintedBackground">@color/blue_1</item>
+        <item name="colorTintedBackgroundOffset">@color/blue_5</item>
     </style>
 
     <style name="MyWidgetTheme">
@@ -281,7 +312,7 @@
 
 
     <style name="PopupTheme" parent="Widget.AppCompat.PopupMenu.Overflow">
-        <item name="android:popupBackground">@color/content_background</item>
+        <item name="android:popupBackground">?attr/colorContentBackground</item>
     </style>
 
     <style name="CardText">
@@ -582,7 +613,7 @@
     </style>
 
     <style name="HabiticaButton.Content" parent="HabiticaButton">
-        <item name="android:backgroundTint">@color/content_background</item>
+        <item name="android:backgroundTint">?attr/colorContentBackground</item>
         <item name="android:textColor">@color/text_primary</item>
     </style>
 
@@ -695,7 +726,7 @@
     </style>
 
     <style name="HabiticaButton.Gray" parent="HabiticaButton">
-        <item name="android:backgroundTint">@color/window_background</item>
+        <item name="android:backgroundTint">?attr/colorWindowBackground</item>
         <item name="android:textColor">@color/text_brand_neon</item>
     </style>
 
@@ -868,18 +899,18 @@
 
     <style name="TaskFormSectionheader">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/text_primary</item>
+        <item name="android:textColor">?colorPrimaryDark</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_content</item>
+        <item name="android:background">@drawable/layout_rounded_bg_tinted</item>
         <item name="android:gravity">center</item>
         <item name="android:paddingTop">@dimen/spacing_small</item>
         <item name="android:paddingBottom">@dimen/spacing_small</item>
-        <item name="android:height">28dp</item>
+        <item name="android:height">48dp</item>
     </style>
 
     <style name="TaskFormWeekdayButton">
@@ -962,8 +993,8 @@
     </style>
 
     <style name="Widget.App.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet.Modal">
-        <item name="android:backgroundTint">@color/window_background</item>
-        <item name="backgroundTint">@color/window_background</item>
+        <item name="android:backgroundTint">?attr/colorWindowBackground</item>
+        <item name="backgroundTint">?attr/colorWindowBackground</item>
         <item name="android:background">@drawable/bottom_sheet_background</item>
         <item name="shapeAppearanceOverlay">@null</item>
         <item name="shapeAppearance">@null</item>
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
index 6d04fe669..5320b66d7 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica
 import android.content.SharedPreferences
 import androidx.lifecycle.MutableLiveData
 import com.habitrpg.android.habitica.api.GSonFactoryCreator
-import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.android.habitica.api.MaintenanceApiService
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
@@ -14,9 +13,9 @@ import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.TutorialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.interactors.FeedPetUseCase
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
@@ -29,22 +28,23 @@ import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.api.HostConfig
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
 import io.mockk.clearAllMocks
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.slot
-import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.flowOf
+import org.junit.Before
 import java.io.InputStreamReader
 import java.lang.reflect.Type
 import kotlin.reflect.KCallable
 import kotlin.reflect.KMutableProperty1
 import kotlin.reflect.full.starProjectedType
 import kotlin.reflect.jvm.javaField
-import org.junit.Before
 
 open class HabiticaTestCase : TestCase() {
     val gson = GSonFactoryCreator.createGson()
@@ -68,8 +68,7 @@ open class HabiticaTestCase : TestCase() {
     val hatchPetUseCase: HatchPetUseCase = mockk(relaxed = true)
     val feedPetUseCase: FeedPetUseCase = mockk(relaxed = true)
 
-    val userSubject = PublishSubject.create<User>()
-    val userEvents: Flowable<User> = userSubject.toFlowable(BackpressureStrategy.DROP)
+    val userState = MutableStateFlow<User?>(null)
     var user = User()
     lateinit var content: ContentResult
 
@@ -85,27 +84,27 @@ open class HabiticaTestCase : TestCase() {
         user = loadJsonFile("user", User::class.java)
         user.stats?.lvl = 20
         user.stats?.points = 30
-        every { userRepository.getUser() } returns userEvents
+        every { userRepository.getUser() } returns userState
         every { userViewModel.user } returns MutableLiveData<User?>(user)
-        mockkObject(RxErrorHandler)
-        every { RxErrorHandler.reportError(capture(errorSlot)) } answers {
+        mockkObject(ExceptionHandler)
+        every { ExceptionHandler.reportError(capture(errorSlot)) } answers {
             throw errorSlot.captured
         }
         every { socialRepository.getUnmanagedCopy(capture(unmanagedSlot)) } answers { unmanagedSlot.captured }
         content = loadJsonFile("content", ContentResult::class.java)
-        every { inventoryRepository.getPets() } returns Flowable.just(content.pets)
-        every { inventoryRepository.getMounts() } returns Flowable.just(content.mounts)
+        every { inventoryRepository.getPets() } returns flowOf(content.pets)
+        every { inventoryRepository.getMounts() } returns flowOf(content.mounts)
         every { inventoryRepository.getItemsFlowable(Food::class.java) } returns Flowable.just(content.food)
         every { inventoryRepository.getItemsFlowable(Egg::class.java) } returns Flowable.just(content.eggs)
         every { inventoryRepository.getItemsFlowable(HatchingPotion::class.java) } returns Flowable.just(content.hatchingPotions)
         every { inventoryRepository.getItemsFlowable(QuestContent::class.java) } returns Flowable.just(content.quests)
 
-        every { inventoryRepository.getItemsFlowable(Food::class.java, any()) } returns Flowable.just(content.food)
-        every { inventoryRepository.getItemsFlowable(Egg::class.java, any()) } answers {
-            Flowable.just(content.eggs)
+        every { inventoryRepository.getItems(Food::class.java, any()) } returns flowOf(content.food)
+        every { inventoryRepository.getItems(Egg::class.java, any()) } answers {
+            flowOf(content.eggs)
         }
-        every { inventoryRepository.getItemsFlowable(HatchingPotion::class.java, any()) } returns Flowable.just(content.hatchingPotions)
-        every { inventoryRepository.getItemsFlowable(QuestContent::class.java, any()) } returns Flowable.just(content.quests)
+        every { inventoryRepository.getItems(HatchingPotion::class.java, any()) } returns flowOf(content.hatchingPotions)
+        every { inventoryRepository.getItems(QuestContent::class.java, any()) } returns flowOf(content.quests)
     }
 
     internal fun <T> loadJsonFile(s: String, type: Type): T {
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt
index ec9547c2c..8abb38a6c 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt
@@ -162,7 +162,7 @@ class TaskFormActivityTest : ActivityTestCase() {
             device.activities.isCurrent(TaskFormActivity::class.java)
             textEditText.typeText("New Habit")
             KButton { withId(R.id.action_save) }.click()
-            verify(exactly = 1) { taskRepository.createTaskInBackground(any()) }
+            verify(exactly = 1) { taskRepository.createTaskInBackground(any(), assignChanges) }
         }
     }
 
@@ -184,7 +184,7 @@ class TaskFormActivityTest : ActivityTestCase() {
         screen {
             toolbar {
                 KView { withId(R.id.action_save) }.click()
-                verify(exactly = 1) { taskRepository.updateTaskInBackground(any()) }
+                verify(exactly = 1) { taskRepository.updateTaskInBackground(any(), assignChanges) }
             }
         }
     }
@@ -288,7 +288,7 @@ class TaskFormActivityTest : ActivityTestCase() {
         bundle.putString(TaskFormActivity.TASK_TYPE_KEY, TaskType.DAILY.value)
         bundle.putString(TaskFormActivity.TASK_ID_KEY, task.id!!)
         every { taskRepository.getUnmanagedTask(any()) } returns Flowable.just(task)
-        justRun { taskRepository.updateTaskInBackground(capture(taskSlot)) }
+        justRun { taskRepository.updateTaskInBackground(capture(taskSlot), assignChanges) }
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), TaskFormActivity::class.java)
         intent.putExtras(bundle)
@@ -313,7 +313,7 @@ class TaskFormActivityTest : ActivityTestCase() {
                 typeText("3")
             }
             KButton { withId(R.id.action_save) }.click()
-            verify { taskRepository.updateTaskInBackground(any()) }
+            verify { taskRepository.updateTaskInBackground(any(), assignChanges) }
             assert(taskSlot.captured.everyX == 3)
             assert(taskSlot.captured.frequency == Frequency.WEEKLY)
         }
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
index 2ee2ba7cc..a69fb6889 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
@@ -63,7 +63,7 @@ class StatsFragmentTest : FragmentTestCase<StatsFragment, FragmentStatsBinding,
     fun setUpUser() {
         user.stats?.lvl = 20
         user.stats?.points = 30
-        userSubject.onNext(user)
+        userState.onNext(user)
 
         every { inventoryRepository.getEquipment(listOf()) } returns Flowable.just(listOf())
     }
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
index f347c70da..ca01795b6 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
@@ -115,7 +115,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
             items = (items + items).sortedBy { it.key }
             Flowable.just(items)
         }
-        every { inventoryRepository.getItemsFlowable(Food::class.java, any()) } answers {
+        every { inventoryRepository.getItems(Food::class.java, any()) } answers {
             Flowable.just((content.eggs + content.eggs).sortedBy { it.key })
         }
         fragment.itemType = "food"
@@ -134,7 +134,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
     @Test
     fun canHatchPetWithEggs() {
         val slot = CapturingSlot<HatchPetUseCase.RequestValues>()
-        every { hatchPetUseCase.observable(capture(slot)) } returns mockk(relaxed = true)
+        every { hatchPetUseCase.callInteractor(capture(slot)) } returns mockk(relaxed = true)
         fragment.itemType = "eggs"
         launchFragment()
         screen {
@@ -142,7 +142,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
                 childWith<ItemItem> { withDescendant { withText("Wolf") } }.click()
                 KView { withText(R.string.hatch_with_potion) }.click()
                 KView { withText("Shade") }.click()
-                verify { hatchPetUseCase.observable(any()) }
+                verify { hatchPetUseCase.callInteractor(any()) }
                 slot.captured.egg.key shouldBe "Wolf"
                 slot.captured.potion.key shouldBe "Shade"
             }
@@ -152,7 +152,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
     @Test
     fun canHatchPetWithPotions() {
         val slot = CapturingSlot<HatchPetUseCase.RequestValues>()
-        every { hatchPetUseCase.observable(capture(slot)) } returns mockk(relaxed = true)
+        every { hatchPetUseCase.callInteractor(capture(slot)) } returns mockk(relaxed = true)
         fragment.itemType = "hatchingPotions"
         launchFragment()
         screen {
@@ -160,7 +160,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
                 childWith<ItemItem> { withDescendant { withText("Shade") } }.click()
                 KView { withText(R.string.hatch_egg) }.click()
                 KView { withText("Wolf") }.click()
-                verify { hatchPetUseCase.observable(any()) }
+                verify { hatchPetUseCase.callInteractor(any()) }
                 slot.captured.egg.key shouldBe "Wolf"
                 slot.captured.potion.key shouldBe "Shade"
             }
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt
index 78509ba7e..b44295720 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt
@@ -69,7 +69,7 @@ internal class PetDetailRecyclerFragmentTest :
     @Test
     fun canFeedPet() {
         val slot = CapturingSlot<FeedPetUseCase.RequestValues>()
-        every { feedPetUseCase.observable(capture(slot)) } returns mockk(relaxed = true)
+        every { feedPetUseCase.callInteractor(capture(slot)) } returns mockk(relaxed = true)
         every {
             inventoryRepository.getPets(
                 any(),
@@ -92,7 +92,7 @@ internal class PetDetailRecyclerFragmentTest :
                 childWith<PetItem> { withContentDescription("Skeleton Cactus") }.click()
                 KView { withText(R.string.feed) }.click()
                 KView { withText("Meat") }.click()
-                verify { feedPetUseCase.observable(any()) }
+                verify { feedPetUseCase.callInteractor(any()) }
                 slot.captured.pet.key shouldBe "Cactus-Skeleton"
                 slot.captured.food.key shouldBe "Meat"
             }
@@ -102,7 +102,7 @@ internal class PetDetailRecyclerFragmentTest :
     @Test
     fun canUseSaddle() {
         val slot = CapturingSlot<FeedPetUseCase.RequestValues>()
-        every { feedPetUseCase.observable(capture(slot)) } returns mockk(relaxed = true)
+        every { feedPetUseCase.callInteractor(capture(slot)) } returns mockk(relaxed = true)
         every {
             inventoryRepository.getPets(
                 any(),
@@ -122,7 +122,7 @@ internal class PetDetailRecyclerFragmentTest :
             recycler {
                 childWith<PetItem> { withContentDescription("Shade Fox") }.click()
                 KView { withText(R.string.use_saddle) }.click()
-                verify { feedPetUseCase.observable(any()) }
+                verify { feedPetUseCase.callInteractor(any()) }
                 slot.captured.pet.key shouldBe "Fox-Shade"
                 slot.captured.food.key shouldBe "Saddle"
             }
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 6901fe38f..c2f65d854 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -18,8 +18,6 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import com.amplitude.api.Amplitude
-import com.amplitude.api.Identify
 import com.google.android.gms.wearable.Wearable
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.installations.FirebaseInstallations
@@ -29,7 +27,8 @@ import com.habitrpg.android.habitica.components.AppComponent
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.helpers.AdHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.AmplitudeManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
 import com.habitrpg.android.habitica.modules.UserModule
 import com.habitrpg.android.habitica.modules.UserRepositoryModule
@@ -76,17 +75,13 @@ abstract class HabiticaBaseApplication : Application(), Application.ActivityLife
 
         if (!BuildConfig.DEBUG) {
             try {
-                Amplitude.getInstance().initialize(this, getString(R.string.amplitude_app_id)).enableForegroundTracking(this)
-                val identify = Identify()
-                    .setOnce("androidStore", BuildConfig.STORE)
-                    .set("launch_screen", sharedPrefs.getString("launch_screen", ""))
-                Amplitude.getInstance().identify(identify)
+                AmplitudeManager.initialize(this, sharedPrefs)
             } catch (ignored: Resources.NotFoundException) {
             }
         }
         setupCoil()
 
-        RxErrorHandler.init(analyticsManager)
+        ExceptionHandler.init(analyticsManager)
 
         FirebaseAnalytics.getInstance(this).setUserProperty("app_testing_level", BuildConfig.TESTING_LEVEL)
 
@@ -120,7 +115,6 @@ abstract class HabiticaBaseApplication : Application(), Application.ActivityLife
             .deleteRealmIfMigrationNeeded()
             .allowWritesOnUiThread(true)
             .compactOnLaunch { totalBytes, usedBytes ->
-
                 // Compact if the file is over 100MB in size and less than 50% 'used'
                 val oneHundredMB = 50 * 1024 * 1024
                 (totalBytes > oneHundredMB) && (usedBytes / totalBytes) < 0.5
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 b94f5b2a5..e03f44c24 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
@@ -26,17 +26,16 @@ 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 com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.common.habitica.models.PurchaseValidationRequest
 import com.habitrpg.common.habitica.models.PurchaseValidationResult
 import com.habitrpg.common.habitica.models.auth.UserAuth
 import com.habitrpg.common.habitica.models.auth.UserAuthResponse
 import com.habitrpg.common.habitica.models.auth.UserAuthSocial
 import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.shared.habitica.models.responses.Status
 import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
 import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
-import io.reactivex.rxjava3.core.Flowable
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -49,404 +48,407 @@ import retrofit2.http.Query
 
 @JvmSuppressWildcards
 interface ApiService {
-    @get:GET("status")
-    val status: Flowable<HabitResponse<Status>>
+    @GET("status")
+    suspend fun getStatus(): HabitResponse<Status>
 
     /* user API */
 
-    @get:GET("user/")
-    val user: Flowable<HabitResponse<User>>
+    @GET("user/")
+    suspend fun getUser(): HabitResponse<User>
 
     @GET("inbox/messages")
-    fun getInboxMessages(@Query("conversation") uuid: String, @Query("page") page: Int): Flowable<HabitResponse<List<ChatMessage>>>
+    suspend fun getInboxMessages(@Query("conversation") uuid: String, @Query("page") page: Int): HabitResponse<List<ChatMessage>>
     @GET("inbox/conversations")
-    fun getInboxConversations(): Flowable<HabitResponse<List<InboxConversation>>>
+    suspend fun getInboxConversations(): HabitResponse<List<InboxConversation>>
 
-    @get:GET("tasks/user")
-    val tasks: Flowable<HabitResponse<TaskList>>
+    @GET("tasks/user")
+    suspend fun getTasks(): HabitResponse<TaskList>
 
-    @get:GET("world-state")
-    val worldState: Flowable<HabitResponse<WorldState>>
+    @GET("world-state")
+    suspend fun worldState(): HabitResponse<WorldState>
 
     @GET("content")
-    fun getContent(@Query("language") language: String?): Flowable<HabitResponse<ContentResult>>
+    suspend fun getContent(@Query("language") language: String?): HabitResponse<ContentResult>
 
     @PUT("user/")
-    fun updateUser(@Body updateDictionary: Map<String, Any>): Flowable<HabitResponse<User>>
+    suspend fun updateUser(@Body updateDictionary: Map<String, Any>): HabitResponse<User>
 
     @PUT("user/")
-    fun registrationLanguage(@Header("Accept-Language") registrationLanguage: String): Flowable<HabitResponse<User>>
+    suspend fun registrationLanguage(@Header("Accept-Language") registrationLanguage: String): HabitResponse<User>
 
     @GET("user/in-app-rewards")
-    fun retrieveInAppRewards(): Flowable<HabitResponse<List<ShopItem>>>
-
-    @GET("user/inventory/buy")
-    fun retrieveOldGearRewards(): Flowable<HabitResponse<List<ShopItem>>>
+    suspend fun retrieveInAppRewards(): HabitResponse<List<ShopItem>>
 
     @POST("user/equip/{type}/{key}")
-    fun equipItem(@Path("type") type: String, @Path("key") itemKey: String): Flowable<HabitResponse<Items>>
+    suspend fun equipItem(@Path("type") type: String, @Path("key") itemKey: String): HabitResponse<Items>
 
     @POST("user/buy/{key}")
-    fun buyItem(@Path("key") itemKey: String, @Body quantity: Map<String, Int>): Flowable<HabitResponse<BuyResponse>>
+    suspend fun buyItem(@Path("key") itemKey: String, @Body quantity: Map<String, Int>): HabitResponse<BuyResponse>
 
     @POST("user/purchase/{type}/{key}")
-    fun purchaseItem(
+    suspend fun purchaseItem(
         @Path("type") type: String,
         @Path("key") itemKey: String,
         @Body quantity: Map<String, Int>
-    ): Flowable<HabitResponse<Void>>
+    ): HabitResponse<Void>
 
     @POST("user/purchase-hourglass/{type}/{key}")
-    fun purchaseHourglassItem(@Path("type") type: String, @Path("key") itemKey: String): Flowable<HabitResponse<Void>>
+    suspend fun purchaseHourglassItem(@Path("type") type: String, @Path("key") itemKey: String): HabitResponse<Void>
 
     @POST("user/buy-mystery-set/{key}")
-    fun purchaseMysterySet(@Path("key") itemKey: String): Flowable<HabitResponse<Void>>
+    suspend fun purchaseMysterySet(@Path("key") itemKey: String): HabitResponse<Void>
 
     @POST("user/buy-quest/{key}")
-    fun purchaseQuest(@Path("key") key: String): Flowable<HabitResponse<Void>>
+    suspend fun purchaseQuest(@Path("key") key: String): HabitResponse<Void>
 
     @POST("user/buy-special-spell/{key}")
-    fun purchaseSpecialSpell(@Path("key") key: String): Flowable<HabitResponse<Void>>
+    suspend fun purchaseSpecialSpell(@Path("key") key: String): HabitResponse<Void>
 
     @POST("user/sell/{type}/{key}")
-    fun sellItem(@Path("type") itemType: String, @Path("key") itemKey: String): Flowable<HabitResponse<User>>
+    suspend fun sellItem(@Path("type") itemType: String, @Path("key") itemKey: String): HabitResponse<User>
 
     @POST("user/feed/{pet}/{food}")
-    fun feedPet(@Path("pet") petKey: String, @Path("food") foodKey: String): Flowable<HabitResponse<FeedResponse>>
+    suspend fun feedPet(@Path("pet") petKey: String, @Path("food") foodKey: String): HabitResponse<FeedResponse>
 
     @POST("user/hatch/{egg}/{hatchingPotion}")
-    fun hatchPet(@Path("egg") eggKey: String, @Path("hatchingPotion") hatchingPotionKey: String): Flowable<HabitResponse<Items>>
+    suspend fun hatchPet(@Path("egg") eggKey: String, @Path("hatchingPotion") hatchingPotionKey: String): HabitResponse<Items>
 
     @GET("tasks/user")
-    fun getTasks(@Query("type") type: String): Flowable<HabitResponse<TaskList>>
+    suspend fun getTasks(@Query("type") type: String): HabitResponse<TaskList>
 
     @GET("tasks/user")
-    fun getTasks(@Query("type") type: String, @Query("dueDate") dueDate: String): Flowable<HabitResponse<TaskList>>
+    suspend fun getTasks(@Query("type") type: String, @Query("dueDate") dueDate: String): HabitResponse<TaskList>
 
     @POST("user/unlock")
-    fun unlockPath(@Query("path") path: String): Flowable<HabitResponse<UnlockResponse>>
+    suspend fun unlockPath(@Query("path") path: String): HabitResponse<UnlockResponse>
 
     @GET("tasks/{id}")
-    fun getTask(@Path("id") id: String): Flowable<HabitResponse<Task>>
+    suspend fun getTask(@Path("id") id: String): HabitResponse<Task>
 
     @POST("tasks/{id}/score/{direction}")
-    fun postTaskDirection(@Path("id") id: String, @Path("direction") direction: String): Flowable<HabitResponse<TaskDirectionData>>
+    suspend fun postTaskDirection(@Path("id") id: String, @Path("direction") direction: String): HabitResponse<TaskDirectionData>
     @POST("tasks/bulk-score")
-    fun bulkScoreTasks(@Body data: List<Map<String, String>>): Flowable<HabitResponse<BulkTaskScoringData>>
+    suspend fun bulkScoreTasks(@Body data: List<Map<String, String>>): HabitResponse<BulkTaskScoringData>
 
     @POST("tasks/{id}/move/to/{position}")
-    fun postTaskNewPosition(@Path("id") id: String, @Path("position") position: Int): Flowable<HabitResponse<List<String>>>
+    suspend fun postTaskNewPosition(@Path("id") id: String, @Path("position") position: Int): HabitResponse<List<String>>
 
     @POST("tasks/{taskId}/checklist/{itemId}/score")
-    fun scoreChecklistItem(@Path("taskId") taskId: String, @Path("itemId") itemId: String): Flowable<HabitResponse<Task>>
+    suspend fun scoreChecklistItem(@Path("taskId") taskId: String, @Path("itemId") itemId: String): HabitResponse<Task>
 
     @POST("tasks/user")
-    fun createTask(@Body item: Task): Flowable<HabitResponse<Task>>
+    suspend fun createTask(@Body item: Task): HabitResponse<Task>
 
     @POST("tasks/user")
-    fun createTasks(@Body tasks: List<Task>): Flowable<HabitResponse<List<Task>>>
+    suspend fun createTasks(@Body tasks: List<Task>): HabitResponse<List<Task>>
 
     @PUT("tasks/{id}")
-    fun updateTask(@Path("id") id: String, @Body item: Task): Flowable<HabitResponse<Task>>
+    suspend fun updateTask(@Path("id") id: String, @Body item: Task): HabitResponse<Task>
 
     @DELETE("tasks/{id}")
-    fun deleteTask(@Path("id") id: String): Flowable<HabitResponse<Void>>
+    suspend fun deleteTask(@Path("id") id: String): HabitResponse<Void>
 
     @POST("tags")
-    fun createTag(@Body tag: Tag): Flowable<HabitResponse<Tag>>
+    suspend fun createTag(@Body tag: Tag): HabitResponse<Tag>
 
     @PUT("tags/{id}")
-    fun updateTag(@Path("id") id: String, @Body tag: Tag): Flowable<HabitResponse<Tag>>
+    suspend fun updateTag(@Path("id") id: String, @Body tag: Tag): HabitResponse<Tag>
 
     @DELETE("tags/{id}")
-    fun deleteTag(@Path("id") id: String): Flowable<HabitResponse<Void>>
+    suspend fun deleteTag(@Path("id") id: String): HabitResponse<Void>
 
     @POST("user/auth/local/register")
-    fun registerUser(@Body auth: UserAuth): Flowable<HabitResponse<UserAuthResponse>>
+    suspend fun registerUser(@Body auth: UserAuth): HabitResponse<UserAuthResponse>
 
     @POST("user/auth/local/login")
-    fun connectLocal(@Body auth: UserAuth): Flowable<HabitResponse<UserAuthResponse>>
+    suspend fun connectLocal(@Body auth: UserAuth): HabitResponse<UserAuthResponse>
 
     @POST("user/auth/social")
-    fun connectSocial(@Body auth: UserAuthSocial): Flowable<HabitResponse<UserAuthResponse>>
+    suspend fun connectSocial(@Body auth: UserAuthSocial): HabitResponse<UserAuthResponse>
 
     @DELETE("user/auth/social/{network}")
-    fun disconnectSocial(@Path("network") network: String): Flowable<HabitResponse<Void>>
+    suspend fun disconnectSocial(@Path("network") network: String): HabitResponse<Void>
 
     @POST("user/auth/apple")
-    fun loginApple(@Body auth: Map<String, Any>): Flowable<HabitResponse<UserAuthResponse>>
+    suspend fun loginApple(@Body auth: Map<String, Any>): HabitResponse<UserAuthResponse>
 
     @POST("user/sleep")
-    fun sleep(): Flowable<HabitResponse<Boolean>>
+    suspend fun sleep(): HabitResponse<Boolean>
 
     @POST("user/revive")
-    fun revive(): Flowable<HabitResponse<User>>
+    suspend fun revive(): HabitResponse<User>
 
     @POST("user/class/cast/{skill}")
-    fun useSkill(
+    suspend fun useSkill(
         @Path("skill") skillName: String,
         @Query("targetType") targetType: String,
         @Query("targetId") targetId: String
-    ): Flowable<HabitResponse<SkillResponse>>
+    ): HabitResponse<SkillResponse>
 
     @POST("user/class/cast/{skill}")
-    fun useSkill(@Path("skill") skillName: String, @Query("targetType") targetType: String): Flowable<HabitResponse<SkillResponse>>
+    suspend fun useSkill(@Path("skill") skillName: String, @Query("targetType") targetType: String): HabitResponse<SkillResponse>
 
     @POST("user/change-class")
-    fun changeClass(): Flowable<HabitResponse<User>>
+    suspend fun changeClass(): HabitResponse<User>
 
     @POST("user/change-class")
-    fun changeClass(@Query("class") className: String): Flowable<HabitResponse<User>>
+    suspend fun changeClass(@Query("class") className: String): HabitResponse<User>
 
     @POST("user/disable-classes")
-    fun disableClasses(): Flowable<HabitResponse<User>>
+    suspend fun disableClasses(): HabitResponse<User>
 
     @POST("user/mark-pms-read")
-    fun markPrivateMessagesRead(): Flowable<Void>
+    suspend fun markPrivateMessagesRead(): Void
 
     /* Group API */
 
     @GET("groups")
-    fun listGroups(@Query("type") type: String): Flowable<HabitResponse<List<Group>>>
+    suspend fun listGroups(@Query("type") type: String): HabitResponse<List<Group>>
 
     @GET("groups/{gid}")
-    fun getGroup(@Path("gid") groupId: String): Flowable<HabitResponse<Group>>
+    suspend fun getGroup(@Path("gid") groupId: String): HabitResponse<Group>
 
     @POST("groups")
-    fun createGroup(@Body item: Group): Flowable<HabitResponse<Group>>
+    suspend fun createGroup(@Body item: Group): HabitResponse<Group>
 
     @PUT("groups/{id}")
-    fun updateGroup(@Path("id") id: String, @Body item: Group): Flowable<HabitResponse<Group>>
+    suspend fun updateGroup(@Path("id") id: String, @Body item: Group): HabitResponse<Group>
 
     @POST("groups/{groupID}/removeMember/{userID}")
-    fun removeMemberFromGroup(@Path("groupID") groupID: String, @Path("userID") userID: String): Flowable<HabitResponse<Void>>
+    suspend fun removeMemberFromGroup(@Path("groupID") groupID: String, @Path("userID") userID: String): HabitResponse<Void>
 
     @GET("groups/{gid}/chat")
-    fun listGroupChat(@Path("gid") groupId: String): Flowable<HabitResponse<List<ChatMessage>>>
+    suspend fun listGroupChat(@Path("gid") groupId: String): HabitResponse<List<ChatMessage>>
 
     @POST("groups/{gid}/join")
-    fun joinGroup(@Path("gid") groupId: String): Flowable<HabitResponse<Group>>
+    suspend fun joinGroup(@Path("gid") groupId: String): HabitResponse<Group>
 
     @POST("groups/{gid}/leave")
-    fun leaveGroup(@Path("gid") groupId: String, @Query("keepChallenges") keepChallenges: String): Flowable<HabitResponse<Void>>
+    suspend fun leaveGroup(@Path("gid") groupId: String, @Query("keepChallenges") keepChallenges: String): HabitResponse<Void>
 
     @POST("groups/{gid}/chat")
-    fun postGroupChat(@Path("gid") groupId: String, @Body message: Map<String, String>): Flowable<HabitResponse<PostChatMessageResult>>
+    suspend fun postGroupChat(@Path("gid") groupId: String, @Body message: Map<String, String>): HabitResponse<PostChatMessageResult>
 
     @DELETE("groups/{gid}/chat/{messageId}")
-    fun deleteMessage(@Path("gid") groupId: String, @Path("messageId") messageId: String): Flowable<HabitResponse<Void>>
+    suspend fun deleteMessage(@Path("gid") groupId: String, @Path("messageId") messageId: String): HabitResponse<Void>
 
     @DELETE("inbox/messages/{messageId}")
-    fun deleteInboxMessage(@Path("messageId") messageId: String): Flowable<HabitResponse<Void>>
+    suspend fun deleteInboxMessage(@Path("messageId") messageId: String): HabitResponse<Void>
 
     @GET("groups/{gid}/members")
-    fun getGroupMembers(
+    suspend fun getGroupMembers(
         @Path("gid") groupId: String,
         @Query("includeAllPublicFields") includeAllPublicFields: Boolean?
-    ): Flowable<HabitResponse<List<Member>>>
+    ): HabitResponse<List<Member>>
 
     @GET("groups/{gid}/members")
-    fun getGroupMembers(
+    suspend fun getGroupMembers(
         @Path("gid") groupId: String,
         @Query("includeAllPublicFields") includeAllPublicFields: Boolean?,
         @Query("lastId") lastId: String
-    ): Flowable<HabitResponse<List<Member>>>
+    ): HabitResponse<List<Member>>
 
     // Like returns the full chat list
     @POST("groups/{gid}/chat/{mid}/like")
-    fun likeMessage(@Path("gid") groupId: String, @Path("mid") mid: String): Flowable<HabitResponse<ChatMessage>>
+    suspend fun likeMessage(@Path("gid") groupId: String, @Path("mid") mid: String): HabitResponse<ChatMessage>
 
     @POST("groups/{gid}/chat/{mid}/flag")
-    fun flagMessage(
+    suspend fun flagMessage(
         @Path("gid") groupId: String,
         @Path("mid") mid: String,
         @Body data: Map<String, String>
-    ): Flowable<HabitResponse<Void>>
+    ): HabitResponse<Void>
 
     @POST("groups/{gid}/chat/seen")
-    fun seenMessages(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+    suspend fun seenMessages(@Path("gid") groupId: String): HabitResponse<Void>
 
     @POST("groups/{gid}/invite")
-    fun inviteToGroup(@Path("gid") groupId: String, @Body inviteData: Map<String, Any>): Flowable<HabitResponse<List<Void>>>
+    suspend fun inviteToGroup(@Path("gid") groupId: String, @Body inviteData: Map<String, Any>): HabitResponse<List<Void>>
 
     @POST("groups/{gid}/reject-invite")
-    fun rejectGroupInvite(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+    suspend fun rejectGroupInvite(@Path("gid") groupId: String): HabitResponse<Void>
 
     @POST("groups/{gid}/quests/accept")
-    fun acceptQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+    suspend fun acceptQuest(@Path("gid") groupId: String): HabitResponse<Void>
 
     @POST("groups/{gid}/quests/reject")
-    fun rejectQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+    suspend fun rejectQuest(@Path("gid") groupId: String): HabitResponse<Void>
 
     @POST("groups/{gid}/quests/cancel")
-    fun cancelQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+    suspend fun cancelQuest(@Path("gid") groupId: String): HabitResponse<Void>
 
     @POST("groups/{gid}/quests/force-start")
-    fun forceStartQuest(@Path("gid") groupId: String, @Body group: Group): Flowable<HabitResponse<Quest>>
+    suspend fun forceStartQuest(@Path("gid") groupId: String, @Body group: Group): HabitResponse<Quest>
 
     @POST("groups/{gid}/quests/invite/{questKey}")
-    fun inviteToQuest(@Path("gid") groupId: String, @Path("questKey") questKey: String): Flowable<HabitResponse<Quest>>
+    suspend fun inviteToQuest(@Path("gid") groupId: String, @Path("questKey") questKey: String): HabitResponse<Quest>
 
     @POST("groups/{gid}/quests/abort")
-    fun abortQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Quest>>
+    suspend fun abortQuest(@Path("gid") groupId: String): HabitResponse<Quest>
 
     @POST("groups/{gid}/quests/leave")
-    fun leaveQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+    suspend fun leaveQuest(@Path("gid") groupId: String): HabitResponse<Void>
 
     @POST("/iap/android/verify")
-    fun validatePurchase(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<PurchaseValidationResult>>
+    suspend fun validatePurchase(@Body request: PurchaseValidationRequest): HabitResponse<PurchaseValidationResult>
 
     @POST("/iap/android/subscribe")
-    fun validateSubscription(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<Void>>
+    suspend fun validateSubscription(@Body request: PurchaseValidationRequest): HabitResponse<Void>
 
     @GET("/iap/android/subscribe/cancel")
-    fun cancelSubscription(): Flowable<HabitResponse<Void>>
+    suspend fun cancelSubscription(): HabitResponse<Void>
 
     @POST("/iap/android/norenew-subscribe")
-    fun validateNoRenewSubscription(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<Void>>
+    suspend fun validateNoRenewSubscription(@Body request: PurchaseValidationRequest): HabitResponse<Void>
 
     @POST("user/custom-day-start")
-    fun changeCustomDayStart(@Body updateObject: Map<String, Any>): Flowable<HabitResponse<User>>
+    suspend fun changeCustomDayStart(@Body updateObject: Map<String, Any>): HabitResponse<User>
 
     // Members URL
     @GET("members/{mid}")
-    fun getMember(@Path("mid") memberId: String): Flowable<HabitResponse<Member>>
+    suspend fun getMember(@Path("mid") memberId: String): HabitResponse<Member>
 
     @GET("members/username/{username}")
-    fun getMemberWithUsername(@Path("username") username: String): Flowable<HabitResponse<Member>>
+    suspend fun getMemberWithUsername(@Path("username") username: String): HabitResponse<Member>
 
     @GET("members/{mid}/achievements")
-    fun getMemberAchievements(@Path("mid") memberId: String, @Query("lang") language: String?): Flowable<HabitResponse<List<Achievement>>>
+    suspend fun getMemberAchievements(@Path("mid") memberId: String, @Query("lang") language: String?): HabitResponse<List<Achievement>>
 
     @POST("members/send-private-message")
-    fun postPrivateMessage(@Body messageDetails: Map<String, String>): Flowable<HabitResponse<PostChatMessageResult>>
+    suspend fun postPrivateMessage(@Body messageDetails: Map<String, String>): HabitResponse<PostChatMessageResult>
 
     @GET("members/find/{username}")
-    fun findUsernames(
+    suspend fun findUsernames(
         @Path("username") username: String,
         @Query("context") context: String?,
         @Query("id") id: String?
-    ): Flowable<HabitResponse<List<FindUsernameResult>>>
+    ): HabitResponse<List<FindUsernameResult>>
 
     @POST("members/flag-private-message/{mid}")
-    fun flagInboxMessage(@Path("mid") mid: String, @Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+    suspend fun flagInboxMessage(@Path("mid") mid: String, @Body data: Map<String, String>): HabitResponse<Void>
 
     @GET("shops/{identifier}")
-    fun retrieveShopInventory(@Path("identifier") identifier: String, @Query("lang") language: String?): Flowable<HabitResponse<Shop>>
+    suspend fun retrieveShopInventory(@Path("identifier") identifier: String, @Query("lang") language: String?): HabitResponse<Shop>
 
     @GET("shops/market-gear")
-    fun retrieveMarketGear(@Query("lang") language: String?): Flowable<HabitResponse<Shop>>
+    suspend fun retrieveMarketGear(@Query("lang") language: String?): HabitResponse<Shop>
 
     // Push notifications
     @POST("user/push-devices")
-    fun addPushDevice(@Body pushDeviceData: Map<String, String>): Flowable<HabitResponse<List<Void>>>
+    suspend fun addPushDevice(@Body pushDeviceData: Map<String, String>): HabitResponse<List<Void>>
 
     @DELETE("user/push-devices/{regId}")
-    fun deletePushDevice(@Path("regId") regId: String): Flowable<HabitResponse<List<Void>>>
+    suspend fun deletePushDevice(@Path("regId") regId: String): HabitResponse<List<Void>>
 
     /* challenges api */
 
     @GET("challenges/user")
-    fun getUserChallenges(@Query("page") page: Int?, @Query("member") memberOnly: Boolean): Flowable<HabitResponse<List<Challenge>>>
+    suspend fun getUserChallenges(@Query("page") page: Int?, @Query("member") memberOnly: Boolean): HabitResponse<List<Challenge>>
 
     @GET("challenges/user")
-    fun getUserChallenges(@Query("page") page: Int?): Flowable<HabitResponse<List<Challenge>>>
+    suspend fun getUserChallenges(@Query("page") page: Int?): HabitResponse<List<Challenge>>
 
     @GET("tasks/challenge/{challengeId}")
-    fun getChallengeTasks(@Path("challengeId") challengeId: String): Flowable<HabitResponse<TaskList>>
+    suspend fun getChallengeTasks(@Path("challengeId") challengeId: String): HabitResponse<TaskList>
 
     @GET("challenges/{challengeId}")
-    fun getChallenge(@Path("challengeId") challengeId: String): Flowable<HabitResponse<Challenge>>
+    suspend fun getChallenge(@Path("challengeId") challengeId: String): HabitResponse<Challenge>
 
     @POST("challenges/{challengeId}/join")
-    fun joinChallenge(@Path("challengeId") challengeId: String): Flowable<HabitResponse<Challenge>>
+    suspend fun joinChallenge(@Path("challengeId") challengeId: String): HabitResponse<Challenge>
 
     @POST("challenges/{challengeId}/leave")
-    fun leaveChallenge(@Path("challengeId") challengeId: String, @Body body: LeaveChallengeBody): Flowable<HabitResponse<Void>>
+    suspend fun leaveChallenge(@Path("challengeId") challengeId: String, @Body body: LeaveChallengeBody): HabitResponse<Void>
 
     @POST("challenges")
-    fun createChallenge(@Body challenge: Challenge): Flowable<HabitResponse<Challenge>>
+    suspend fun createChallenge(@Body challenge: Challenge): HabitResponse<Challenge>
 
     @POST("tasks/challenge/{challengeId}")
-    fun createChallengeTasks(@Path("challengeId") challengeId: String, @Body tasks: List<Task>): Flowable<HabitResponse<List<Task>>>
+    suspend fun createChallengeTasks(@Path("challengeId") challengeId: String, @Body tasks: List<Task>): HabitResponse<List<Task>>
 
     @POST("tasks/challenge/{challengeId}")
-    fun createChallengeTask(@Path("challengeId") challengeId: String, @Body task: Task): Flowable<HabitResponse<Task>>
+    suspend fun createChallengeTask(@Path("challengeId") challengeId: String, @Body task: Task): HabitResponse<Task>
 
     @PUT("challenges/{challengeId}")
-    fun updateChallenge(@Path("challengeId") challengeId: String, @Body challenge: Challenge): Flowable<HabitResponse<Challenge>>
+    suspend fun updateChallenge(@Path("challengeId") challengeId: String, @Body challenge: Challenge): HabitResponse<Challenge>
 
     @DELETE("challenges/{challengeId}")
-    fun deleteChallenge(@Path("challengeId") challengeId: String): Flowable<HabitResponse<Void>>
+    suspend fun deleteChallenge(@Path("challengeId") challengeId: String): HabitResponse<Void>
 
     // DEBUG: These calls only work on a local development server
 
     @POST("debug/add-ten-gems")
-    fun debugAddTenGems(): Flowable<HabitResponse<Void>>
+    suspend fun debugAddTenGems(): HabitResponse<Void>
 
     // Notifications
     @POST("notifications/{notificationId}/read")
-    fun readNotification(@Path("notificationId") notificationId: String): Flowable<HabitResponse<List<Any>>>
+    suspend fun readNotification(@Path("notificationId") notificationId: String): HabitResponse<List<Any>>
 
     @POST("notifications/read")
-    fun readNotifications(@Body notificationIds: Map<String, List<String>>): Flowable<HabitResponse<List<Any>>>
+    suspend fun readNotifications(@Body notificationIds: Map<String, List<String>>): HabitResponse<List<Any>>
 
     @POST("notifications/see")
-    fun seeNotifications(@Body notificationIds: Map<String, List<String>>): Flowable<HabitResponse<List<Any>>>
+    suspend fun seeNotifications(@Body notificationIds: Map<String, List<String>>): HabitResponse<List<Any>>
 
     @POST("user/open-mystery-item")
-    fun openMysteryItem(): Flowable<HabitResponse<Equipment>>
+    suspend fun openMysteryItem(): HabitResponse<Equipment>
 
     @POST("cron")
-    fun runCron(): Flowable<HabitResponse<Void>>
+    suspend fun runCron(): HabitResponse<Void>
 
     @POST("user/reset")
-    fun resetAccount(): Flowable<HabitResponse<Void>>
+    suspend fun resetAccount(): HabitResponse<Void>
 
     @HTTP(method = "DELETE", path = "user", hasBody = true)
-    fun deleteAccount(@Body body: Map<String, String>): Flowable<HabitResponse<Void>>
+    suspend fun deleteAccount(@Body body: Map<String, String>): HabitResponse<Void>
 
     @GET("user/toggle-pinned-item/{pinType}/{path}")
-    fun togglePinnedItem(@Path("pinType") pinType: String, @Path("path") path: String): Flowable<HabitResponse<Void>>
+    suspend fun togglePinnedItem(@Path("pinType") pinType: String, @Path("path") path: String): HabitResponse<Void>
 
     @POST("user/reset-password")
-    fun sendPasswordResetEmail(@Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+    suspend fun sendPasswordResetEmail(@Body data: Map<String, String>): HabitResponse<Void>
 
     @PUT("user/auth/update-username")
-    fun updateLoginName(@Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+    suspend fun updateLoginName(@Body data: Map<String, String>): HabitResponse<Void>
 
     @POST("user/auth/verify-username")
-    fun verifyUsername(@Body data: Map<String, String>): Flowable<HabitResponse<VerifyUsernameResponse>>
+    suspend fun verifyUsername(@Body data: Map<String, String>): HabitResponse<VerifyUsernameResponse>
 
     @PUT("user/auth/update-email")
-    fun updateEmail(@Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+    suspend fun updateEmail(@Body data: Map<String, String>): HabitResponse<Void>
 
     @PUT("user/auth/update-password")
-    fun updatePassword(@Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+    suspend fun updatePassword(@Body data: Map<String, String>): HabitResponse<Void>
 
     @POST("user/allocate")
-    fun allocatePoint(@Query("stat") stat: String): Flowable<HabitResponse<Stats>>
+    suspend fun allocatePoint(@Query("stat") stat: String): HabitResponse<Stats>
 
     @POST("user/allocate-bulk")
-    fun bulkAllocatePoints(@Body stats: Map<String, Map<String, Int>>): Flowable<HabitResponse<Stats>>
+    suspend fun bulkAllocatePoints(@Body stats: Map<String, Map<String, Int>>): HabitResponse<Stats>
 
     @POST("members/transfer-gems")
-    fun transferGems(@Body data: Map<String, Any>): Flowable<HabitResponse<Void>>
+    suspend fun transferGems(@Body data: Map<String, Any>): HabitResponse<Void>
 
     @POST("tasks/unlink-all/{challengeID}")
-    fun unlinkAllTasks(@Path("challengeID") challengeID: String?, @Query("keep") keepOption: String): Flowable<HabitResponse<Void>>
+    suspend fun unlinkAllTasks(@Path("challengeID") challengeID: String?, @Query("keep") keepOption: String): HabitResponse<Void>
 
     @POST("user/block/{userID}")
-    fun blockMember(@Path("userID") userID: String): Flowable<HabitResponse<List<String>>>
+    suspend fun blockMember(@Path("userID") userID: String): HabitResponse<List<String>>
 
     @POST("user/reroll")
-    fun reroll(): Flowable<HabitResponse<User>>
+    suspend fun reroll(): HabitResponse<User>
 
     // Team Plans
 
     @GET("group-plans")
-    fun getTeamPlans(): Flowable<HabitResponse<List<TeamPlan>>>
+    suspend fun getTeamPlans(): HabitResponse<List<TeamPlan>>
 
     @GET("tasks/group/{groupID}")
-    fun getTeamPlanTasks(@Path("groupID") groupId: String): Flowable<HabitResponse<TaskList>>
+    suspend fun getTeamPlanTasks(@Path("groupID") groupId: String): HabitResponse<TaskList>
+
+    @POST("tasks/{taskID}/assign")
+    suspend fun assignToTask(@Path("taskID") taskId: String?, @Body ids: List<String>): HabitResponse<Task>
+
+    @POST("tasks/{taskID}/unassign/{userID}")
+    suspend fun unassignFromTask(@Path("taskID") taskID: String, @Path("userID") userID: String): HabitResponse<Task>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
index 553d68f81..860c8de38 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
@@ -6,6 +6,8 @@ import com.google.gson.reflect.TypeToken;
 import com.habitrpg.android.habitica.models.Achievement;
 import com.habitrpg.android.habitica.models.ContentResult;
 import com.habitrpg.android.habitica.models.FAQArticle;
+import com.habitrpg.android.habitica.models.tasks.GroupAssignedDetails;
+import com.habitrpg.android.habitica.utils.AssignedDetailsDeserializer;
 import com.habitrpg.common.habitica.models.Notification;
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.Tag;
@@ -101,6 +103,8 @@ public class GSonFactoryCreator {
         }.getType();
         Type achievementsListType = new TypeToken<List<Achievement>>() {
         }.getType();
+        Type assignedDetailsListType = new TypeToken<RealmList<GroupAssignedDetails>>() {
+        }.getType();
 
         return new GsonBuilder()
                 .registerTypeAdapter(taskTagClassListType, new TaskTagDeserializer())
@@ -129,6 +133,7 @@ public class GSonFactoryCreator {
                 .registerTypeAdapter(ownedPetListType, new OwnedPetListDeserializer())
                 .registerTypeAdapter(ownedMountListType, new OwnedMountListDeserializer())
                 .registerTypeAdapter(achievementsListType, new AchievementListDeserializer())
+                .registerTypeAdapter(assignedDetailsListType, new AssignedDetailsDeserializer())
                 .registerTypeAdapter(Quest.class, new QuestDeserializer())
                 .registerTypeAdapter(Member.class, new MemberSerialization())
                 .registerTypeAdapter(WorldState.class, new WorldStateSerialization())
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
deleted file mode 100644
index d90a4cbfe..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.habitrpg.android.habitica.api;
-
-import com.habitrpg.shared.habitica.models.responses.MaintenanceResponse;
-
-import io.reactivex.rxjava3.core.Flowable;
-import retrofit2.http.GET;
-
-public interface MaintenanceApiService {
-
-    @GET("maintenance-android.json")
-    Flowable<MaintenanceResponse> getMaintenanceStatus();
-
-    @GET("deprecation-android.json")
-    Flowable<MaintenanceResponse> getDepricationStatus();
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.kt
new file mode 100644
index 000000000..25e6e5208
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.kt
@@ -0,0 +1,12 @@
+package com.habitrpg.android.habitica.api
+
+import com.habitrpg.shared.habitica.models.responses.MaintenanceResponse
+import retrofit2.http.GET
+
+interface MaintenanceApiService {
+    @GET("maintenance-android.json")
+    suspend fun getMaintenanceStatus(): MaintenanceResponse?
+
+    @GET("deprecation-android.json")
+    suspend fun getDepricationStatus(): MaintenanceResponse?
+}
\ No newline at end of file
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 1af774a36..a29532588 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
@@ -38,7 +38,8 @@ import com.habitrpg.android.habitica.ui.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
-import com.habitrpg.android.habitica.ui.activities.VerifyUsernameActivity;
+import com.habitrpg.android.habitica.ui.activities.TaskSummaryActivity;
+import com.habitrpg.android.habitica.ui.activities.TaskSummaryViewModel;
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
 import com.habitrpg.android.habitica.ui.adapter.tasks.HabitsRecyclerViewAdapter;
@@ -52,10 +53,8 @@ import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment;
 import com.habitrpg.android.habitica.ui.fragments.PromoWebFragment;
 import com.habitrpg.android.habitica.ui.fragments.StatsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarEquipmentFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemDialogFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment;
@@ -108,6 +107,7 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainActivityViewModel;
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel;
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel;
 import com.habitrpg.android.habitica.ui.viewmodels.StableViewModel;
+import com.habitrpg.android.habitica.ui.viewmodels.TaskFormViewModel;
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel;
 import com.habitrpg.android.habitica.ui.viewmodels.inventory.equipment.EquipmentOverviewViewModel;
 import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog;
@@ -165,8 +165,6 @@ public interface UserComponent {
 
     void inject(EquipmentDetailFragment equipmentDetailFragment);
 
-    void inject(EquipmentOverviewFragment equipmentOverviewFragment);
-
     void inject(ItemRecyclerFragment itemRecyclerFragment);
 
     void inject(ItemsFragment itemsFragment);
@@ -295,8 +293,6 @@ public interface UserComponent {
 
     void inject(ChallengeDetailFragment challengeDetailFragment);
 
-    void inject(VerifyUsernameActivity verifyUsernameActivity);
-
     void inject(GroupViewModel viewModel);
 
     void inject(NotificationsViewModel viewModel);
@@ -333,8 +329,6 @@ public interface UserComponent {
 
     void inject(BugFixFragment bugFixFragment);
 
-    void inject(AvatarEquipmentFragment avatarEquipmentFragment);
-
     void inject(FAQDetailFragment faqDetailFragment);
 
     void inject(AdventureGuideActivity adventureGuideFragment);
@@ -370,4 +364,10 @@ public interface UserComponent {
     void inject(@NotNull DeathActivity deathActivity);
 
     void inject(@NotNull DeviceCommunicationService deviceCommunicationService);
+
+    void inject(@NotNull TaskSummaryActivity taskSummaryActivity);
+
+    void inject(@NotNull TaskSummaryViewModel taskSummaryViewModel);
+
+    void inject(@NotNull TaskFormViewModel taskFormViewModel);
 }
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 e972141e9..edb733c88 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
@@ -32,210 +32,199 @@ import com.habitrpg.common.habitica.models.PurchaseValidationResult
 import com.habitrpg.common.habitica.models.auth.UserAuthResponse
 import com.habitrpg.shared.habitica.models.responses.ErrorResponse
 import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.shared.habitica.models.responses.Status
 import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
 import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.FlowableTransformer
 import retrofit2.HttpException
 
 interface ApiClient {
 
     val hostConfig: HostConfig
 
-    val status: Flowable<Status>
-
-    val content: Flowable<ContentResult>
+    suspend fun getStatus(): Status?
 
     /* user API */
 
-    val user: Flowable<User>
-
-    val tasks: Flowable<TaskList>
+    suspend fun getTasks(): TaskList?
 
     /* challenges api */
 
-    fun getUserChallenges(page: Int, memberOnly: Boolean): Flowable<List<Challenge>>
+    suspend fun getUserChallenges(page: Int, memberOnly: Boolean): List<Challenge>?
 
-    val worldState: Flowable<WorldState>
-    fun setLanguageCode(languageCode: String)
-    fun getContent(language: String): Flowable<ContentResult>
+    suspend fun getWorldState(): WorldState?
+    var languageCode: String?
+    suspend fun getContent(language: String? = null): ContentResult?
 
-    fun updateUser(updateDictionary: Map<String, Any>): Flowable<User>
+    suspend fun updateUser(updateDictionary: Map<String, Any>): User?
 
-    fun registrationLanguage(registrationLanguage: String): Flowable<User>
+    suspend fun registrationLanguage(registrationLanguage: String): User?
 
-    fun retrieveInAppRewards(): Flowable<List<ShopItem>>
-    fun retrieveOldGear(): Flowable<List<ShopItem>>
+    suspend fun retrieveInAppRewards(): List<ShopItem>?
 
-    fun equipItem(type: String, itemKey: String): Flowable<Items>
+    suspend fun equipItem(type: String, itemKey: String): Items?
 
-    fun buyItem(itemKey: String, purchaseQuantity: Int): Flowable<BuyResponse>
+    suspend fun buyItem(itemKey: String, purchaseQuantity: Int): BuyResponse?
 
-    fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Void>
+    suspend fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Void?
 
-    fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Void>
+    suspend fun purchaseHourglassItem(type: String, itemKey: String): Void?
 
-    fun purchaseMysterySet(itemKey: String): Flowable<Void>
+    suspend fun purchaseMysterySet(itemKey: String): Void?
 
-    fun purchaseQuest(key: String): Flowable<Void>
-    fun purchaseSpecialSpell(key: String): Flowable<Void>
-    fun validateSubscription(request: PurchaseValidationRequest): Flowable<Any>
-    fun validateNoRenewSubscription(request: PurchaseValidationRequest): Flowable<Any>
-    fun cancelSubscription(): Flowable<Void>
+    suspend fun purchaseQuest(key: String): Void?
+    suspend fun purchaseSpecialSpell(key: String): Void?
+    suspend fun validateSubscription(request: PurchaseValidationRequest): Any?
+    suspend fun validateNoRenewSubscription(request: PurchaseValidationRequest): Any?
+    suspend fun cancelSubscription(): Void?
 
-    fun sellItem(itemType: String, itemKey: String): Flowable<User>
+    suspend fun sellItem(itemType: String, itemKey: String): User?
 
-    fun feedPet(petKey: String, foodKey: String): Flowable<FeedResponse>
+    suspend fun feedPet(petKey: String, foodKey: String): FeedResponse?
 
-    fun hatchPet(eggKey: String, hatchingPotionKey: String): Flowable<Items>
-    fun getTasks(type: String): Flowable<TaskList>
-    fun getTasks(type: String, dueDate: String): Flowable<TaskList>
+    suspend fun hatchPet(eggKey: String, hatchingPotionKey: String): Items?
+    suspend fun getTasks(type: String): TaskList?
+    suspend fun getTasks(type: String, dueDate: String): TaskList?
 
-    fun unlockPath(path: String): Flowable<UnlockResponse>
+    suspend fun unlockPath(path: String): UnlockResponse?
 
-    fun getTask(id: String): Flowable<Task>
+    suspend fun getTask(id: String): Task?
 
-    fun postTaskDirection(id: String, direction: String): Flowable<TaskDirectionData>
-    fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData>
+    suspend fun postTaskDirection(id: String, direction: String): TaskDirectionData?
+    suspend fun bulkScoreTasks(data: List<Map<String, String>>): BulkTaskScoringData?
 
-    fun postTaskNewPosition(id: String, position: Int): Flowable<List<String>>
+    suspend fun postTaskNewPosition(id: String, position: Int): List<String>?
 
-    fun scoreChecklistItem(taskId: String, itemId: String): Flowable<Task>
+    suspend fun scoreChecklistItem(taskId: String, itemId: String): Task?
 
-    fun createTask(item: Task): Flowable<Task>
+    suspend fun createTask(item: Task): Task?
 
-    fun createTasks(tasks: List<Task>): Flowable<List<Task>>
+    suspend fun createTasks(tasks: List<Task>): List<Task>?
 
-    fun updateTask(id: String, item: Task): Flowable<Task>
+    suspend fun updateTask(id: String, item: Task): Task?
 
-    fun deleteTask(id: String): Flowable<Void>
+    suspend fun deleteTask(id: String): Void?
 
-    fun createTag(tag: Tag): Flowable<Tag>
+    suspend fun createTag(tag: Tag): Tag?
 
-    fun updateTag(id: String, tag: Tag): Flowable<Tag>
+    suspend fun updateTag(id: String, tag: Tag): Tag?
 
-    fun deleteTag(id: String): Flowable<Void>
+    suspend fun deleteTag(id: String): Void?
 
-    fun registerUser(username: String, email: String, password: String, confirmPassword: String): Flowable<UserAuthResponse>
+    suspend fun registerUser(username: String, email: String, password: String, confirmPassword: String): UserAuthResponse?
 
-    fun connectUser(username: String, password: String): Flowable<UserAuthResponse>
+    suspend fun connectUser(username: String, password: String): UserAuthResponse?
 
-    fun connectSocial(network: String, userId: String, accessToken: String): Flowable<UserAuthResponse>
-    fun disconnectSocial(network: String): Flowable<Void>
+    suspend fun connectSocial(network: String, userId: String, accessToken: String): UserAuthResponse?
+    suspend fun disconnectSocial(network: String): Void?
 
-    fun loginApple(authToken: String): Flowable<UserAuthResponse>
+    suspend fun loginApple(authToken: String): UserAuthResponse?
 
-    fun sleep(): Flowable<Boolean>
+    suspend fun sleep(): Boolean?
+    suspend fun revive(): User?
 
-    fun revive(): Flowable<User>
+    suspend fun useSkill(skillName: String, targetType: String, targetId: String): SkillResponse?
 
-    fun useSkill(skillName: String, targetType: String, targetId: String): Flowable<SkillResponse>
+    suspend fun useSkill(skillName: String, targetType: String): SkillResponse?
 
-    fun useSkill(skillName: String, targetType: String): Flowable<SkillResponse>
+    suspend fun changeClass(className: String?): User?
 
-    fun changeClass(): Flowable<User>
+    suspend fun disableClasses(): User?
 
-    fun changeClass(className: String): Flowable<User>
-
-    fun disableClasses(): Flowable<User>
-
-    fun markPrivateMessagesRead(): Flowable<Void>
+    suspend fun markPrivateMessagesRead(): Void?
 
     /* Group API */
 
-    fun listGroups(type: String): Flowable<List<Group>>
+    suspend fun listGroups(type: String): List<Group>?
 
-    fun getGroup(groupId: String): Flowable<Group>
+    suspend fun getGroup(groupId: String): Group?
 
-    fun createGroup(group: Group): Flowable<Group>
-    fun updateGroup(id: String, item: Group): Flowable<Group>
-    fun removeMemberFromGroup(groupID: String, userID: String): Flowable<Void>
+    suspend fun createGroup(group: Group): Group?
+    suspend fun updateGroup(id: String, item: Group): Group?
+    suspend fun removeMemberFromGroup(groupID: String, userID: String): Void?
 
-    fun listGroupChat(groupId: String): Flowable<List<ChatMessage>>
+    suspend fun listGroupChat(groupId: String): List<ChatMessage>?
 
-    fun joinGroup(groupId: String): Flowable<Group>
+    suspend fun joinGroup(groupId: String): Group?
 
-    fun leaveGroup(groupId: String, keepChallenges: String): Flowable<Void>
+    suspend fun leaveGroup(groupId: String, keepChallenges: String): Void?
 
-    fun postGroupChat(groupId: String, message: Map<String, String>): Flowable<PostChatMessageResult>
+    suspend fun postGroupChat(groupId: String, message: Map<String, String>): PostChatMessageResult?
 
-    fun deleteMessage(groupId: String, messageId: String): Flowable<Void>
-    fun deleteInboxMessage(id: String): Flowable<Void>
+    suspend fun deleteMessage(groupId: String, messageId: String): Void?
+    suspend fun deleteInboxMessage(id: String): Void?
 
-    fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?): Flowable<List<Member>>
+    suspend fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?): List<Member>?
 
-    fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?, lastId: String): Flowable<List<Member>>
+    suspend fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?, lastId: String): List<Member>?
 
     // Like returns the full chat list
-    fun likeMessage(groupId: String, mid: String): Flowable<ChatMessage>
+    suspend fun likeMessage(groupId: String, mid: String): ChatMessage?
 
-    fun flagMessage(groupId: String, mid: String, data: MutableMap<String, String>): Flowable<Void>
-    fun flagInboxMessage(mid: String, data: MutableMap<String, String>): Flowable<Void>
+    suspend fun flagMessage(groupId: String, mid: String, data: MutableMap<String, String>): Void?
+    suspend fun flagInboxMessage(mid: String, data: MutableMap<String, String>): Void?
 
-    fun seenMessages(groupId: String): Flowable<Void>
+    suspend fun seenMessages(groupId: String): Void?
 
-    fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<List<Void>>
+    suspend fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): List<Void>?
 
-    fun rejectGroupInvite(groupId: String): Flowable<Void>
+    suspend fun rejectGroupInvite(groupId: String): Void?
 
-    fun acceptQuest(groupId: String): Flowable<Void>
+    suspend fun acceptQuest(groupId: String): Void?
 
-    fun rejectQuest(groupId: String): Flowable<Void>
+    suspend fun rejectQuest(groupId: String): Void?
 
-    fun cancelQuest(groupId: String): Flowable<Void>
+    suspend fun cancelQuest(groupId: String): Void?
 
-    fun forceStartQuest(groupId: String, group: Group): Flowable<Quest>
+    suspend fun forceStartQuest(groupId: String, group: Group): Quest?
 
-    fun inviteToQuest(groupId: String, questKey: String): Flowable<Quest>
+    suspend fun inviteToQuest(groupId: String, questKey: String): Quest?
 
-    fun abortQuest(groupId: String): Flowable<Quest>
+    suspend fun abortQuest(groupId: String): Quest?
 
-    fun leaveQuest(groupId: String): Flowable<Void>
+    suspend fun leaveQuest(groupId: String): Void?
 
-    fun validatePurchase(request: PurchaseValidationRequest): Flowable<PurchaseValidationResult>
+    suspend fun validatePurchase(request: PurchaseValidationRequest): PurchaseValidationResult?
 
-    fun changeCustomDayStart(updateObject: Map<String, Any>): Flowable<User>
+    suspend fun changeCustomDayStart(updateObject: Map<String, Any>): User?
 
     // Members URL
-    fun getMember(memberId: String): Flowable<Member>
-    fun getMemberWithUsername(username: String): Flowable<Member>
+    suspend fun getMember(memberId: String): Member?
+    suspend fun getMemberWithUsername(username: String): Member?
 
-    fun getMemberAchievements(memberId: String): Flowable<List<Achievement>>
+    suspend fun getMemberAchievements(memberId: String): List<Achievement>?
 
-    fun postPrivateMessage(messageDetails: Map<String, String>): Flowable<PostChatMessageResult>
+    suspend fun postPrivateMessage(messageDetails: Map<String, String>): PostChatMessageResult?
 
-    fun retrieveShopIventory(identifier: String): Flowable<Shop>
+    suspend fun retrieveShopIventory(identifier: String): Shop?
 
     // Push notifications
-    fun addPushDevice(pushDeviceData: Map<String, String>): Flowable<List<Void>>
+    suspend fun addPushDevice(pushDeviceData: Map<String, String>): List<Void>?
 
-    fun deletePushDevice(regId: String): Flowable<List<Void>>
+    suspend fun deletePushDevice(regId: String): List<Void>?
 
-    fun getChallengeTasks(challengeId: String): Flowable<TaskList>
+    suspend fun getChallengeTasks(challengeId: String): TaskList?
 
-    fun getChallenge(challengeId: String): Flowable<Challenge>
+    suspend fun getChallenge(challengeId: String): Challenge?
 
-    fun joinChallenge(challengeId: String): Flowable<Challenge>
+    suspend fun joinChallenge(challengeId: String): Challenge?
 
-    fun leaveChallenge(challengeId: String, body: LeaveChallengeBody): Flowable<Void>
+    suspend fun leaveChallenge(challengeId: String, body: LeaveChallengeBody): Void?
 
-    fun createChallenge(challenge: Challenge): Flowable<Challenge>
+    suspend fun createChallenge(challenge: Challenge): Challenge?
 
-    fun createChallengeTasks(challengeId: String, tasks: List<Task>): Flowable<List<Task>>
-    fun createChallengeTask(challengeId: String, task: Task): Flowable<Task>
-    fun updateChallenge(challenge: Challenge): Flowable<Challenge>
-    fun deleteChallenge(challengeId: String): Flowable<Void>
+    suspend fun createChallengeTasks(challengeId: String, tasks: List<Task>): List<Task>?
+    suspend fun createChallengeTask(challengeId: String, task: Task): Task?
+    suspend fun updateChallenge(challenge: Challenge): Challenge?
+    suspend fun deleteChallenge(challengeId: String): Void?
 
     // DEBUG: These calls only work on a local development server
 
-    fun debugAddTenGems(): Flowable<Void>
+    suspend fun debugAddTenGems(): Void?
 
     // Notifications
-    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>>
+    suspend fun readNotification(notificationId: String): List<Any>?
+    suspend fun readNotifications(notificationIds: Map<String, List<String>>): List<Any>?
+    suspend fun seeNotifications(notificationIds: Map<String, List<String>>): List<Any>?
 
     fun getErrorResponse(throwable: HttpException): ErrorResponse
 
@@ -243,44 +232,44 @@ interface ApiClient {
 
     fun hasAuthenticationKeys(): Boolean
 
-    fun retrieveUser(withTasks: Boolean): Flowable<User>
-    fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>>
-    fun retrieveInboxConversations(): Flowable<List<InboxConversation>>
+    suspend fun retrieveUser(withTasks: Boolean = false): User?
+    suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>?
+    suspend fun retrieveInboxConversations(): List<InboxConversation>?
 
-    fun <T : Any> configureApiCallObserver(): FlowableTransformer<HabitResponse<T>, T>
+    suspend fun openMysteryItem(): Equipment?
 
-    fun openMysteryItem(): Flowable<Equipment>
+    suspend fun runCron(): Void?
 
-    fun runCron(): Flowable<Void>
+    suspend fun reroll(): User?
 
-    fun reroll(): Flowable<User>
+    suspend fun resetAccount(): Void?
+    suspend fun deleteAccount(password: String): Void?
 
-    fun resetAccount(): Flowable<Void>
-    fun deleteAccount(password: String): Flowable<Void>
+    suspend fun togglePinnedItem(pinType: String, path: String): Void?
 
-    fun togglePinnedItem(pinType: String, path: String): Flowable<Void>
+    suspend fun sendPasswordResetEmail(email: String): Void?
 
-    fun sendPasswordResetEmail(email: String): Flowable<Void>
+    suspend fun updateLoginName(newLoginName: String, password: String): Void?
+    suspend fun updateUsername(newLoginName: String): Void?
 
-    fun updateLoginName(newLoginName: String, password: String): Flowable<Void>
-    fun updateUsername(newLoginName: String): Flowable<Void>
+    suspend fun updateEmail(newEmail: String, password: String): Void?
 
-    fun updateEmail(newEmail: String, password: String): Flowable<Void>
+    suspend fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Void?
 
-    fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Flowable<Void>
+    suspend fun allocatePoint(stat: String): Stats?
 
-    fun allocatePoint(stat: String): Flowable<Stats>
+    suspend fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Stats?
 
-    fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable<Stats>
-
-    fun retrieveMarketGear(): Flowable<Shop>
-    fun verifyUsername(username: String): Flowable<VerifyUsernameResponse>
+    suspend fun retrieveMarketGear(): Shop?
+    suspend fun verifyUsername(username: String): VerifyUsernameResponse?
     fun updateServerUrl(newAddress: String?)
-    fun findUsernames(username: String, context: String?, id: String?): Flowable<List<FindUsernameResult>>
+    suspend fun findUsernames(username: String, context: String?, id: String?): List<FindUsernameResult>?
 
-    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>
+    suspend fun transferGems(giftedID: String, amount: Int): Void?
+    suspend fun unlinkAllTasks(challengeID: String?, keepOption: String): Void?
+    suspend fun blockMember(userID: String): List<String>?
+    suspend fun getTeamPlans(): List<TeamPlan>?
+    suspend fun getTeamPlanTasks(teamID: String): TaskList?
+    suspend fun assignToTask(taskId: String, ids: List<String>): Task?
+    suspend fun unassignFromTask(taskId: String, userID: String): Task?
 }
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 6f5758b2e..626216fb5 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,18 +4,18 @@ 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.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface ChallengeRepository : BaseRepository {
 
-    fun retrieveChallenges(page: Int = 0, memberOnly: Boolean): Flowable<List<Challenge>>
-    fun getChallenges(): Flowable<out List<Challenge>>
-    fun getChallenge(challengeId: String): Flowable<Challenge>
-    fun getChallengeTasks(challengeId: String): Flowable<out List<Task>>
+    suspend fun retrieveChallenges(page: Int = 0, memberOnly: Boolean): List<Challenge>?
+    fun getChallenges(): Flow<List<Challenge>>
+    fun getChallenge(challengeId: String): Flow<Challenge>
+    fun getChallengeTasks(challengeId: String): Flow<List<Task>>
 
-    fun retrieveChallenge(challengeID: String): Flowable<Challenge>
-    fun retrieveChallengeTasks(challengeID: String): Flowable<TaskList>
-    fun createChallenge(challenge: Challenge, taskList: List<Task>): Flowable<Challenge>
+    suspend fun retrieveChallenge(challengeID: String): Challenge?
+    suspend fun retrieveChallengeTasks(challengeID: String): TaskList?
+    suspend fun createChallenge(challenge: Challenge, taskList: List<Task>): Challenge?
 
     /**
      *
@@ -26,22 +26,22 @@ interface ChallengeRepository : BaseRepository {
      * @param removedTaskList tasks that has be to be removed
      * @return Observable with the updated challenge
      */
-    fun updateChallenge(
+    suspend fun updateChallenge(
         challenge: Challenge,
         fullTaskList: List<Task>,
         addedTaskList: List<Task>,
         updatedTaskList: List<Task>,
         removedTaskList: List<String>
-    ): Flowable<Challenge>
+    ): Challenge?
 
-    fun deleteChallenge(challengeId: String): Flowable<Void>
-    fun getUserChallenges(userId: String? = null): Flowable<out List<Challenge>>
+    suspend fun deleteChallenge(challengeId: String): Void?
+    fun getUserChallenges(userId: String? = null): Flow<List<Challenge>>
 
-    fun leaveChallenge(challenge: Challenge, keepTasks: String): Flowable<Void>
+    suspend fun leaveChallenge(challenge: Challenge, keepTasks: String): Void?
 
-    fun joinChallenge(challenge: Challenge): Flowable<Challenge>
+    suspend fun joinChallenge(challenge: Challenge): Challenge?
 
-    fun getChallengepMembership(id: String): Flowable<ChallengeMembership>
-    fun getChallengeMemberships(): Flowable<out List<ChallengeMembership>>
-    fun isChallengeMember(challengeID: String): Flowable<Boolean>
+    fun getChallengepMembership(id: String): Flow<ChallengeMembership>
+    fun getChallengeMemberships(): Flow<List<ChallengeMembership>>
+    fun isChallengeMember(challengeID: String): Flow<Boolean>
 }
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 ff0f53e2d..141c5cacc 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
@@ -2,11 +2,11 @@ package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
-interface ContentRepository : BaseRepository {
-    fun retrieveContent(forced: Boolean = false): Flowable<ContentResult>
+interface ContentRepository: BaseRepository {
+    suspend fun retrieveContent(forced: Boolean = false): ContentResult?
 
-    fun retrieveWorldState(): Flowable<WorldState>
-    fun getWorldState(): Flowable<WorldState>
+    suspend fun retrieveWorldState(): WorldState?
+    fun getWorldState(): Flow<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 f65af96df..8c657e98a 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
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.inventory.Customization
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface CustomizationRepository : BaseRepository {
-    fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flowable<out List<Customization>>
+    fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flow<List<Customization>>
 }
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 9ead63c61..d4b61d443 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
@@ -1,9 +1,9 @@
 package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.FAQArticle
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface FAQRepository : BaseRepository {
-    fun getArticles(): Flowable<out List<FAQArticle>>
-    fun getArticle(position: Int): Flowable<FAQArticle>
+    fun getArticles(): Flow<List<FAQArticle>>
+    fun getArticle(position: Int): Flow<FAQArticle>
 }
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 da3677bcd..16263bfb4 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
@@ -18,15 +18,14 @@ 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 com.habitrpg.shared.habitica.models.responses.FeedResponse
-import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.flow.Flow
 
 interface InventoryRepository : BaseRepository {
 
     fun getArmoireRemainingCount(): Long
 
-    fun getInAppRewards(): Flowable<out List<ShopItem>>
-    fun getOwnedEquipment(): Flowable<out List<Equipment>>
+    fun getInAppRewards(): Flow<List<ShopItem>>
+    fun getOwnedEquipment(): Flow<List<Equipment>>
 
     fun getMounts(): Flow<List<Mount>>
 
@@ -35,21 +34,21 @@ interface InventoryRepository : BaseRepository {
     fun getPets(): Flow<List<Pet>>
 
     fun getOwnedPets(): Flow<List<OwnedPet>>
-    fun getQuestContent(key: String): Flowable<QuestContent>
+    fun getQuestContent(key: String): Flow<QuestContent?>
     fun getQuestContent(keys: List<String>): Flow<List<QuestContent>>
 
-    fun getEquipment(searchedKeys: List<String>): Flowable<out List<Equipment>>
-    fun retrieveInAppRewards(): Flowable<List<ShopItem>>
+    fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>>
+    suspend fun retrieveInAppRewards(): List<ShopItem>?
 
-    fun getOwnedEquipment(type: String): Flowable<out List<Equipment>>
-    fun getEquipmentType(type: String, set: String): Flowable<out List<Equipment>>
+    fun getOwnedEquipment(type: String): Flow<List<Equipment>>
+    fun getEquipmentType(type: String, set: String): Flow<List<Equipment>>
 
     fun getOwnedItems(itemType: String, includeZero: Boolean = false): Flow<List<OwnedItem>>
-    fun getOwnedItems(includeZero: Boolean = false): Flowable<Map<String, OwnedItem>>
+    fun getOwnedItems(includeZero: Boolean = false): Flow<Map<String, OwnedItem>>
 
-    fun getEquipment(key: String): Flowable<Equipment>
+    fun getEquipment(key: String): Flow<Equipment>
 
-    fun openMysteryItem(user: User?): Flowable<Equipment>
+    suspend fun openMysteryItem(user: User?): Equipment?
 
     fun saveEquipment(equipment: Equipment)
     fun getMounts(type: String?, group: String?, color: String?): Flow<List<Mount>>
@@ -57,39 +56,38 @@ interface InventoryRepository : BaseRepository {
 
     fun updateOwnedEquipment(user: User)
 
-    fun changeOwnedCount(type: String, key: String, amountToAdd: Int)
+    suspend fun changeOwnedCount(type: String, key: String, amountToAdd: Int)
 
-    fun sellItem(type: String, key: String): Flowable<User>
-    fun sellItem(item: OwnedItem): Flowable<User>
+    suspend fun sellItem(type: String, key: String): User?
+    suspend fun sellItem(item: OwnedItem): User?
 
-    fun equipGear(equipment: String, asCostume: Boolean): Flowable<Items>
-    fun equip(type: String, key: String): Flowable<Items>
+    suspend fun equipGear(equipment: String, asCostume: Boolean): Items?
+    suspend fun equip(type: String, key: String): Items?
 
-    fun feedPet(pet: Pet, food: Food): Flowable<FeedResponse>
+    suspend fun feedPet(pet: Pet, food: Food): FeedResponse?
 
-    fun hatchPet(egg: Egg, hatchingPotion: HatchingPotion, successFunction: () -> Unit): Flowable<Items>
+    suspend fun hatchPet(egg: Egg, hatchingPotion: HatchingPotion, successFunction: () -> Unit): Items?
 
-    fun inviteToQuest(quest: QuestContent): Flowable<Quest>
+    suspend fun inviteToQuest(quest: QuestContent): Quest?
 
-    fun buyItem(user: User?, id: String, value: Double, purchaseQuantity: Int): Flowable<BuyResponse>
+    suspend fun buyItem(user: User?, id: String, value: Double, purchaseQuantity: Int): BuyResponse?
 
-    fun retrieveShopInventory(identifier: String): Flowable<Shop>
-    fun retrieveMarketGear(): Flowable<Shop>
+    suspend fun retrieveShopInventory(identifier: String): Shop?
+    suspend fun retrieveMarketGear(): Shop?
 
-    fun purchaseMysterySet(categoryIdentifier: String): Flowable<Void>
+    suspend fun purchaseMysterySet(categoryIdentifier: String): Void?
 
-    fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Void>
+    suspend fun purchaseHourglassItem(purchaseType: String, key: String): Void?
 
-    fun purchaseQuest(key: String): Flowable<Void>
-    fun purchaseSpecialSpell(key: String): Flowable<Void>
+    suspend fun purchaseQuest(key: String): Void?
+    suspend fun purchaseSpecialSpell(key: String): Void?
 
-    fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Void>
+    suspend fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Void?
 
-    fun togglePinnedItem(item: ShopItem): Flowable<List<ShopItem>>
-    fun getItemsFlowable(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>>
-    fun getItemsFlowable(itemClass: Class<out Item>): Flowable<out List<Item>>
+    suspend fun togglePinnedItem(item: ShopItem): List<ShopItem>?
+    fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>>
     fun getItems(itemClass: Class<out Item>): Flow<List<Item>>
-    fun getLatestMysteryItem(): Flowable<Equipment>
-    fun getItem(type: String, key: String): Flowable<Item>
-    fun getAvailableLimitedItems(): Flowable<List<Item>>
+    fun getLatestMysteryItem(): Flow<Equipment>
+    fun getItem(type: String, key: String): Flow<Item>
+    fun getAvailableLimitedItems(): Flow<List<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 4d0732594..5ccb1674d 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
@@ -10,114 +10,113 @@ 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.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Single
+import io.realm.RealmResults
 import kotlinx.coroutines.flow.Flow
 
 interface SocialRepository : BaseRepository {
-    fun getPublicGuilds(): Flowable<out List<Group>>
+    fun getPublicGuilds(): Flow<List<Group>>
 
-    fun getUserGroups(type: String?): Flowable<out List<Group>>
-    fun retrieveGroupChat(groupId: String): Single<List<ChatMessage>>
-    fun getGroupChat(groupId: String): Flowable<out List<ChatMessage>>
+    fun getUserGroups(type: String?): Flow<List<Group>>
+    suspend fun retrieveGroupChat(groupId: String): List<ChatMessage>?
+    fun getGroupChat(groupId: String): Flow<out List<ChatMessage>>
 
-    fun markMessagesSeen(seenGroupId: String)
+    suspend fun markMessagesSeen(seenGroupId: String)
 
-    fun flagMessage(
+    suspend fun flagMessage(
         chatMessageID: String,
         additionalInfo: String,
         groupID: String? = null
-    ): Flowable<Void>
+    ): Void?
 
-    fun likeMessage(chatMessage: ChatMessage): Flowable<ChatMessage>
+    suspend fun likeMessage(chatMessage: ChatMessage): ChatMessage?
 
-    fun deleteMessage(chatMessage: ChatMessage): Flowable<Void>
+    suspend fun deleteMessage(chatMessage: ChatMessage): Void?
 
-    fun postGroupChat(
+    suspend fun postGroupChat(
         groupId: String,
         messageObject: HashMap<String, String>
-    ): Flowable<PostChatMessageResult>
+    ): PostChatMessageResult?
 
-    fun postGroupChat(groupId: String, message: String): Flowable<PostChatMessageResult>
+    suspend fun postGroupChat(groupId: String, message: String): PostChatMessageResult?
 
-    fun retrieveGroup(id: String): Flowable<Group>
+    suspend fun retrieveGroup(id: String): Group?
     fun getGroup(id: String?): Flow<Group?>
-    fun getGroupFlowable(id: String?): Flowable<Group>
 
-    fun leaveGroup(id: String?, keepChallenges: Boolean): Flowable<Group>
+    suspend fun leaveGroup(id: String?, keepChallenges: Boolean): Group?
 
-    fun joinGroup(id: String?): Flowable<Group>
+    suspend fun joinGroup(id: String?): Group?
 
-    fun createGroup(
+    suspend fun createGroup(
         name: String?,
         description: String?,
         leader: String?,
         type: String?,
         privacy: String?,
         leaderCreateChallenge: Boolean?
-    ): Flowable<Group>
+    ): Group?
 
-    fun updateGroup(
+    suspend fun updateGroup(
         group: Group?,
         name: String?,
         description: String?,
         leader: String?,
         leaderCreateChallenge: Boolean?
-    ): Flowable<Group>
+    ): Group?
 
-    fun retrieveGroups(type: String): Flowable<List<Group>>
-    fun getGroups(type: String): Flowable<out List<Group>>
+    suspend fun retrieveGroups(type: String): List<Group>?
+    fun getGroups(type: String): Flow<List<Group>>
 
-    fun getInboxMessages(replyToUserID: String?): Flowable<out List<ChatMessage>>
-    fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>>
-    fun retrieveInboxConversations(): Flowable<List<InboxConversation>>
-    fun getInboxConversations(): Flowable<out List<InboxConversation>>
-    fun postPrivateMessage(
+    fun getInboxMessages(replyToUserID: String?): Flow<RealmResults<ChatMessage>>
+    suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>?
+    suspend fun retrieveInboxConversations(): List<InboxConversation>?
+    fun getInboxConversations(): Flow<RealmResults<InboxConversation>>
+    suspend fun postPrivateMessage(
         recipientId: String,
         messageObject: HashMap<String, String>
-    ): Flowable<List<ChatMessage>>
+    ): List<ChatMessage>?
 
-    fun postPrivateMessage(recipientId: String, message: String): Flowable<List<ChatMessage>>
+    suspend fun postPrivateMessage(recipientId: String, message: String): List<ChatMessage>?
 
-    fun getGroupMembers(id: String): Flow<List<Member>>
-    fun retrieveGroupMembers(id: String, includeAllPublicFields: Boolean): Flowable<List<Member>>
+    suspend fun getPartyMembers(id: String): Flow<List<Member>>
+    suspend fun getGroupMembers(id: String): Flow<List<Member>>
+    suspend fun retrievePartyMembers(id: String, includeAllPublicFields: Boolean): List<Member>?
 
-    fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<List<Void>>
+    suspend fun inviteToGroup(id: String, inviteData: Map<String, Any>): List<Void>?
 
-    fun getMember(userId: String?): Flowable<Member>
-    fun getMemberWithUsername(username: String?): Flowable<Member>
+    suspend fun retrieveMember(userId: String?): Member?
+    suspend fun retrieveMemberWithUsername(username: String?): Member?
 
-    fun findUsernames(
+    suspend fun findUsernames(
         username: String,
         context: String? = null,
         id: String? = null
-    ): Flowable<List<FindUsernameResult>>
+    ): List<FindUsernameResult>?
 
-    fun markPrivateMessagesRead(user: User?): Flowable<Void>
+    suspend fun markPrivateMessagesRead(user: User?): Void?
 
     fun markSomePrivateMessagesAsRead(user: User?, messages: List<ChatMessage>)
 
-    fun transferGroupOwnership(groupID: String, userID: String): Flowable<Group>
-    fun removeMemberFromGroup(groupID: String, userID: String): Flowable<List<Member>>
+    suspend fun transferGroupOwnership(groupID: String, userID: String): Group?
+    suspend fun removeMemberFromGroup(groupID: String, userID: String): List<Member>?
 
-    fun acceptQuest(user: User?, partyId: String = "party"): Flowable<Void>
-    fun rejectQuest(user: User?, partyId: String = "party"): Flowable<Void>
+    suspend fun acceptQuest(user: User?, partyId: String = "party"): Void?
+    suspend fun rejectQuest(user: User?, partyId: String = "party"): Void?
 
-    fun leaveQuest(partyId: String): Flowable<Void>
+    suspend fun leaveQuest(partyId: String): Void?
 
-    fun cancelQuest(partyId: String): Flowable<Void>
+    suspend fun cancelQuest(partyId: String): Void?
 
-    fun abortQuest(partyId: String): Flowable<Quest>
+    suspend fun abortQuest(partyId: String): Quest?
 
-    fun rejectGroupInvite(groupId: String): Flowable<Void>
+    suspend fun rejectGroupInvite(groupId: String): Void?
 
-    fun forceStartQuest(party: Group): Flowable<Quest>
+    suspend fun forceStartQuest(party: Group): Quest?
 
-    fun getMemberAchievements(userId: String?): Flowable<List<Achievement>>
+    suspend fun getMemberAchievements(userId: String?): List<Achievement>?
 
-    fun transferGems(giftedID: String, amount: Int): Flowable<Void>
+    suspend fun transferGems(giftedID: String, amount: Int): Void?
 
-    fun getGroupMembership(id: String): Flowable<GroupMembership>
-    fun getGroupMemberships(): Flowable<out List<GroupMembership>>
-    fun blockMember(userID: String): Flowable<List<String>>
+    fun getGroupMembership(id: String): Flow<GroupMembership?>
+    fun getGroupMemberships(): Flow<List<GroupMembership>>
+    suspend fun blockMember(userID: String): List<String>?
 }
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 8369c33cd..b6a04dcc2 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
@@ -1,19 +1,18 @@
 package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.Tag
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Single
+import kotlinx.coroutines.flow.Flow
 
 interface TagRepository : BaseRepository {
 
-    fun getTags(): Flowable<out List<Tag>>
-    fun getTags(userId: String): Flowable<out List<Tag>>
+    fun getTags(): Flow<List<Tag>>
+    fun getTags(userId: String): Flow<List<Tag>>
 
-    fun createTag(tag: Tag): Flowable<Tag>
-    fun updateTag(tag: Tag): Flowable<Tag>
-    fun deleteTag(id: String): Flowable<Void>
+    suspend fun createTag(tag: Tag): Tag?
+    suspend fun updateTag(tag: Tag): Tag?
+    suspend fun deleteTag(id: String): Void?
 
-    fun createTags(tags: Collection<Tag>): Single<List<Tag>>
-    fun updateTags(tags: Collection<Tag>): Single<List<Tag>>
-    fun deleteTags(tagIds: Collection<String>): Single<List<Void>>
+    suspend fun createTags(tags: Collection<Tag>): List<Tag>
+    suspend fun updateTags(tags: Collection<Tag>): List<Tag>
+    suspend fun deleteTags(tagIds: Collection<String>): List<Void>
 }
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 a6ba14b09..9ae35d9d0 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
@@ -8,44 +8,40 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Maybe
-import io.reactivex.rxjava3.core.Single
 import kotlinx.coroutines.flow.Flow
 import java.util.Date
 
 interface TaskRepository : BaseRepository {
     fun getTasks(taskType: TaskType, userID: String? = null, includedGroupIDs: Array<String>): Flow<List<Task>>
-    fun getTasksFlowable(taskType: TaskType, userID: String? = null, includedGroupIDs: Array<String>): Flowable<out List<Task>>
     fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList)
 
-    fun retrieveTasks(userId: String, tasksOrder: TasksOrder): Flowable<TaskList>
-    fun retrieveTasks(userId: String, tasksOrder: TasksOrder, dueDate: Date): Flowable<TaskList>
+    suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder): TaskList?
+    suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder, dueDate: Date): TaskList?
 
-    fun taskChecked(
+    suspend fun taskChecked(
         user: User?,
         task: Task,
         up: Boolean,
         force: Boolean,
         notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): Flowable<TaskScoringResult>
-    fun taskChecked(
+    ): TaskScoringResult?
+    suspend fun taskChecked(
         user: User?,
         taskId: String,
         up: Boolean,
         force: Boolean,
         notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): Maybe<TaskScoringResult>
-    fun scoreChecklistItem(taskId: String, itemId: String): Flowable<Task>
+    ): TaskScoringResult?
+    suspend fun scoreChecklistItem(taskId: String, itemId: String): Task?
 
-    fun getTask(taskId: String): Flowable<Task>
-    fun getTaskCopy(taskId: String): Flowable<Task>
-    fun createTask(task: Task, force: Boolean = false): Flowable<Task>
-    fun updateTask(task: Task, force: Boolean = false): Maybe<Task>?
-    fun deleteTask(taskId: String): Flowable<Void>
+    fun getTask(taskId: String): Flow<Task>
+    fun getTaskCopy(taskId: String): Flow<Task>
+    suspend fun createTask(task: Task, force: Boolean = false): Task?
+    suspend fun updateTask(task: Task, force: Boolean = false): Task?
+    suspend fun deleteTask(taskId: String): Void?
     fun saveTask(task: Task)
 
-    fun createTasks(newTasks: List<Task>): Flowable<List<Task>>
+    suspend fun createTasks(newTasks: List<Task>): List<Task>?
 
     fun markTaskCompleted(taskId: String, isCompleted: Boolean)
 
@@ -53,22 +49,22 @@ interface TaskRepository : BaseRepository {
 
     fun swapTaskPosition(firstPosition: Int, secondPosition: Int)
 
-    fun updateTaskPosition(taskType: TaskType, taskID: String, newPosition: Int): Maybe<List<String>>
+    suspend fun updateTaskPosition(taskType: TaskType, taskID: String, newPosition: Int): List<String>?
 
-    fun getUnmanagedTask(taskid: String): Flowable<Task>
+    fun getUnmanagedTask(taskid: String): Flow<Task>
 
-    fun updateTaskInBackground(task: Task)
+    fun updateTaskInBackground(task: Task, assignChanges: Map<String, MutableList<String>>)
 
-    fun createTaskInBackground(task: Task)
+    fun createTaskInBackground(task: Task, assignChanges: Map<String, MutableList<String>>)
 
     fun getTaskCopies(userId: String): Flow<List<Task>>
 
     fun getTaskCopies(tasks: List<Task>): List<Task>
 
-    fun retrieveDailiesFromDate(date: Date): Flowable<TaskList>
-    fun retrieveCompletedTodos(userId: String? = null): Flowable<TaskList>
-    fun syncErroredTasks(): Single<List<Task>>
-    fun unlinkAllTasks(challengeID: String?, keepOption: String): Flowable<Void>
-    fun getTasksForChallenge(challengeID: String?): Flowable<out List<Task>>
-    fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData>
+    suspend fun retrieveDailiesFromDate(date: Date): TaskList?
+    suspend fun retrieveCompletedTodos(userId: String? = null): TaskList?
+    suspend fun syncErroredTasks(): List<Task>?
+    suspend fun unlinkAllTasks(challengeID: String?, keepOption: String): Void?
+    fun getTasksForChallenge(challengeID: String?): Flow<out List<Task>>
+    suspend fun bulkScoreTasks(data: List<Map<String, String>>): 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 f982b7f3e..5940aa690 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,10 +1,10 @@
 package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface TutorialRepository : BaseRepository {
 
-    fun getTutorialStep(key: String): Flowable<TutorialStep>
-    fun getTutorialSteps(keys: List<String>): Flowable<out List<TutorialStep>>
+    fun getTutorialStep(key: String): Flow<TutorialStep>
+    fun getTutorialSteps(keys: List<String>): Flow<out List<TutorialStep>>
 }
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 458f21fb0..e9c60a3de 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,6 +1,5 @@
 package com.habitrpg.android.habitica.data
 
-import com.habitrpg.android.habitica.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.QuestAchievement
 import com.habitrpg.android.habitica.models.Skill
@@ -8,87 +7,77 @@ import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.inventory.Customization
 import com.habitrpg.android.habitica.models.responses.SkillResponse
 import com.habitrpg.android.habitica.models.responses.UnlockResponse
-import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
 import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.shared.habitica.models.tasks.Attribute
 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.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Maybe
+import com.habitrpg.android.habitica.models.user.UserQuestStatus
+import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
+import com.habitrpg.shared.habitica.models.tasks.Attribute
 import kotlinx.coroutines.flow.Flow
 
 interface UserRepository : BaseRepository {
     fun getUser(): Flow<User?>
-    fun getUserFlowable(): Flowable<User>
     fun getUser(userID: String): Flow<User?>
 
-    fun updateUser(updateData: Map<String, Any>): Flowable<User>
-    fun updateUser(key: String, value: Any): Flowable<User>
+    suspend fun updateUser(updateData: Map<String, Any>): User?
+    suspend fun updateUser(key: String, value: Any): User?
 
-    fun retrieveUser(withTasks: Boolean): Flowable<User>
-    fun retrieveUser(
-        withTasks: Boolean = false,
-        forced: Boolean = false,
-        overrideExisting: Boolean = false
-    ): Flowable<User>
+    suspend fun retrieveUser(withTasks: Boolean = false, forced: Boolean = false, overrideExisting: Boolean = false): User?
 
-    fun revive(): Flowable<User>
+    suspend fun revive(): User?
 
-    fun resetTutorial(): Maybe<User>
+    suspend fun resetTutorial(): User?
 
-    fun sleep(user: User): Flowable<User>
+    suspend fun sleep(user: User): User?
 
-    fun getSkills(user: User): Flowable<out List<Skill>>
+    fun getSkills(user: User): Flow<List<Skill>>
 
-    fun getSpecialItems(user: User): Flowable<out List<Skill>>
+    fun getSpecialItems(user: User): Flow<List<Skill>>
 
-    fun useSkill(key: String, target: String?, taskId: String): Flowable<SkillResponse>
-    fun useSkill(key: String, target: String?): Flowable<SkillResponse>
+    suspend fun useSkill(key: String, target: String?, taskId: String): SkillResponse?
+    suspend fun useSkill(key: String, target: String?): SkillResponse?
 
-    fun changeClass(): Flowable<User>
+    suspend fun disableClasses(): User?
+    suspend fun changeClass(selectedClass: String? = null): User?
 
-    fun disableClasses(): Flowable<User>
+    suspend fun unlockPath(path: String, price: Int): UnlockResponse?
+    suspend fun unlockPath(customization: Customization): UnlockResponse?
 
-    fun changeClass(selectedClass: String): Flowable<User>
+    suspend fun runCron(tasks: MutableList<Task>)
+    suspend fun runCron()
 
-    fun unlockPath(path: String, price: Int): Flowable<UnlockResponse>
-    fun unlockPath(customization: Customization): Flowable<UnlockResponse>
+    suspend fun readNotification(id: String): List<Any>?
+    suspend fun readNotifications(notificationIds: Map<String, List<String>>): List<Any>?
+    suspend fun seeNotifications(notificationIds: Map<String, List<String>>): List<Any>?
 
-    fun runCron(tasks: MutableList<Task>)
-    fun runCron()
+    suspend fun changeCustomDayStart(dayStartTime: Int): User?
 
-    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>>
+    suspend fun updateLanguage(languageCode: String): User?
 
-    fun changeCustomDayStart(dayStartTime: Int): Flowable<User>
+    suspend fun resetAccount(): User?
+    suspend fun deleteAccount(password: String): Void?
 
-    fun updateLanguage(languageCode: String): Flowable<User>
+    suspend fun sendPasswordResetEmail(email: String): Void?
 
-    fun resetAccount(): Flowable<User>
-    fun deleteAccount(password: String): Flowable<Void>
+    suspend fun updateLoginName(newLoginName: String, password: String? = null): User?
+    suspend fun updateEmail(newEmail: String, password: String): Void?
+    suspend fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Void?
+    suspend fun verifyUsername(username: String): VerifyUsernameResponse?
 
-    fun sendPasswordResetEmail(email: String): Flowable<Void>
+    suspend fun allocatePoint(stat: Attribute): Stats?
+    suspend fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Stats?
 
-    fun updateLoginName(newLoginName: String, password: String? = null): Maybe<User>
-    fun updateEmail(newEmail: String, password: String): Flowable<Void>
-    fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Flowable<Void>
-    fun verifyUsername(username: String): Flowable<VerifyUsernameResponse>
-
-    fun allocatePoint(stat: Attribute): Flowable<Stats>
-    fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable<Stats>
-
-    fun useCustomization(type: String, category: String?, identifier: String): Flowable<User>
-    fun retrieveAchievements(): Flowable<List<Achievement>>
+    suspend fun useCustomization(type: String, category: String?, identifier: String): User?
+    suspend fun retrieveAchievements(): List<Achievement>?
     fun getAchievements(): Flow<List<Achievement>>
     fun getQuestAchievements(): Flow<List<QuestAchievement>>
 
-    fun getUserQuestStatus(): Flowable<UserQuestStatus>
+    fun getUserQuestStatus(): Flow<UserQuestStatus>
 
-    fun reroll(): Flowable<User>
-    fun retrieveTeamPlans(): Flowable<List<TeamPlan>>
+    suspend fun reroll(): User?
+    suspend fun retrieveTeamPlans(): List<TeamPlan>?
     fun getTeamPlans(): Flow<List<TeamPlan>>
-    fun retrieveTeamPlan(teamID: String): Flowable<Group>
-    fun getTeamPlan(teamID: String): Flowable<Group>
+    suspend fun retrieveTeamPlan(teamID: String): Group?
+    fun getTeamPlan(teamID: String): Flow<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 32d792593..fe3a9f4b1 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
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.data.implementation
 
 import android.content.Context
-import com.amplitude.api.Amplitude
 import com.google.gson.JsonSyntaxException
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.HabiticaBaseApplication
@@ -9,7 +8,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.api.ApiService
 import com.habitrpg.android.habitica.api.GSonFactoryCreator
 import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.extensions.filterMap
 import com.habitrpg.android.habitica.helpers.NotificationsManager
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.ContentResult
@@ -40,6 +38,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.common.habitica.api.Server
+import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.common.habitica.models.PurchaseValidationRequest
 import com.habitrpg.common.habitica.models.PurchaseValidationResult
 import com.habitrpg.common.habitica.models.auth.UserAuth
@@ -48,15 +47,9 @@ import com.habitrpg.common.habitica.models.auth.UserAuthSocial
 import com.habitrpg.common.habitica.models.auth.UserAuthSocialTokens
 import com.habitrpg.shared.habitica.models.responses.ErrorResponse
 import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.shared.habitica.models.responses.Status
 import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
 import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.FlowableTransformer
-import io.reactivex.rxjava3.functions.Consumer
-import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -64,7 +57,6 @@ import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Converter
 import retrofit2.HttpException
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import java.io.File
 import java.io.IOException
@@ -81,29 +73,30 @@ class ApiClientImpl(
     private val analyticsManager: AnalyticsManager,
     private val notificationsManager: NotificationsManager,
     private val context: Context
-) : Consumer<Throwable>, ApiClient {
+): ApiClient {
 
     private lateinit var retrofitAdapter: Retrofit
 
     // I think we don't need the ApiClientImpl anymore we could just use ApiService
     private lateinit var apiService: ApiService
 
-    private val apiCallTransformer = FlowableTransformer<HabitResponse<Any>, Any> { observable ->
-        observable
-            .filterMap { habitResponse ->
-                habitResponse.notifications?.let {
-                    notificationsManager.setNotifications(it)
-                }
-                if (hadError) {
-                    hideConnectionProblemDialog()
-                }
-                habitResponse.data
-            }
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnError(this)
+    private fun <T> processResponse(habitResponse: HabitResponse<T>): T? {
+        habitResponse.notifications?.let {
+            notificationsManager.setNotifications(it)
+        }
+        return habitResponse.data
     }
-    private var languageCode: String? = null
+
+    private suspend fun <T> process(apiCall: suspend () -> HabitResponse<T>): T? {
+        try {
+            return processResponse(apiCall())
+        } catch (throwable: Throwable) {
+            accept(throwable)
+        }
+        return null
+    }
+
+    override var languageCode: String? = null
     private var lastAPICallURL: String? = null
     private var hadError = false
 
@@ -161,7 +154,6 @@ class ApiClientImpl(
         retrofitAdapter = Retrofit.Builder()
             .client(client)
             .baseUrl(server.toString())
-            .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
             .addConverterFactory(converter)
             .build()
 
@@ -175,28 +167,28 @@ class ApiClientImpl(
         }
     }
 
-    override fun registerUser(
+    override suspend fun registerUser(
         username: String,
         email: String,
         password: String,
         confirmPassword: String
-    ): Flowable<UserAuthResponse> {
+    ): UserAuthResponse? {
         val auth = UserAuth()
         auth.username = username
         auth.password = password
         auth.confirmPassword = confirmPassword
         auth.email = email
-        return this.apiService.registerUser(auth).compose(configureApiCallObserver())
+        return process { this.apiService.registerUser(auth) }
     }
 
-    override fun connectUser(username: String, password: String): Flowable<UserAuthResponse> {
+    override suspend fun connectUser(username: String, password: String): UserAuthResponse? {
         val auth = UserAuth()
         auth.username = username
         auth.password = password
-        return this.apiService.connectLocal(auth).compose(configureApiCallObserver())
+        return process { this.apiService.connectLocal(auth) }
     }
 
-    override fun connectSocial(network: String, userId: String, accessToken: String): Flowable<UserAuthResponse> {
+    override suspend fun connectSocial(network: String, userId: String, accessToken: String): UserAuthResponse? {
         val auth = UserAuthSocial()
         auth.network = network
         val authResponse = UserAuthSocialTokens()
@@ -204,18 +196,18 @@ class ApiClientImpl(
         authResponse.access_token = accessToken
         auth.authResponse = authResponse
 
-        return this.apiService.connectSocial(auth).compose(configureApiCallObserver())
+        return process { this.apiService.connectSocial(auth) }
     }
 
-    override fun disconnectSocial(network: String): Flowable<Void> {
-        return this.apiService.disconnectSocial(network).compose(configureApiCallObserver())
+    override suspend fun disconnectSocial(network: String): Void? {
+        return process { this.apiService.disconnectSocial(network) }
     }
 
-    override fun loginApple(authToken: String): Flowable<UserAuthResponse> {
-        return apiService.loginApple(mapOf(Pair("code", authToken))).compose(configureApiCallObserver())
+    override suspend fun loginApple(authToken: String): UserAuthResponse? {
+        return process { apiService.loginApple(mapOf(Pair("code", authToken))) }
     }
 
-    override fun accept(throwable: Throwable) {
+    fun accept(throwable: Throwable) {
         val throwableClass = throwable.javaClass
         if (SocketTimeoutException::class.java.isAssignableFrom(throwableClass)) {
             return
@@ -225,7 +217,7 @@ class ApiClientImpl(
             this.showConnectionProblemDialog(R.string.internal_error_api)
         } else if (throwableClass == SocketTimeoutException::class.java || UnknownHostException::class.java == throwableClass || IOException::class.java == throwableClass) {
             this.showConnectionProblemDialog(R.string.network_error_no_network_body)
-        } else if (retrofit2.adapter.rxjava3.HttpException::class.java.isAssignableFrom(throwable.javaClass) || HttpException::class.java.isAssignableFrom(throwable.javaClass)) {
+        } else if (HttpException::class.java.isAssignableFrom(throwable.javaClass)) {
             val error = throwable as HttpException
             val res = getErrorResponse(error)
             val status = error.code()
@@ -268,29 +260,19 @@ class ApiClientImpl(
         }
     }
 
-    override fun retrieveUser(withTasks: Boolean): Flowable<User> {
-
-        var userObservable = this.user
-
-        if (withTasks) {
-            val tasksObservable = this.tasks
-
-            userObservable = Flowable.zip(
-                userObservable, tasksObservable
-            ) { habitRPGUser, tasks ->
-                habitRPGUser.tasks = tasks
-                habitRPGUser
-            }
-        }
-        return userObservable
+    override suspend fun retrieveUser(withTasks: Boolean): User? {
+        val user = process { apiService.getUser() }
+        val tasks = getTasks()
+        user?.tasks = tasks
+        return user
     }
 
-    override fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>> {
-        return apiService.getInboxMessages(uuid, page).compose(configureApiCallObserver())
+    override suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>? {
+        return process { apiService.getInboxMessages(uuid, page) }
     }
 
-    override fun retrieveInboxConversations(): Flowable<List<InboxConversation>> {
-        return apiService.getInboxConversations().compose(configureApiCallObserver())
+    override suspend fun retrieveInboxConversations(): List<InboxConversation>? {
+        return process { apiService.getInboxConversations() }
     }
 
     override fun hasAuthenticationKeys(): Boolean {
@@ -329,512 +311,480 @@ class ApiClientImpl(
      See here for more info: http://blog.danlew.net/2015/03/02/dont-break-the-chain/
      */
 
-    override fun <T : Any> configureApiCallObserver(): FlowableTransformer<HabitResponse<T>, T> {
-        @Suppress("UNCHECKED_CAST")
-        return apiCallTransformer as FlowableTransformer<HabitResponse<T>, T>
-    }
-
     override fun updateAuthenticationCredentials(userID: String?, apiToken: String?) {
         this.hostConfig.userID = userID ?: ""
         this.hostConfig.apiKey = apiToken ?: ""
         analyticsManager.setUserIdentifier(this.hostConfig.userID)
-        Amplitude.getInstance().userId = this.hostConfig.userID
     }
 
-    override fun setLanguageCode(languageCode: String) {
-        this.languageCode = languageCode
+    override suspend fun getStatus(): Status? = process { apiService.getStatus() }
+
+    override suspend fun getContent(language: String?): ContentResult? {
+        return process {  apiService.getContent(language) }
     }
 
-    override val status: Flowable<Status>
-        get() = apiService.status.compose(configureApiCallObserver())
-
-    override fun getContent(language: String): Flowable<ContentResult> {
-        return apiService.getContent(language).compose(configureApiCallObserver())
+    override suspend fun updateUser(updateDictionary: Map<String, Any>): User? {
+        return process { apiService.updateUser(updateDictionary) }
     }
 
-    override val user: Flowable<User>
-        get() = apiService.user.compose(configureApiCallObserver())
-
-    override fun updateUser(updateDictionary: Map<String, Any>): Flowable<User> {
-        return apiService.updateUser(updateDictionary).compose(configureApiCallObserver())
+    override suspend fun registrationLanguage(registrationLanguage: String): User? {
+        return process { apiService.registrationLanguage(registrationLanguage) }
     }
 
-    override fun registrationLanguage(registrationLanguage: String): Flowable<User> {
-        return apiService.registrationLanguage(registrationLanguage).compose(configureApiCallObserver())
+    override suspend fun retrieveInAppRewards(): List<ShopItem>? {
+        return process { apiService.retrieveInAppRewards() }
     }
 
-    override fun retrieveInAppRewards(): Flowable<List<ShopItem>> {
-        return apiService.retrieveInAppRewards().compose(configureApiCallObserver())
+    override suspend fun equipItem(type: String, itemKey: String): Items? {
+        return process { apiService.equipItem(type, itemKey) }
     }
 
-    override fun retrieveOldGear(): Flowable<List<ShopItem>> {
-        return apiService.retrieveOldGearRewards().compose(configureApiCallObserver())
+    override suspend fun buyItem(itemKey: String, purchaseQuantity: Int): BuyResponse? {
+        return process { apiService.buyItem(itemKey, mapOf(Pair("quantity", purchaseQuantity))) }
     }
 
-    override fun equipItem(type: String, itemKey: String): Flowable<Items> {
-        return apiService.equipItem(type, itemKey).compose(configureApiCallObserver())
+    override suspend fun unlinkAllTasks(challengeID: String?, keepOption: String): Void? {
+        return process { apiService.unlinkAllTasks(challengeID, keepOption) }
     }
 
-    override fun buyItem(itemKey: String, purchaseQuantity: Int): Flowable<BuyResponse> {
-        return apiService.buyItem(itemKey, mapOf(Pair("quantity", purchaseQuantity))).compose(configureApiCallObserver())
+    override suspend fun blockMember(userID: String): List<String>? {
+        return process { apiService.blockMember(userID) }
     }
 
-    override fun unlinkAllTasks(challengeID: String?, keepOption: String): Flowable<Void> {
-        return apiService.unlinkAllTasks(challengeID, keepOption).compose(configureApiCallObserver())
+    override suspend fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Void? {
+        return process { apiService.purchaseItem(type, itemKey, mapOf(Pair("quantity", purchaseQuantity))) }
     }
 
-    override fun blockMember(userID: String): Flowable<List<String>> {
-        return apiService.blockMember(userID).compose(configureApiCallObserver())
+    override suspend fun validateSubscription(request: PurchaseValidationRequest): Any? {
+        return process { apiService.validateSubscription(request) }
     }
 
-    override fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Void> {
-        return apiService.purchaseItem(type, itemKey, mapOf(Pair("quantity", purchaseQuantity))).compose(configureApiCallObserver())
+    override suspend fun validateNoRenewSubscription(request: PurchaseValidationRequest): Any? {
+        return process { apiService.validateNoRenewSubscription(request) }
     }
 
-    override fun validateSubscription(request: PurchaseValidationRequest): Flowable<Any> {
-        return apiService.validateSubscription(request).compose(configureApiCallObserver())
+    override suspend fun cancelSubscription(): Void? {
+        return processResponse(apiService.cancelSubscription())
     }
 
-    override fun validateNoRenewSubscription(request: PurchaseValidationRequest): Flowable<Any> {
-        return apiService.validateNoRenewSubscription(request).compose(configureApiCallObserver())
+    override suspend fun purchaseHourglassItem(type: String, itemKey: String): Void? {
+        return process { apiService.purchaseHourglassItem(type, itemKey) }
     }
 
-    override fun cancelSubscription(): Flowable<Void> {
-        return apiService.cancelSubscription().compose(configureApiCallObserver())
+    override suspend fun purchaseMysterySet(itemKey: String): Void? {
+        return process { apiService.purchaseMysterySet(itemKey) }
     }
 
-    override fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Void> {
-        return apiService.purchaseHourglassItem(type, itemKey).compose(configureApiCallObserver())
+    override suspend fun purchaseQuest(key: String): Void? {
+        return process { apiService.purchaseQuest(key) }
     }
 
-    override fun purchaseMysterySet(itemKey: String): Flowable<Void> {
-        return apiService.purchaseMysterySet(itemKey).compose(configureApiCallObserver())
+    override suspend fun purchaseSpecialSpell(key: String): Void? {
+        return process { apiService.purchaseSpecialSpell(key) }
     }
 
-    override fun purchaseQuest(key: String): Flowable<Void> {
-        return apiService.purchaseQuest(key).compose(configureApiCallObserver())
+    override suspend fun sellItem(itemType: String, itemKey: String): User? {
+        return process { apiService.sellItem(itemType, itemKey) }
     }
 
-    override fun purchaseSpecialSpell(key: String): Flowable<Void> {
-        return apiService.purchaseSpecialSpell(key).compose(configureApiCallObserver())
+    override suspend fun feedPet(petKey: String, foodKey: String): FeedResponse? {
+        val response = apiService.feedPet(petKey, foodKey)
+        response.data?.message = response.message
+        return process { response }
     }
 
-    override fun sellItem(itemType: String, itemKey: String): Flowable<User> {
-        return apiService.sellItem(itemType, itemKey).compose(configureApiCallObserver())
+    override suspend fun hatchPet(eggKey: String, hatchingPotionKey: String): Items? {
+        return process { apiService.hatchPet(eggKey, hatchingPotionKey) }
     }
 
-    override fun feedPet(petKey: String, foodKey: String): Flowable<FeedResponse> {
-        return apiService.feedPet(petKey, foodKey)
-            .map {
-                it.data?.message = it.message
-                it
+    override suspend fun getTasks(): TaskList? = process { apiService.getTasks() }
+
+    override suspend fun getTasks(type: String): TaskList? {
+        return process { apiService.getTasks(type) }
+    }
+
+    override suspend fun getTasks(type: String, dueDate: String): TaskList? {
+        return process { apiService.getTasks(type, dueDate) }
+    }
+
+    override suspend fun unlockPath(path: String): UnlockResponse? {
+        return process { apiService.unlockPath(path) }
+    }
+
+    override suspend fun getTask(id: String): Task? {
+        return process { apiService.getTask(id) }
+    }
+
+    override suspend fun postTaskDirection(id: String, direction: String): TaskDirectionData? {
+        return process { apiService.postTaskDirection(id, direction) }
+    }
+
+    override suspend fun bulkScoreTasks(data: List<Map<String, String>>): BulkTaskScoringData? {
+        return process { apiService.bulkScoreTasks(data) }
+    }
+
+    override suspend fun postTaskNewPosition(id: String, position: Int): List<String>? {
+        return process { apiService.postTaskNewPosition(id, position) }
+    }
+
+    override suspend fun scoreChecklistItem(taskId: String, itemId: String): Task? {
+        return process { apiService.scoreChecklistItem(taskId, itemId) }
+    }
+
+    override suspend fun createTask(item: Task): Task? {
+        return process { apiService.createTask(item) }
+    }
+
+    override suspend fun createTasks(tasks: List<Task>): List<Task>? {
+        return process { apiService.createTasks(tasks) }
+    }
+
+    override suspend fun updateTask(id: String, item: Task): Task? {
+        return process { apiService.updateTask(id, item) }
+    }
+
+    override suspend fun deleteTask(id: String): Void? {
+        return process { apiService.deleteTask(id) }
+    }
+
+    override suspend fun createTag(tag: Tag): Tag? {
+        return process { apiService.createTag(tag) }
+    }
+
+    override suspend fun updateTag(id: String, tag: Tag): Tag? {
+        return process { apiService.updateTag(id, tag) }
+    }
+
+    override suspend fun deleteTag(id: String): Void? {
+        return process { apiService.deleteTag(id) }
+    }
+
+    override suspend fun sleep(): Boolean? = process { apiService.sleep() }
+
+    override suspend fun revive(): User? = process { apiService.revive() }
+
+    suspend override fun useSkill(skillName: String, targetType: String, targetId: String): SkillResponse? {
+        return process { apiService.useSkill(skillName, targetType, targetId) }
+    }
+
+    suspend override fun useSkill(skillName: String, targetType: String): SkillResponse? {
+        return process { apiService.useSkill(skillName, targetType) }
+    }
+
+    override suspend fun changeClass(className: String?): User? {
+        return process {
+            if (className != null) {
+                apiService.changeClass(className)
+            } else {
+                apiService.changeClass()
             }
-            .compose(configureApiCallObserver())
-    }
-
-    override fun hatchPet(eggKey: String, hatchingPotionKey: String): Flowable<Items> {
-        return apiService.hatchPet(eggKey, hatchingPotionKey).compose(configureApiCallObserver())
-    }
-
-    override val tasks: Flowable<TaskList>
-        get() = apiService.tasks.compose(configureApiCallObserver())
-
-    override fun getTasks(type: String): Flowable<TaskList> {
-        return apiService.getTasks(type).compose(configureApiCallObserver())
-    }
-
-    override fun getTasks(type: String, dueDate: String): Flowable<TaskList> {
-        return apiService.getTasks(type, dueDate).compose(configureApiCallObserver())
-    }
-
-    override fun unlockPath(path: String): Flowable<UnlockResponse> {
-        return apiService.unlockPath(path).compose(configureApiCallObserver())
-    }
-
-    override fun getTask(id: String): Flowable<Task> {
-        return apiService.getTask(id).compose(configureApiCallObserver())
-    }
-
-    override fun postTaskDirection(id: String, direction: String): Flowable<TaskDirectionData> {
-        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())
-    }
-
-    override fun scoreChecklistItem(taskId: String, itemId: String): Flowable<Task> {
-        return apiService.scoreChecklistItem(taskId, itemId).compose(configureApiCallObserver())
-    }
-
-    override fun createTask(item: Task): Flowable<Task> {
-        return apiService.createTask(item).compose(configureApiCallObserver())
-    }
-
-    override fun createTasks(tasks: List<Task>): Flowable<List<Task>> {
-        return apiService.createTasks(tasks).compose(configureApiCallObserver())
-    }
-
-    override fun updateTask(id: String, item: Task): Flowable<Task> {
-        return apiService.updateTask(id, item).compose(configureApiCallObserver())
-    }
-
-    override fun deleteTask(id: String): Flowable<Void> {
-        return apiService.deleteTask(id).compose(configureApiCallObserver())
-    }
-
-    override fun createTag(tag: Tag): Flowable<Tag> {
-        return apiService.createTag(tag).compose(configureApiCallObserver())
-    }
-
-    override fun updateTag(id: String, tag: Tag): Flowable<Tag> {
-        return apiService.updateTag(id, tag).compose(configureApiCallObserver())
-    }
-
-    override fun deleteTag(id: String): Flowable<Void> {
-        return apiService.deleteTag(id).compose(configureApiCallObserver())
-    }
-
-    override fun sleep(): Flowable<Boolean> {
-        return apiService.sleep().compose(configureApiCallObserver())
-    }
-
-    override fun revive(): Flowable<User> {
-        return apiService.revive().compose(configureApiCallObserver())
-    }
-
-    override fun useSkill(skillName: String, targetType: String, targetId: String): Flowable<SkillResponse> {
-        return apiService.useSkill(skillName, targetType, targetId).compose(configureApiCallObserver())
-    }
-
-    override fun useSkill(skillName: String, targetType: String): Flowable<SkillResponse> {
-        return apiService.useSkill(skillName, targetType).compose(configureApiCallObserver())
-    }
-
-    override fun changeClass(): Flowable<User> {
-        return apiService.changeClass().compose(configureApiCallObserver())
-    }
-
-    override fun changeClass(className: String): Flowable<User> {
-        return apiService.changeClass(className).compose(configureApiCallObserver())
-    }
-
-    override fun disableClasses(): Flowable<User> {
-        return apiService.disableClasses().compose(configureApiCallObserver())
-    }
-
-    override fun markPrivateMessagesRead(): Flowable<Void> {
-        // This is necessary, because the API call returns weird data.
-        return apiService.markPrivateMessagesRead()
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnError(this)
-    }
-
-    override fun listGroups(type: String): Flowable<List<Group>> {
-        return apiService.listGroups(type).compose(configureApiCallObserver())
-    }
-
-    override fun getGroup(groupId: String): Flowable<Group> {
-        return apiService.getGroup(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun createGroup(group: Group): Flowable<Group> {
-        return apiService.createGroup(group).compose(configureApiCallObserver())
-    }
-
-    override fun updateGroup(id: String, item: Group): Flowable<Group> {
-        return apiService.updateGroup(id, item).compose(configureApiCallObserver())
-    }
-
-    override fun removeMemberFromGroup(groupID: String, userID: String): Flowable<Void> {
-        return apiService.removeMemberFromGroup(groupID, userID).compose(configureApiCallObserver())
-    }
-
-    override fun listGroupChat(groupId: String): Flowable<List<ChatMessage>> {
-        return apiService.listGroupChat(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun joinGroup(groupId: String): Flowable<Group> {
-        return apiService.joinGroup(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun leaveGroup(groupId: String, keepChallenges: String): Flowable<Void> {
-        return apiService.leaveGroup(groupId, keepChallenges).compose(configureApiCallObserver())
-    }
-
-    override fun postGroupChat(groupId: String, message: Map<String, String>): Flowable<PostChatMessageResult> {
-        return apiService.postGroupChat(groupId, message).compose(configureApiCallObserver())
-    }
-
-    override fun deleteMessage(groupId: String, messageId: String): Flowable<Void> {
-        return apiService.deleteMessage(groupId, messageId).compose(configureApiCallObserver())
-    }
-    override fun deleteInboxMessage(id: String): Flowable<Void> {
-        return apiService.deleteInboxMessage(id).compose(configureApiCallObserver())
-    }
-
-    override fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?): Flowable<List<Member>> {
-        return apiService.getGroupMembers(groupId, includeAllPublicFields).compose(configureApiCallObserver())
-    }
-
-    override fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?, lastId: String): Flowable<List<Member>> {
-        return apiService.getGroupMembers(groupId, includeAllPublicFields, lastId).compose(configureApiCallObserver())
-    }
-
-    override fun likeMessage(groupId: String, mid: String): Flowable<ChatMessage> {
-        return apiService.likeMessage(groupId, mid).compose(configureApiCallObserver())
-    }
-
-    override fun flagMessage(groupId: String, mid: String, data: MutableMap<String, String>): Flowable<Void> {
-        return apiService.flagMessage(groupId, mid, data).compose(configureApiCallObserver())
-    }
-
-    override fun flagInboxMessage(mid: String, data: MutableMap<String, String>): Flowable<Void> {
-        return apiService.flagInboxMessage(mid, data).compose(configureApiCallObserver())
-    }
-
-    override fun seenMessages(groupId: String): Flowable<Void> {
-        return apiService.seenMessages(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<List<Void>> {
-        return apiService.inviteToGroup(groupId, inviteData).compose(configureApiCallObserver())
-    }
-
-    override fun rejectGroupInvite(groupId: String): Flowable<Void> {
-        return apiService.rejectGroupInvite(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun acceptQuest(groupId: String): Flowable<Void> {
-        return apiService.acceptQuest(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun rejectQuest(groupId: String): Flowable<Void> {
-        return apiService.rejectQuest(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun cancelQuest(groupId: String): Flowable<Void> {
-        return apiService.cancelQuest(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun forceStartQuest(groupId: String, group: Group): Flowable<Quest> {
-        return apiService.forceStartQuest(groupId, group).compose(configureApiCallObserver())
-    }
-
-    override fun inviteToQuest(groupId: String, questKey: String): Flowable<Quest> {
-        return apiService.inviteToQuest(groupId, questKey).compose(configureApiCallObserver())
-    }
-
-    override fun abortQuest(groupId: String): Flowable<Quest> {
-        return apiService.abortQuest(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun leaveQuest(groupId: String): Flowable<Void> {
-        return apiService.leaveQuest(groupId).compose(configureApiCallObserver())
-    }
-
-    override fun validatePurchase(request: PurchaseValidationRequest): Flowable<PurchaseValidationResult> {
-        return apiService.validatePurchase(request).compose(configureApiCallObserver())
-    }
-
-    override fun changeCustomDayStart(updateObject: Map<String, Any>): Flowable<User> {
-        return apiService.changeCustomDayStart(updateObject).compose(configureApiCallObserver())
-    }
-
-    override fun getMember(memberId: String): Flowable<Member> {
-        return apiService.getMember(memberId).compose(configureApiCallObserver())
-    }
-
-    override fun getMemberWithUsername(username: String): Flowable<Member> {
-        return apiService.getMemberWithUsername(username).compose(configureApiCallObserver())
-    }
-
-    override fun getMemberAchievements(memberId: String): Flowable<List<Achievement>> {
-        return apiService.getMemberAchievements(memberId, languageCode).compose(configureApiCallObserver())
-    }
-
-    override fun findUsernames(username: String, context: String?, id: String?): Flowable<List<FindUsernameResult>> {
-        return apiService.findUsernames(username, context, id).compose(configureApiCallObserver())
-    }
-
-    override fun postPrivateMessage(messageDetails: Map<String, String>): Flowable<PostChatMessageResult> {
-        return apiService.postPrivateMessage(messageDetails).compose(configureApiCallObserver())
-    }
-
-    override fun retrieveShopIventory(identifier: String): Flowable<Shop> {
-        return apiService.retrieveShopInventory(identifier, languageCode).compose(configureApiCallObserver())
-    }
-
-    override fun addPushDevice(pushDeviceData: Map<String, String>): Flowable<List<Void>> {
-        return apiService.addPushDevice(pushDeviceData).compose(configureApiCallObserver())
-    }
-
-    override fun deletePushDevice(regId: String): Flowable<List<Void>> {
-        return apiService.deletePushDevice(regId).compose(configureApiCallObserver())
-    }
-
-    override fun getUserChallenges(page: Int, memberOnly: Boolean): Flowable<List<Challenge>> {
-        return if (memberOnly) {
-            apiService.getUserChallenges(page, memberOnly).compose(configureApiCallObserver())
-        } else {
-            apiService.getUserChallenges(page).compose(configureApiCallObserver())
         }
     }
 
-    override fun getChallengeTasks(challengeId: String): Flowable<TaskList> {
-        return apiService.getChallengeTasks(challengeId).compose(configureApiCallObserver())
+    override suspend fun disableClasses(): User? = process { apiService.disableClasses() }
+
+    override suspend fun markPrivateMessagesRead(): Void {
+        return apiService.markPrivateMessagesRead()
     }
 
-    override fun getChallenge(challengeId: String): Flowable<Challenge> {
-        return apiService.getChallenge(challengeId).compose(configureApiCallObserver())
+    override suspend fun listGroups(type: String): List<Group>? {
+        return process { apiService.listGroups(type) }
     }
 
-    override fun joinChallenge(challengeId: String): Flowable<Challenge> {
-        return apiService.joinChallenge(challengeId).compose(configureApiCallObserver())
+    override suspend fun getGroup(groupId: String): Group? {
+        return processResponse(apiService.getGroup(groupId))
     }
 
-    override fun leaveChallenge(challengeId: String, body: LeaveChallengeBody): Flowable<Void> {
-        return apiService.leaveChallenge(challengeId, body).compose(configureApiCallObserver())
+    override suspend fun createGroup(group: Group): Group? {
+        return processResponse(apiService.createGroup(group))
     }
 
-    override fun createChallenge(challenge: Challenge): Flowable<Challenge> {
-        return apiService.createChallenge(challenge).compose(configureApiCallObserver())
+    override suspend fun updateGroup(id: String, item: Group): Group? {
+        return processResponse(apiService.updateGroup(id, item))
     }
 
-    override fun createChallengeTasks(challengeId: String, tasks: List<Task>): Flowable<List<Task>> {
-        return apiService.createChallengeTasks(challengeId, tasks).compose(configureApiCallObserver())
+    override suspend fun removeMemberFromGroup(groupID: String, userID: String): Void? {
+        return processResponse(apiService.removeMemberFromGroup(groupID, userID))
     }
 
-    override fun createChallengeTask(challengeId: String, task: Task): Flowable<Task> {
-        return apiService.createChallengeTask(challengeId, task).compose(configureApiCallObserver())
+    override suspend fun listGroupChat(groupId: String): List<ChatMessage>? {
+        return processResponse(apiService.listGroupChat(groupId))
     }
 
-    override fun updateChallenge(challenge: Challenge): Flowable<Challenge> {
-        return apiService.updateChallenge(challenge.id ?: "", challenge).compose(configureApiCallObserver())
+    override suspend fun joinGroup(groupId: String): Group? {
+        return processResponse(apiService.joinGroup(groupId))
     }
 
-    override fun deleteChallenge(challengeId: String): Flowable<Void> {
-        return apiService.deleteChallenge(challengeId).compose(configureApiCallObserver())
+    override suspend fun leaveGroup(groupId: String, keepChallenges: String): Void? {
+        return processResponse(apiService.leaveGroup(groupId, keepChallenges))
     }
 
-    override fun debugAddTenGems(): Flowable<Void> {
-        return apiService.debugAddTenGems().compose(configureApiCallObserver())
+    override suspend fun postGroupChat(groupId: String, message: Map<String, String>): PostChatMessageResult? {
+        return process { apiService.postGroupChat(groupId, message) }
     }
 
-    override fun readNotification(notificationId: String): Flowable<List<Any>> {
-        return apiService.readNotification(notificationId).compose(configureApiCallObserver())
+    override suspend fun deleteMessage(groupId: String, messageId: String): Void? {
+        return process { apiService.deleteMessage(groupId, messageId) }
+    }
+    override suspend fun deleteInboxMessage(id: String): Void? {
+        return process { apiService.deleteInboxMessage(id) }
     }
 
-    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> {
-        return apiService.readNotifications(notificationIds).compose(configureApiCallObserver())
+    override suspend fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?): List<Member>? {
+        return processResponse(apiService.getGroupMembers(groupId, includeAllPublicFields))
     }
 
-    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> {
-        return apiService.seeNotifications(notificationIds).compose(configureApiCallObserver())
+    override suspend fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?, lastId: String): List<Member>? {
+        return processResponse(apiService.getGroupMembers(groupId, includeAllPublicFields, lastId))
     }
 
-    override val content: Flowable<ContentResult>
-        get() = apiService.getContent(languageCode).compose(configureApiCallObserver())
-
-    override fun openMysteryItem(): Flowable<Equipment> {
-        return apiService.openMysteryItem().compose(configureApiCallObserver())
+    override suspend fun likeMessage(groupId: String, mid: String): ChatMessage? {
+        return process { apiService.likeMessage(groupId, mid) }
     }
 
-    override fun runCron(): Flowable<Void> {
-        return apiService.runCron().compose(configureApiCallObserver())
+    override suspend fun flagMessage(groupId: String, mid: String, data: MutableMap<String, String>): Void? {
+        return process { apiService.flagMessage(groupId, mid, data) }
     }
 
-    override fun reroll(): Flowable<User> {
-        return apiService.reroll().compose(configureApiCallObserver())
+    override suspend fun flagInboxMessage(mid: String, data: MutableMap<String, String>): Void? {
+        return process { apiService.flagInboxMessage(mid, data) }
     }
 
-    override fun resetAccount(): Flowable<Void> {
-        return apiService.resetAccount().compose(configureApiCallObserver())
+    override suspend fun seenMessages(groupId: String): Void? {
+        return process { apiService.seenMessages(groupId) }
     }
 
-    override fun deleteAccount(password: String): Flowable<Void> {
+    override suspend fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): List<Void>? {
+        return process { apiService.inviteToGroup(groupId, inviteData) }
+    }
+
+    override suspend fun rejectGroupInvite(groupId: String): Void? {
+        return process { apiService.rejectGroupInvite(groupId) }
+    }
+
+    override suspend fun acceptQuest(groupId: String): Void? {
+        return process { apiService.acceptQuest(groupId) }
+    }
+
+    override suspend fun rejectQuest(groupId: String): Void? {
+        return process { apiService.rejectQuest(groupId) }
+    }
+
+    override suspend fun cancelQuest(groupId: String): Void? {
+        return process { apiService.cancelQuest(groupId) }
+    }
+
+    override suspend fun forceStartQuest(groupId: String, group: Group): Quest? {
+        return process { apiService.forceStartQuest(groupId, group) }
+    }
+
+    override suspend fun inviteToQuest(groupId: String, questKey: String): Quest? {
+        return process { apiService.inviteToQuest(groupId, questKey) }
+    }
+
+    override suspend fun abortQuest(groupId: String): Quest? {
+        return process { apiService.abortQuest(groupId) }
+    }
+
+    override suspend fun leaveQuest(groupId: String): Void? {
+        return process { apiService.leaveQuest(groupId) }
+    }
+
+    override suspend fun validatePurchase(request: PurchaseValidationRequest): PurchaseValidationResult? {
+        return process { apiService.validatePurchase(request) }
+    }
+
+    override suspend fun changeCustomDayStart(updateObject: Map<String, Any>): User? {
+        return process { apiService.changeCustomDayStart(updateObject) }
+    }
+
+    override suspend fun getMember(memberId: String) = processResponse(apiService.getMember(memberId))
+    override suspend fun getMemberWithUsername(username: String) = processResponse(apiService.getMemberWithUsername(username))
+
+    override suspend fun getMemberAchievements(memberId: String): List<Achievement>? {
+        return process { apiService.getMemberAchievements(memberId, languageCode) }
+    }
+
+    override suspend fun findUsernames(username: String, context: String?, id: String?): List<FindUsernameResult>? {
+        return process { apiService.findUsernames(username, context, id) }
+    }
+
+    override suspend fun postPrivateMessage(messageDetails: Map<String, String>): PostChatMessageResult? {
+        return process { apiService.postPrivateMessage(messageDetails) }
+    }
+
+    override suspend fun retrieveShopIventory(identifier: String): Shop? {
+        return process { apiService.retrieveShopInventory(identifier, languageCode) }
+    }
+
+    override suspend fun addPushDevice(pushDeviceData: Map<String, String>): List<Void>? {
+        return process { apiService.addPushDevice(pushDeviceData) }
+    }
+
+    override suspend fun deletePushDevice(regId: String): List<Void>? {
+        return process { apiService.deletePushDevice(regId) }
+    }
+
+    override suspend fun getUserChallenges(page: Int, memberOnly: Boolean): List<Challenge>? {
+        return if (memberOnly) {
+            process { apiService.getUserChallenges(page, memberOnly) }
+        } else {
+            process { apiService.getUserChallenges(page) }
+        }
+    }
+
+    override suspend fun getChallengeTasks(challengeId: String): TaskList? {
+        return process { apiService.getChallengeTasks(challengeId) }
+    }
+
+    override suspend fun getChallenge(challengeId: String): Challenge? {
+        return process { apiService.getChallenge(challengeId) }
+    }
+
+    override suspend fun joinChallenge(challengeId: String): Challenge? {
+        return process { apiService.joinChallenge(challengeId) }
+    }
+
+    override suspend fun leaveChallenge(challengeId: String, body: LeaveChallengeBody): Void? {
+        return process { apiService.leaveChallenge(challengeId, body) }
+    }
+
+    override suspend fun createChallenge(challenge: Challenge): Challenge? {
+        return process { apiService.createChallenge(challenge) }
+    }
+
+    override suspend fun createChallengeTasks(challengeId: String, tasks: List<Task>): List<Task>? {
+        return process { apiService.createChallengeTasks(challengeId, tasks) }
+    }
+
+    override suspend fun createChallengeTask(challengeId: String, task: Task): Task? {
+        return process { apiService.createChallengeTask(challengeId, task) }
+    }
+
+    override suspend fun updateChallenge(challenge: Challenge): Challenge? {
+        return process { apiService.updateChallenge(challenge.id ?: "", challenge) }
+    }
+
+    override suspend fun deleteChallenge(challengeId: String): Void? {
+        return process { apiService.deleteChallenge(challengeId) }
+    }
+
+    override suspend fun debugAddTenGems(): Void? {
+        return process { apiService.debugAddTenGems() }
+    }
+
+    override suspend fun readNotification(notificationId: String): List<Any>? {
+        return process { apiService.readNotification(notificationId) }
+    }
+
+    override suspend fun readNotifications(notificationIds: Map<String, List<String>>): List<Any>? {
+        return process { apiService.readNotifications(notificationIds) }
+    }
+
+    override suspend fun seeNotifications(notificationIds: Map<String, List<String>>): List<Any>? {
+        return process { apiService.seeNotifications(notificationIds) }
+    }
+
+    override suspend fun openMysteryItem(): Equipment? {
+        return process { apiService.openMysteryItem() }
+    }
+
+    override suspend fun runCron(): Void? {
+        return process { apiService.runCron() }
+    }
+
+    override suspend fun reroll(): User? = process { apiService.reroll() }
+
+    override suspend fun resetAccount(): Void? {
+        return process { apiService.resetAccount() }
+    }
+
+    override suspend fun deleteAccount(password: String): Void? {
         val updateObject = HashMap<String, String>()
         updateObject["password"] = password
-        return apiService.deleteAccount(updateObject).compose(configureApiCallObserver())
+        return process { apiService.deleteAccount(updateObject) }
     }
 
-    override fun togglePinnedItem(pinType: String, path: String): Flowable<Void> {
-        return apiService.togglePinnedItem(pinType, path).compose(configureApiCallObserver())
+    override suspend fun togglePinnedItem(pinType: String, path: String): Void? {
+        return process { apiService.togglePinnedItem(pinType, path) }
     }
 
-    override fun sendPasswordResetEmail(email: String): Flowable<Void> {
+    override suspend fun sendPasswordResetEmail(email: String): Void? {
         val data = HashMap<String, String>()
         data["email"] = email
-        return apiService.sendPasswordResetEmail(data).compose(configureApiCallObserver())
+        return process { apiService.sendPasswordResetEmail(data) }
     }
 
-    override fun updateLoginName(newLoginName: String, password: String): Flowable<Void> {
+    override suspend fun updateLoginName(newLoginName: String, password: String): Void? {
         val updateObject = HashMap<String, String>()
         updateObject["username"] = newLoginName
         updateObject["password"] = password
-        return apiService.updateLoginName(updateObject).compose(configureApiCallObserver())
+        return process { apiService.updateLoginName(updateObject) }
     }
 
-    override fun updateUsername(newLoginName: String): Flowable<Void> {
+    override suspend fun updateUsername(newLoginName: String): Void? {
         val updateObject = HashMap<String, String>()
         updateObject["username"] = newLoginName
-        return apiService.updateLoginName(updateObject).compose(configureApiCallObserver())
+        return process { apiService.updateLoginName(updateObject) }
     }
 
-    override fun verifyUsername(username: String): Flowable<VerifyUsernameResponse> {
+    override suspend fun verifyUsername(username: String): VerifyUsernameResponse? {
         val updateObject = HashMap<String, String>()
         updateObject["username"] = username
-        return this.apiService.verifyUsername(updateObject).compose(configureApiCallObserver())
+        return process { this.apiService.verifyUsername(updateObject) }
     }
 
-    override fun updateEmail(newEmail: String, password: String): Flowable<Void> {
+    override suspend fun updateEmail(newEmail: String, password: String): Void? {
         val updateObject = HashMap<String, String>()
         updateObject["newEmail"] = newEmail
         if (password.isNotBlank()) {
             updateObject["password"] = password
         }
-        return apiService.updateEmail(updateObject).compose(configureApiCallObserver())
+        return process { apiService.updateEmail(updateObject) }
     }
 
-    override fun updatePassword(
+    override suspend fun updatePassword(
         oldPassword: String,
         newPassword: String,
         newPasswordConfirmation: String
-    ): Flowable<Void> {
+    ): Void? {
         val updateObject = HashMap<String, String>()
         updateObject["password"] = oldPassword
         updateObject["newPassword"] = newPassword
         updateObject["confirmPassword"] = newPasswordConfirmation
-        return apiService.updatePassword(updateObject).compose(configureApiCallObserver())
+        return process { apiService.updatePassword(updateObject) }
     }
 
-    override fun allocatePoint(stat: String): Flowable<Stats> {
-        return apiService.allocatePoint(stat).compose(configureApiCallObserver())
+    override suspend fun allocatePoint(stat: String): Stats? {
+        return process { apiService.allocatePoint(stat) }
     }
 
-    override fun transferGems(giftedID: String, amount: Int): Flowable<Void> {
-        return apiService.transferGems(mapOf(Pair("toUserId", giftedID), Pair("gemAmount", amount))).compose(configureApiCallObserver())
+    override suspend fun transferGems(giftedID: String, amount: Int): Void? {
+        return process { apiService.transferGems(mapOf(Pair("toUserId", giftedID), Pair("gemAmount", amount))) }
     }
 
-    override fun getTeamPlans(): Flowable<List<TeamPlan>> {
-        return apiService.getTeamPlans().compose(configureApiCallObserver())
+    override suspend fun getTeamPlans(): List<TeamPlan>? {
+        return process { apiService.getTeamPlans() }
     }
 
-    override fun getTeamPlanTasks(teamID: String): Flowable<TaskList> {
-        return apiService.getTeamPlanTasks(teamID).compose(configureApiCallObserver())
+    override suspend fun getTeamPlanTasks(teamID: String): TaskList? {
+        return processResponse(apiService.getTeamPlanTasks(teamID))
     }
 
-    override fun bulkAllocatePoints(
+    override suspend fun assignToTask(taskId: String, ids: List<String>): Task? {
+        return process { apiService.assignToTask(taskId, ids) }
+    }
+
+    override suspend fun unassignFromTask(taskId: String, userID: String): Task? {
+        return process { apiService.unassignFromTask(taskId, userID) }
+    }
+
+    override suspend fun bulkAllocatePoints(
         strength: Int,
         intelligence: Int,
         constitution: Int,
         perception: Int
-    ): Flowable<Stats> {
+    ): Stats? {
         val body = HashMap<String, Map<String, Int>>()
         val stats = HashMap<String, Int>()
         stats["str"] = strength
@@ -842,15 +792,14 @@ class ApiClientImpl(
         stats["con"] = constitution
         stats["per"] = perception
         body["stats"] = stats
-        return apiService.bulkAllocatePoints(body).compose(configureApiCallObserver())
+        return process { apiService.bulkAllocatePoints(body) }
     }
 
-    override fun retrieveMarketGear(): Flowable<Shop> {
-        return apiService.retrieveMarketGear(languageCode).compose(configureApiCallObserver())
+    override suspend fun retrieveMarketGear(): Shop? {
+        return process { apiService.retrieveMarketGear(languageCode) }
     }
 
-    override val worldState: Flowable<WorldState>
-        get() = apiService.worldState.compose(configureApiCallObserver())
+    override suspend fun getWorldState(): WorldState? = process { apiService.worldState() }
 
     companion object {
         fun createGsonFactory(): GsonConverterFactory {
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 747992885..8621aa273 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
@@ -10,8 +10,7 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import io.reactivex.rxjava3.core.Flowable
-import retrofit2.HttpException
+import kotlinx.coroutines.flow.Flow
 
 class ChallengeRepositoryImpl(
     localRepository: ChallengeLocalRepository,
@@ -19,47 +18,42 @@ class ChallengeRepositoryImpl(
     userID: String
 ) : BaseRepositoryImpl<ChallengeLocalRepository>(localRepository, apiClient, userID), ChallengeRepository {
 
-    override fun isChallengeMember(challengeID: String): Flowable<Boolean> {
+    override fun isChallengeMember(challengeID: String): Flow<Boolean> {
         return localRepository.isChallengeMember(userID, challengeID)
     }
 
-    override fun getChallengepMembership(id: String): Flowable<ChallengeMembership> {
+    override fun getChallengepMembership(id: String): Flow<ChallengeMembership> {
         return localRepository.getChallengeMembership(userID, id)
     }
 
-    override fun getChallengeMemberships(): Flowable<out List<ChallengeMembership>> {
+    override fun getChallengeMemberships(): Flow<List<ChallengeMembership>> {
         return localRepository.getChallengeMemberships(userID)
     }
 
-    override fun getChallenge(challengeId: String): Flowable<Challenge> {
+    override fun getChallenge(challengeId: String): Flow<Challenge> {
         return localRepository.getChallenge(challengeId)
     }
 
-    override fun getChallengeTasks(challengeId: String): Flowable<out List<Task>> {
+    override fun getChallengeTasks(challengeId: String): Flow<List<Task>> {
         return localRepository.getTasks(challengeId)
     }
 
-    override fun retrieveChallenge(challengeID: String): Flowable<Challenge> {
-        return apiClient.getChallenge(challengeID).doOnNext {
-            localRepository.save(it)
-        }
-            .doOnError {
-                if (it is HttpException && it.code() == 404) {
-                    localRepository.getChallenge(challengeID).firstElement().subscribe { challenge ->
-                        localRepository.delete(challenge)
-                    }
-                }
-            }
+    override suspend fun retrieveChallenge(challengeID: String): Challenge? {
+        val challenge = apiClient.getChallenge(challengeID) ?: return null
+        localRepository.save(challenge)
+        return challenge
     }
 
-    override fun retrieveChallengeTasks(challengeID: String): Flowable<TaskList> {
-        return apiClient.getChallengeTasks(challengeID).doOnNext { tasks ->
+    override suspend fun retrieveChallengeTasks(challengeID: String): TaskList? {
+        val tasks = apiClient.getChallengeTasks(challengeID)
+        if (tasks != null) {
             val taskList = tasks.tasks.values.toList()
             taskList.forEach {
                 it.userId = challengeID
             }
             localRepository.save(taskList)
         }
+        return tasks
     }
 
     private fun getTaskOrders(taskList: List<Task>): TasksOrder {
@@ -81,75 +75,81 @@ class ChallengeRepositoryImpl(
         return tasksOrder
     }
 
-    private fun addChallengeTasks(challenge: Challenge, addedTaskList: List<Task>): Flowable<Challenge> {
-        return when {
-            addedTaskList.count() == 1 -> apiClient.createChallengeTask(challenge.id ?: "", addedTaskList[0]).map { challenge }
-            addedTaskList.count() > 1 -> apiClient.createChallengeTasks(challenge.id ?: "", addedTaskList).map { challenge }
-            else -> Flowable.just(challenge)
+    private  suspend fun addChallengeTasks(challenge: Challenge, addedTaskList: List<Task>) {
+        when {
+            addedTaskList.count() == 1 -> apiClient.createChallengeTask(challenge.id ?: "", addedTaskList[0])
+            addedTaskList.count() > 1 -> apiClient.createChallengeTasks(challenge.id ?: "", addedTaskList)
         }
     }
 
-    override fun createChallenge(challenge: Challenge, taskList: List<Task>): Flowable<Challenge> {
+    override suspend fun createChallenge(challenge: Challenge, taskList: List<Task>): Challenge? {
         challenge.tasksOrder = getTaskOrders(taskList)
 
-        return apiClient.createChallenge(challenge).flatMap {
-            addChallengeTasks(it, taskList)
+        val createdChallenge = apiClient.createChallenge(challenge)
+        if (createdChallenge != null) {
+            addChallengeTasks(createdChallenge, taskList)
         }
+        return createdChallenge
     }
 
-    override fun updateChallenge(
+    override suspend fun updateChallenge(
         challenge: Challenge,
         fullTaskList: List<Task>,
         addedTaskList: List<Task>,
         updatedTaskList: List<Task>,
         removedTaskList: List<String>
-    ): Flowable<Challenge> {
-
-        var flowable: Flowable<*> = Flowable.just("")
-
+    ): Challenge? {
         updatedTaskList
             .map { localRepository.getUnmanagedCopy(it) }
             .forEach { task ->
-                flowable = flowable.flatMap { apiClient.updateTask(task.id ?: "", task) }
+                apiClient.updateTask(task.id ?: "", task)
             }
 
         removedTaskList.forEach { task ->
-            flowable = flowable.flatMap { apiClient.deleteTask(task) }
+            apiClient.deleteTask(task)
         }
         if (addedTaskList.isNotEmpty()) {
-            flowable = flowable.flatMap { addChallengeTasks(challenge, addedTaskList) }
+            addChallengeTasks(challenge, addedTaskList)
         }
 
         challenge.tasksOrder = getTaskOrders(fullTaskList)
 
-        return flowable.flatMap { apiClient.updateChallenge(challenge) }
-            .doOnNext { localRepository.save(challenge) }
+        val updatedChallenges = apiClient.updateChallenge(challenge)
+        if (updatedChallenges != null) {
+            localRepository.save(updatedChallenges)
+        }
+        return updatedChallenges
     }
 
-    override fun deleteChallenge(challengeId: String): Flowable<Void> {
+    override suspend fun deleteChallenge(challengeId: String): Void? {
         return apiClient.deleteChallenge(challengeId)
     }
 
-    override fun getChallenges(): Flowable<out List<Challenge>> {
+    override fun getChallenges(): Flow<List<Challenge>> {
         return localRepository.challenges
     }
 
-    override fun getUserChallenges(userId: String?): Flowable<out List<Challenge>> {
+    override fun getUserChallenges(userId: String?): Flow<List<Challenge>> {
         return localRepository.getUserChallenges(userId ?: userID)
     }
 
-    override fun retrieveChallenges(page: Int, memberOnly: Boolean): Flowable<List<Challenge>> {
-        return apiClient.getUserChallenges(page, memberOnly)
-            .doOnNext { localRepository.saveChallenges(it, page == 0, memberOnly, userID) }
+    override suspend fun retrieveChallenges(page: Int, memberOnly: Boolean): List<Challenge>? {
+        val challenges = apiClient.getUserChallenges(page, memberOnly)
+        if (challenges != null) {
+            localRepository.saveChallenges(challenges, page == 0, memberOnly, userID)
+        }
+        return challenges
     }
 
-    override fun leaveChallenge(challenge: Challenge, keepTasks: String): Flowable<Void> {
-        return apiClient.leaveChallenge(challenge.id ?: "", LeaveChallengeBody(keepTasks))
-            .doOnNext { localRepository.setParticipating(userID, challenge.id ?: "", false) }
+    override suspend fun leaveChallenge(challenge: Challenge, keepTasks: String): Void? {
+        apiClient.leaveChallenge(challenge.id ?: "", LeaveChallengeBody(keepTasks))
+        localRepository.setParticipating(userID, challenge.id ?: "", false)
+        return null
     }
 
-    override fun joinChallenge(challenge: Challenge): Flowable<Challenge> {
-        return apiClient.joinChallenge(challenge.id ?: "")
-            .doOnNext { localRepository.setParticipating(userID, challenge.id ?: "", true) }
+    override suspend fun joinChallenge(challenge: Challenge): Challenge? {
+        val returnedChallenge = apiClient.joinChallenge(challenge.id ?: "") ?: return null
+        localRepository.setParticipating(userID, returnedChallenge.id ?: "", true)
+        return returnedChallenge
     }
 }
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 0989bc814..ba6ed961b 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
@@ -8,7 +8,8 @@ import com.habitrpg.android.habitica.helpers.AprilFoolsHandler
 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.rxjava3.core.Flowable
+import io.realm.RealmList
+import kotlinx.coroutines.flow.Flow
 import java.util.Date
 
 class ContentRepositoryImpl<T : ContentLocalRepository>(
@@ -22,37 +23,36 @@ class ContentRepositoryImpl<T : ContentLocalRepository>(
     private var lastContentSync = 0L
     private var lastWorldStateSync = 0L
 
-    override fun retrieveContent(forced: Boolean): Flowable<ContentResult> {
+    override suspend fun retrieveContent(forced: Boolean): ContentResult? {
         val now = Date().time
-        return if (forced || now - this.lastContentSync > 300000) {
+        if (forced || now - this.lastContentSync > 300000) {
+            val content = apiClient.getContent() ?: return null
             lastContentSync = now
-            apiClient.content.doOnNext {
-                it.special.add(mysteryItem)
-                localRepository.saveContent(it)
-            }
-        } else {
-            Flowable.just(ContentResult())
+            content.special = RealmList()
+            content.special.add(mysteryItem)
+            localRepository.saveContent(content)
+            return content
         }
+        return null
     }
 
-    override fun retrieveWorldState(): Flowable<WorldState> {
+    override suspend fun retrieveWorldState(): WorldState? {
         val now = Date().time
-        return if (now - this.lastWorldStateSync > 3600000) {
+        if (now - this.lastWorldStateSync > 3600000) {
+            val state = apiClient.getWorldState() ?: return null
             lastWorldStateSync = now
-            apiClient.worldState.doOnNext {
-                localRepository.saveWorldState(it)
-                for (event in it.events) {
-                    if (event.aprilFools != null && event.isCurrentlyActive) {
-                        AprilFoolsHandler.handle(event.aprilFools, event.end)
-                    }
+            localRepository.save(state)
+            for (event in state.events) {
+                if (event.aprilFools != null && event.isCurrentlyActive) {
+                    AprilFoolsHandler.handle(event.aprilFools, event.end)
                 }
             }
-        } else {
-            Flowable.just(WorldState())
+            return state
         }
+        return null
     }
 
-    override fun getWorldState(): Flowable<WorldState> {
+    override fun getWorldState(): Flow<WorldState> {
         return localRepository.getWorldState()
     }
 }
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 502e9cd64..ee17bff76 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
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.data.ApiClient
 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.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 class CustomizationRepositoryImpl(
     localRepository: CustomizationLocalRepository,
@@ -12,7 +12,7 @@ class CustomizationRepositoryImpl(
     userID: String
 ) : BaseRepositoryImpl<CustomizationLocalRepository>(localRepository, apiClient, userID), CustomizationRepository {
 
-    override fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flowable<out List<Customization>> {
+    override fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flow<List<Customization>> {
         return localRepository.getCustomizations(type, category, onlyAvailable)
     }
 }
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 eb7ef1dc9..8c74b2722 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
@@ -4,14 +4,14 @@ import com.habitrpg.android.habitica.data.ApiClient
 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.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 class FAQRepositoryImpl(localRepository: FAQLocalRepository, apiClient: ApiClient, userID: String) : BaseRepositoryImpl<FAQLocalRepository>(localRepository, apiClient, userID), FAQRepository {
-    override fun getArticle(position: Int): Flowable<FAQArticle> {
+    override fun getArticle(position: Int): Flow<FAQArticle> {
         return localRepository.getArticle(position)
     }
 
-    override fun getArticles(): Flowable<out List<FAQArticle>> {
+    override fun getArticles(): Flow<List<FAQArticle>> {
         return localRepository.articles
     }
 }
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 422e46e9c..712c970ae 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
@@ -22,8 +22,8 @@ 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 com.habitrpg.shared.habitica.models.responses.FeedResponse
-import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
 
 class InventoryRepositoryImpl(
     localRepository: InventoryLocalRepository,
@@ -31,15 +31,11 @@ class InventoryRepositoryImpl(
     userID: String,
     var appConfigManager: AppConfigManager
 ) : BaseRepositoryImpl<InventoryLocalRepository>(localRepository, apiClient, userID), InventoryRepository {
-    override fun getQuestContent(keys: List<String>): Flow<List<QuestContent>> {
-        return localRepository.getQuestContent(keys)
-    }
+    override fun getQuestContent(keys: List<String>) = localRepository.getQuestContent(keys)
 
-    override fun getQuestContent(key: String): Flowable<QuestContent> {
-        return localRepository.getQuestContent(key)
-    }
+    override fun getQuestContent(key: String) = localRepository.getQuestContent(key)
 
-    override fun getEquipment(searchedKeys: List<String>): Flowable<out List<Equipment>> {
+    override fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>> {
         return localRepository.getEquipment(searchedKeys)
     }
 
@@ -47,23 +43,27 @@ class InventoryRepositoryImpl(
         return localRepository.getArmoireRemainingCount()
     }
 
-    override fun getInAppRewards(): Flowable<out List<ShopItem>> {
+    override fun getInAppRewards(): Flow<List<ShopItem>> {
         return localRepository.getInAppRewards()
     }
 
-    override fun retrieveInAppRewards(): Flowable<List<ShopItem>> {
-        return apiClient.retrieveInAppRewards().doOnNext { localRepository.saveInAppRewards(it) }
+    override suspend fun retrieveInAppRewards(): List<ShopItem>? {
+        val rewards =  apiClient.retrieveInAppRewards()
+        if (rewards != null) {
+            localRepository.saveInAppRewards(rewards)
+        }
+        return rewards
     }
 
-    override fun getOwnedEquipment(type: String): Flowable<out List<Equipment>> {
+    override fun getOwnedEquipment(type: String): Flow<List<Equipment>> {
         return localRepository.getOwnedEquipment(type)
     }
 
-    override fun getOwnedEquipment(): Flowable<out List<Equipment>> {
+    override fun getOwnedEquipment(): Flow<List<Equipment>> {
         return localRepository.getOwnedEquipment()
     }
 
-    override fun getEquipmentType(type: String, set: String): Flowable<out List<Equipment>> {
+    override fun getEquipmentType(type: String, set: String): Flow<List<Equipment>> {
         return localRepository.getEquipmentType(type, set)
     }
 
@@ -71,36 +71,31 @@ class InventoryRepositoryImpl(
         return localRepository.getOwnedItems(itemType, userID, includeZero)
     }
 
-    override fun getOwnedItems(includeZero: Boolean): Flowable<Map<String, OwnedItem>> {
+    override fun getOwnedItems(includeZero: Boolean): Flow<Map<String, OwnedItem>> {
         return localRepository.getOwnedItems(userID, includeZero)
     }
 
-    override fun getItemsFlowable(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>> {
-        return localRepository.getItemsFlowable(itemClass, keys)
-    }
-
-    override fun getItemsFlowable(itemClass: Class<out Item>): Flowable<out List<Item>> {
-        return localRepository.getItemsFlowable(itemClass)
+    override fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>> {
+        return localRepository.getItems(itemClass, keys)
     }
 
     override fun getItems(itemClass: Class<out Item>): Flow<List<Item>> {
         return localRepository.getItems(itemClass)
     }
 
-    override fun getEquipment(key: String): Flowable<Equipment> {
+    override fun getEquipment(key: String): Flow<Equipment> {
         return localRepository.getEquipment(key)
     }
 
-    override fun openMysteryItem(user: User?): Flowable<Equipment> {
-        return apiClient.openMysteryItem()
-            .flatMap { localRepository.getEquipment(it.key ?: "").firstElement().toFlowable() }
-            .doOnNext { itemData ->
-                val liveEquipment = localRepository.getLiveObject(itemData)
-                localRepository.executeTransaction {
-                    liveEquipment?.owned = true
-                }
-                localRepository.decrementMysteryItemCount(user)
-            }
+    override suspend fun openMysteryItem(user: User?): Equipment? {
+        val item = apiClient.openMysteryItem()
+        val equipment = localRepository.getEquipment(item?.key ?: "").firstOrNull() ?: return null
+        val liveEquipment = localRepository.getLiveObject(equipment)
+        localRepository.executeTransaction {
+            liveEquipment?.owned = true
+        }
+        localRepository.decrementMysteryItemCount(user)
+        return equipment
     }
 
     override fun saveEquipment(equipment: Equipment) {
@@ -135,44 +130,42 @@ class InventoryRepositoryImpl(
         localRepository.updateOwnedEquipment(user)
     }
 
-    override fun changeOwnedCount(type: String, key: String, amountToAdd: Int) {
+    override suspend fun changeOwnedCount(type: String, key: String, amountToAdd: Int) {
         localRepository.changeOwnedCount(type, key, userID, amountToAdd)
     }
 
-    override fun sellItem(type: String, key: String): Flowable<User> {
-        return localRepository.getOwnedItem(userID, type, key, true)
-            .flatMap { item -> sellItem(item) }
+    override suspend fun sellItem(type: String, key: String): User? {
+        val item = localRepository.getOwnedItem(userID, type, key, true).firstOrNull() ?: return null
+        return sellItem(item)
     }
 
-    override fun sellItem(item: OwnedItem): Flowable<User> {
-        return localRepository.getItem(item.itemType ?: "", item.key ?: "")
-            .flatMap { newItem -> sellItem(newItem, item) }
+    override suspend fun sellItem(ownedItem: OwnedItem): User? {
+        val item = localRepository.getItem(ownedItem.itemType ?: "", ownedItem.key ?: "").firstOrNull() ?: return null
+        return sellItem(item, ownedItem)
     }
 
-    override fun getLatestMysteryItem(): Flowable<Equipment> {
+    override fun getLatestMysteryItem(): Flow<Equipment> {
         return localRepository.getLatestMysteryItem()
     }
 
-    override fun getItem(type: String, key: String): Flowable<Item> {
+    override fun getItem(type: String, key: String): Flow<Item> {
         return localRepository.getItem(type, key)
     }
 
-    private fun sellItem(item: Item, ownedItem: OwnedItem): Flowable<User> {
+    private suspend fun sellItem(item: Item, ownedItem: OwnedItem): User? {
         localRepository.executeTransaction {
             val liveItem = localRepository.getLiveObject(ownedItem)
             liveItem?.numberOwned = (liveItem?.numberOwned ?: 0) - 1
         }
-        return apiClient.sellItem(item.type, item.key)
-            .map { user ->
-                localRepository.soldItem(userID, user)
-            }
+        val user = apiClient.sellItem(item.type, item.key) ?: return null
+        return localRepository.soldItem(userID, user)
     }
 
-    override fun equipGear(equipment: String, asCostume: Boolean): Flowable<Items> {
+    override suspend fun equipGear(equipment: String, asCostume: Boolean): Items? {
         return equip(if (asCostume) "costume" else "equipped", equipment)
     }
 
-    override fun equip(type: String, key: String): Flowable<Items> {
+    override suspend fun equip(type: String, key: String): Items? {
         val liveUser = localRepository.getLiveUser(userID)
 
         if (liveUser != null) {
@@ -199,116 +192,111 @@ class InventoryRepositoryImpl(
                 }
             }
         }
-        return apiClient.equipItem(type, key)
-            .doOnNext { items ->
-                if (liveUser == null) return@doOnNext
-                localRepository.modify(liveUser) { liveUser ->
-                    val newEquipped = items.gear?.equipped
-                    val oldEquipped = liveUser.items?.gear?.equipped
-                    val newCostume = items.gear?.costume
-                    val oldCostume = liveUser.items?.gear?.costume
-                    newEquipped?.let { equipped -> oldEquipped?.updateWith(equipped) }
-                    newCostume?.let { costume -> oldCostume?.updateWith(costume) }
-                    liveUser.items?.currentMount = items.currentMount
-                    liveUser.items?.currentPet = items.currentPet
-                    liveUser.balance = liveUser.balance
-                }
-            }
+        val items = apiClient.equipItem(type, key) ?: return null
+        if (liveUser == null) return null
+        localRepository.modify(liveUser) { liveUser ->
+            val newEquipped = items.gear?.equipped
+            val oldEquipped = liveUser.items?.gear?.equipped
+            val newCostume = items.gear?.costume
+            val oldCostume = liveUser.items?.gear?.costume
+            newEquipped?.let { equipped -> oldEquipped?.updateWith(equipped) }
+            newCostume?.let { costume -> oldCostume?.updateWith(costume) }
+            liveUser.items?.currentMount = items.currentMount
+            liveUser.items?.currentPet = items.currentPet
+            liveUser.balance = liveUser.balance
+        }
+        return items
     }
 
-    override fun feedPet(pet: Pet, food: Food): Flowable<FeedResponse> {
-        return apiClient.feedPet(pet.key ?: "", food.key)
-            .doOnNext { feedResponse ->
-                localRepository.feedPet(food.key, pet.key ?: "", feedResponse.value ?: 0, userID)
-            }
+    override suspend fun feedPet(pet: Pet, food: Food): FeedResponse? {
+        val feedResponse = apiClient.feedPet(pet.key ?: "", food.key) ?: return null
+        localRepository.feedPet(food.key, pet.key ?: "", feedResponse.value ?: 0, userID)
+        return feedResponse
     }
 
-    override fun hatchPet(egg: Egg, hatchingPotion: HatchingPotion, successFunction: () -> Unit): Flowable<Items> {
+    override suspend fun hatchPet(egg: Egg, hatchingPotion: HatchingPotion, successFunction: () -> Unit): Items? {
         if (appConfigManager.enableLocalChanges()) {
             localRepository.hatchPet(egg.key, hatchingPotion.key, userID)
             successFunction()
         }
-        return apiClient.hatchPet(egg.key, hatchingPotion.key)
-            .doOnNext {
-                localRepository.save(it, userID)
-                if (!appConfigManager.enableLocalChanges()) {
-                    successFunction()
-                }
-            }
+        val items = apiClient.hatchPet(egg.key, hatchingPotion.key) ?: return null
+        localRepository.save(items, userID)
+        if (!appConfigManager.enableLocalChanges()) {
+            successFunction()
+        }
+        return items
     }
 
-    override fun inviteToQuest(quest: QuestContent): Flowable<Quest> {
-        return apiClient.inviteToQuest("party", quest.key)
-            .doOnNext { localRepository.changeOwnedCount("quests", quest.key, userID, -1) }
+    override suspend fun inviteToQuest(quest: QuestContent): Quest? {
+        val newQuest = apiClient.inviteToQuest("party", quest.key)
+        localRepository.changeOwnedCount("quests", quest.key, userID, -1)
+        return newQuest
     }
 
-    override fun buyItem(user: User?, id: String, value: Double, purchaseQuantity: Int): Flowable<BuyResponse> {
-        return apiClient.buyItem(id, purchaseQuantity)
-            .doOnNext { buyResponse ->
-                if (user == null) {
-                    return@doOnNext
-                }
-                val copiedUser = localRepository.getUnmanagedCopy(user)
-                if (buyResponse.items != null) {
-                    copiedUser.items = buyResponse.items
-                }
-                if (buyResponse.hp != null) {
-                    copiedUser.stats?.hp = buyResponse.hp
-                }
-                if (buyResponse.exp != null) {
-                    copiedUser.stats?.exp = buyResponse.exp
-                }
-                if (buyResponse.mp != null) {
-                    copiedUser.stats?.mp = buyResponse.mp
-                }
-                if (buyResponse.gp != null) {
-                    copiedUser.stats?.gp = buyResponse.gp
-                } else {
-                    copiedUser.stats?.gp = copiedUser.stats?.gp ?: 0 - (value * purchaseQuantity)
-                }
-                if (buyResponse.lvl != null) {
-                    copiedUser.stats?.lvl = buyResponse.lvl
-                }
-                localRepository.save(copiedUser)
-            }
+    override suspend fun buyItem(user: User?, id: String, value: Double, purchaseQuantity: Int): BuyResponse? {
+        val buyResponse = apiClient.buyItem(id, purchaseQuantity) ?: return null
+        val foundUser = user ?: localRepository.getLiveUser(userID) ?: return buyResponse
+        val copiedUser = localRepository.getUnmanagedCopy(foundUser)
+        if (buyResponse.items != null) {
+            copiedUser.items = buyResponse.items
+        }
+        if (buyResponse.hp != null) {
+            copiedUser.stats?.hp = buyResponse.hp
+        }
+        if (buyResponse.exp != null) {
+            copiedUser.stats?.exp = buyResponse.exp
+        }
+        if (buyResponse.mp != null) {
+            copiedUser.stats?.mp = buyResponse.mp
+        }
+        if (buyResponse.gp != null) {
+            copiedUser.stats?.gp = buyResponse.gp
+        } else {
+            copiedUser.stats?.gp = (copiedUser.stats?.gp ?: 0.0) - (value * purchaseQuantity)
+        }
+        if (buyResponse.lvl != null) {
+            copiedUser.stats?.lvl = buyResponse.lvl
+        }
+        localRepository.save(copiedUser)
+        return buyResponse
     }
 
-    override fun getAvailableLimitedItems(): Flowable<List<Item>> {
+    override fun getAvailableLimitedItems(): Flow<List<Item>> {
         return localRepository.getAvailableLimitedItems()
     }
 
-    override fun retrieveShopInventory(identifier: String): Flowable<Shop> {
+    override suspend fun retrieveShopInventory(identifier: String): Shop? {
         return apiClient.retrieveShopIventory(identifier)
     }
 
-    override fun retrieveMarketGear(): Flowable<Shop> {
+    override suspend fun retrieveMarketGear(): Shop? {
         return apiClient.retrieveMarketGear()
     }
 
-    override fun purchaseMysterySet(categoryIdentifier: String): Flowable<Void> {
+    override suspend fun purchaseMysterySet(categoryIdentifier: String): Void? {
         return apiClient.purchaseMysterySet(categoryIdentifier)
     }
 
-    override fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Void> {
+    override suspend fun purchaseHourglassItem(purchaseType: String, key: String): Void? {
         return apiClient.purchaseHourglassItem(purchaseType, key)
     }
 
-    override fun purchaseQuest(key: String): Flowable<Void> {
+    override suspend fun purchaseQuest(key: String): Void? {
         return apiClient.purchaseQuest(key)
     }
 
-    override fun purchaseSpecialSpell(key: String): Flowable<Void> {
+    override suspend fun purchaseSpecialSpell(key: String): Void? {
         return apiClient.purchaseSpecialSpell(key)
     }
 
-    override fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Void> {
+    override suspend fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Void? {
         return apiClient.purchaseItem(purchaseType, key, purchaseQuantity)
     }
 
-    override fun togglePinnedItem(item: ShopItem): Flowable<List<ShopItem>> {
-        return if (!item.isValid) {
-            Flowable.empty()
-        } else apiClient.togglePinnedItem(item.pinType ?: "", item.path ?: "")
-            .flatMap { retrieveInAppRewards() }
+    override suspend fun togglePinnedItem(item: ShopItem): List<ShopItem>? {
+        if (item.isValid) {
+            apiClient.togglePinnedItem(item.pinType ?: "", item.path ?: "")
+        }
+        return retrieveInAppRewards()
     }
 }
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 30cbe18c0..a99a5fcae 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
@@ -4,7 +4,6 @@ import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.local.SocialLocalRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.members.Member
@@ -15,13 +14,10 @@ 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.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Single
-import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import retrofit2.HttpException
+import kotlinx.coroutines.flow.firstOrNull
 import java.util.UUID
 
 class SocialRepositoryImpl(
@@ -29,59 +25,45 @@ class SocialRepositoryImpl(
     apiClient: ApiClient,
     userID: String
 ) : BaseRepositoryImpl<SocialLocalRepository>(localRepository, apiClient, userID), SocialRepository {
-    override fun transferGroupOwnership(groupID: String, userID: String): Flowable<Group> {
-        return localRepository.getGroupFlowable(groupID)
-            .map {
-                val group = localRepository.getUnmanagedCopy(it)
-                group.leaderID = userID
-                group
-            }
-            .flatMap {
-                apiClient.updateGroup(it.id, it)
-            }
+    override suspend fun transferGroupOwnership(groupID: String, userID: String): Group? {
+        val group = localRepository.getGroup(groupID).first()?.let { localRepository.getUnmanagedCopy(it) }
+        group?.leaderID = userID
+        return group?.let { apiClient.updateGroup(groupID, it) }
     }
 
-    override fun removeMemberFromGroup(groupID: String, userID: String): Flowable<List<Member>> {
-        return apiClient.removeMemberFromGroup(groupID, userID)
-            .flatMap {
-                retrieveGroupMembers(groupID, true)
-            }
+    override suspend fun removeMemberFromGroup(groupID: String, userID: String): List<Member>? {
+        apiClient.removeMemberFromGroup(groupID, userID)
+        return retrievePartyMembers(groupID, true)
     }
 
-    override fun blockMember(userID: String): Flowable<List<String>> {
+    override suspend fun blockMember(userID: String): List<String>? {
         return apiClient.blockMember(userID)
     }
 
-    override fun getGroupMembership(id: String): Flowable<GroupMembership> {
-        return localRepository.getGroupMembership(userID, id)
-    }
+    override fun getGroupMembership(id: String) = localRepository.getGroupMembership(userID, id)
 
-    override fun getGroupMemberships(): Flowable<out List<GroupMembership>> {
+    override fun getGroupMemberships(): Flow<List<GroupMembership>> {
         return localRepository.getGroupMemberships(userID)
     }
 
-    override fun retrieveGroupChat(groupId: String): Single<List<ChatMessage>> {
-        return apiClient.listGroupChat(groupId)
-            .flatMap { Flowable.fromIterable(it) }
-            .map { chatMessage ->
-                chatMessage.groupId = groupId
-                chatMessage
-            }
-            .toList()
+    override suspend fun retrieveGroupChat(groupId: String): List<ChatMessage>? {
+        val messages = apiClient.listGroupChat(groupId)
+        messages?.forEach { it.groupId = groupId }
+        return messages
     }
 
-    override fun getGroupChat(groupId: String): Flowable<out List<ChatMessage>> {
+    override fun getGroupChat(groupId: String): Flow<List<ChatMessage>> {
         return localRepository.getGroupChat(groupId)
     }
 
-    override fun markMessagesSeen(seenGroupId: String) {
-        apiClient.seenMessages(seenGroupId).subscribe({ }, RxErrorHandler.handleEmptyError())
+    override suspend fun markMessagesSeen(seenGroupId: String) {
+        apiClient.seenMessages(seenGroupId)
     }
 
-    override fun flagMessage(chatMessageID: String, additionalInfo: String, groupID: String?): Flowable<Void> {
+    override suspend fun flagMessage(chatMessageID: String, additionalInfo: String, groupID: String?): Void? {
         return when {
-            chatMessageID.isBlank() -> Flowable.empty()
-            userID == BuildConfig.ANDROID_TESTING_UUID -> Flowable.empty()
+            chatMessageID.isBlank() -> return null
+            userID == BuildConfig.ANDROID_TESTING_UUID -> return null
             else -> {
                 val data = mutableMapOf<String, String>()
                 data["comment"] = additionalInfo
@@ -94,113 +76,105 @@ class SocialRepositoryImpl(
         }
     }
 
-    override fun likeMessage(chatMessage: ChatMessage): Flowable<ChatMessage> {
+    override suspend fun likeMessage(chatMessage: ChatMessage): ChatMessage? {
         if (chatMessage.id.isBlank()) {
-            return Flowable.empty()
+            return null
         }
         val liked = chatMessage.userLikesMessage(userID)
         if (chatMessage.isManaged) {
             localRepository.likeMessage(chatMessage, userID, !liked)
         }
-        return apiClient.likeMessage(chatMessage.groupId ?: "", chatMessage.id)
-            .map {
-                it.groupId = chatMessage.groupId
-                it
-            }
+        val message = apiClient.likeMessage(chatMessage.groupId ?: "", chatMessage.id)
+        message?.groupId = chatMessage.groupId
+        return null
     }
 
-    override fun deleteMessage(chatMessage: ChatMessage): Flowable<Void> {
-        return if (chatMessage.isInboxMessage) {
+    override suspend fun deleteMessage(chatMessage: ChatMessage): Void? {
+        if (chatMessage.isInboxMessage) {
             apiClient.deleteInboxMessage(chatMessage.id)
         } else {
             apiClient.deleteMessage(chatMessage.groupId ?: "", chatMessage.id)
-        }.doOnNext { localRepository.deleteMessage(chatMessage.id) }
+        }
+        localRepository.deleteMessage(chatMessage.id)
+        return null
     }
 
-    override fun postGroupChat(groupId: String, messageObject: HashMap<String, String>): Flowable<PostChatMessageResult> {
-        return apiClient.postGroupChat(groupId, messageObject)
-            .map { postChatMessageResult ->
-                postChatMessageResult.message.groupId = groupId
-                postChatMessageResult
-            }
+    override suspend fun postGroupChat(groupId: String, messageObject: HashMap<String, String>): PostChatMessageResult? {
+        val result = apiClient.postGroupChat(groupId, messageObject)
+        result?.message?.groupId = groupId
+        return result
     }
 
-    override fun postGroupChat(groupId: String, message: String): Flowable<PostChatMessageResult> {
+    override suspend fun postGroupChat(groupId: String, message: String): PostChatMessageResult? {
         val messageObject = HashMap<String, String>()
         messageObject["message"] = message
         return postGroupChat(groupId, messageObject)
     }
 
-    override fun retrieveGroup(id: String): Flowable<Group> {
-        return Flowable.zip(
-            apiClient.getGroup(id).doOnNext { localRepository.saveGroup(it) },
-            retrieveGroupChat(id)
-                .toFlowable()
-        ) { group, _ ->
-            group
-        }.doOnError {
-            if (it is HttpException && it.code() == 404) {
-                MainScope().launch {
-                    val group = localRepository.getGroup(id).first()
-                    if (group != null) {
-                        localRepository.delete(group)
-                    }
-                }
-            }
-        }
+    override suspend fun retrieveGroup(id: String): Group? {
+        val group = apiClient.getGroup(id)
+        group?.let { localRepository.saveGroup(it) }
+        retrieveGroupChat(id)
+        return group
     }
 
-    override fun getGroup(id: String?) = id?.let { localRepository.getGroup(it) } ?: emptyFlow()
-    override fun getGroupFlowable(id: String?): Flowable<Group> = id?.let { localRepository.getGroupFlowable(it) } ?: Flowable.empty()
-
-    override fun leaveGroup(id: String?, keepChallenges: Boolean): Flowable<Group> {
+    override fun getGroup(id: String?): Flow<Group?> {
         if (id?.isNotBlank() != true) {
-            return Flowable.empty()
+            return emptyFlow()
         }
-        return apiClient.leaveGroup(id, if (keepChallenges) "remain-in-challenges" else "leave-challenges")
-            .doOnNext { localRepository.updateMembership(userID, id, false) }
-            .flatMapMaybe { localRepository.getGroupFlowable(id).firstElement() }
+        return localRepository.getGroup(id)
     }
 
-    override fun joinGroup(id: String?): Flowable<Group> {
+    override suspend fun leaveGroup(id: String?, keepChallenges: Boolean): Group? {
         if (id?.isNotBlank() != true) {
-            return Flowable.empty()
+            return null
         }
-        return apiClient.joinGroup(id)
-            .doOnNext { group ->
-                localRepository.updateMembership(userID, id, true)
-                localRepository.save(group)
-            }
+
+        apiClient.leaveGroup(id, if (keepChallenges) "remain-in-challenges" else "leave-challenges")
+        localRepository.updateMembership(userID, id, false)
+        return localRepository.getGroup(id).firstOrNull()
     }
 
-    override fun createGroup(
+    override suspend fun joinGroup(id: String?): Group? {
+        if (id?.isNotBlank() != true) {
+            return null
+        }
+        val group = apiClient.joinGroup(id)
+        group?.let {
+            localRepository.updateMembership(userID, id, true)
+            localRepository.save(group)
+        }
+        return group
+    }
+
+    override suspend fun createGroup(
         name: String?,
         description: String?,
         leader: String?,
         type: String?,
         privacy: String?,
         leaderCreateChallenge: Boolean?
-    ): Flowable<Group> {
+    ): Group? {
         val group = Group()
         group.name = name
         group.description = description
         group.type = type
         group.leaderID = leader
         group.privacy = privacy
-        return apiClient.createGroup(group).doOnNext {
-            localRepository.save(it)
-        }
+        val savedGroup = apiClient.createGroup(group)
+        savedGroup?.let { localRepository.save(it) }
+        return savedGroup
     }
 
-    override fun updateGroup(
+    override suspend fun updateGroup(
         group: Group?,
         name: String?,
         description: String?,
         leader: String?,
         leaderCreateChallenge: Boolean?
-    ): Flowable<Group> {
+    ): Group? {
         if (group == null) {
-            return Flowable.empty()
+            return null
         }
         val copiedGroup = localRepository.getUnmanagedCopy(group)
         copiedGroup.name = name
@@ -211,65 +185,67 @@ class SocialRepositoryImpl(
         return apiClient.updateGroup(copiedGroup.id, copiedGroup)
     }
 
-    override fun retrieveGroups(type: String): Flowable<List<Group>> {
-        return apiClient.listGroups(type)
-            .doOnNext { groups ->
-                if ("guilds" == type) {
-                    val memberships = groups.map {
-                        GroupMembership(userID, it.id)
-                    }
-                    localRepository.saveGroupMemberships(userID, memberships)
-                }
-                localRepository.save(groups)
+    override suspend fun retrieveGroups(type: String): List<Group>? {
+        val groups = apiClient.listGroups(type) ?: return null
+        if ("guilds" == type) {
+            val memberships = groups.map {
+                GroupMembership(userID, it.id)
             }
-    }
-
-    override fun getGroups(type: String): Flowable<out List<Group>> = localRepository.getGroups(type)
-
-    override fun getPublicGuilds(): Flowable<out List<Group>> = localRepository.getPublicGuilds()
-
-    override fun getInboxConversations(): Flowable<out List<InboxConversation>> = localRepository.getInboxConversation(userID)
-
-    override fun getInboxMessages(replyToUserID: String?): Flowable<out List<ChatMessage>> = localRepository.getInboxMessages(userID, replyToUserID)
-
-    override fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>> {
-        return apiClient.retrieveInboxMessages(uuid, page).doOnNext { messages ->
-            messages.forEach {
-                it.isInboxMessage = true
-            }
-            localRepository.saveInboxMessages(userID, uuid, messages, page)
+            localRepository.saveGroupMemberships(userID, memberships)
         }
+        localRepository.save(groups)
+        return groups
     }
 
-    override fun retrieveInboxConversations(): Flowable<List<InboxConversation>> {
-        return apiClient.retrieveInboxConversations().doOnNext { conversations ->
-            localRepository.saveInboxConversations(userID, conversations)
+    override fun getGroups(type: String) = localRepository.getGroups(type)
+
+    override fun getPublicGuilds() = localRepository.getPublicGuilds()
+
+    override fun getInboxConversations() = localRepository.getInboxConversation(userID)
+
+    override fun getInboxMessages(replyToUserID: String?) = localRepository.getInboxMessages(userID, replyToUserID)
+
+    override suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>? {
+        val messages = apiClient.retrieveInboxMessages(uuid, page) ?: return null
+        messages.forEach {
+            it.isInboxMessage = true
         }
+        localRepository.saveInboxMessages(userID, uuid, messages, page)
+        return messages
     }
 
-    override fun postPrivateMessage(recipientId: String, messageObject: HashMap<String, String>): Flowable<List<ChatMessage>> {
-        return apiClient.postPrivateMessage(messageObject).flatMap { retrieveInboxMessages(recipientId, 0) }
+    override suspend fun retrieveInboxConversations(): List<InboxConversation>? {
+        val conversations = apiClient.retrieveInboxConversations() ?: return null
+        localRepository.saveInboxConversations(userID, conversations)
+        return conversations
     }
 
-    override fun postPrivateMessage(recipientId: String, message: String): Flowable<List<ChatMessage>> {
+    override suspend fun postPrivateMessage(recipientId: String, messageObject: HashMap<String, String>): List<ChatMessage>? {
+        apiClient.postPrivateMessage(messageObject)
+        return retrieveInboxMessages(recipientId, 0)
+    }
+
+    override suspend fun postPrivateMessage(recipientId: String, message: String): List<ChatMessage>? {
         val messageObject = HashMap<String, String>()
         messageObject["message"] = message
         messageObject["toUserId"] = recipientId
         return postPrivateMessage(recipientId, messageObject)
     }
 
-    override fun getGroupMembers(id: String) = localRepository.getGroupMembers(id)
+    override suspend fun getPartyMembers(id: String) = localRepository.getPartyMembers(id)
+    override suspend fun getGroupMembers(id: String) = localRepository.getGroupMembers(id)
 
-    override fun retrieveGroupMembers(id: String, includeAllPublicFields: Boolean): Flowable<List<Member>> {
-        return apiClient.getGroupMembers(id, includeAllPublicFields)
-            .doOnNext { members -> localRepository.saveGroupMembers(id, members) }
+    override suspend fun retrievePartyMembers(id: String, includeAllPublicFields: Boolean): List<Member>? {
+        val members = apiClient.getGroupMembers(id, includeAllPublicFields)
+        members?.let { localRepository.savePartyMembers(id, it) }
+        return members
     }
 
-    override fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<List<Void>> = apiClient.inviteToGroup(id, inviteData)
+    override suspend fun inviteToGroup(id: String, inviteData: Map<String, Any>) = apiClient.inviteToGroup(id, inviteData)
 
-    override fun getMember(userId: String?): Flowable<Member> {
+    override suspend fun retrieveMember(userId: String?): Member? {
         return if (userId == null) {
-            Flowable.empty()
+            null
         } else {
             try {
                 apiClient.getMember(UUID.fromString(userId).toString())
@@ -279,15 +255,15 @@ class SocialRepositoryImpl(
         }
     }
 
-    override fun getMemberWithUsername(username: String?): Flowable<Member> {
-        return getMember(username)
+    override suspend fun retrieveMemberWithUsername(username: String?): Member? {
+        return retrieveMember(username)
     }
 
-    override fun findUsernames(username: String, context: String?, id: String?): Flowable<List<FindUsernameResult>> {
+    override suspend fun findUsernames(username: String, context: String?, id: String?): List<FindUsernameResult>? {
         return apiClient.findUsernames(username, context, id)
     }
 
-    override fun markPrivateMessagesRead(user: User?): Flowable<Void> {
+    override suspend fun markPrivateMessagesRead(user: User?): Void? {
         if (user?.isManaged == true) {
             localRepository.modify(user) {
                 it.inbox?.hasUserSeenInbox = true
@@ -315,59 +291,59 @@ class SocialRepositoryImpl(
         }
     }
 
-    override fun getUserGroups(type: String?): Flowable<out List<Group>> = localRepository.getUserGroups(userID, type)
+    override fun getUserGroups(type: String?) = localRepository.getUserGroups(userID, type)
 
-    override fun acceptQuest(user: User?, partyId: String): Flowable<Void> {
-        return apiClient.acceptQuest(partyId)
-            .doOnNext {
-                user?.let {
-                    localRepository.updateRSVPNeeded(it, false)
-                }
+    override suspend fun acceptQuest(user: User?, partyId: String): Void? {
+        apiClient.acceptQuest(partyId)
+            user?.let {
+                localRepository.updateRSVPNeeded(it, false)
             }
+        return null
     }
 
-    override fun rejectQuest(user: User?, partyId: String): Flowable<Void> {
-        return apiClient.rejectQuest(partyId)
-            .doOnNext { _ ->
-                user?.let {
-                    localRepository.updateRSVPNeeded(it, false)
-                }
+    override suspend fun rejectQuest(user: User?, partyId: String): Void? {
+        apiClient.rejectQuest(partyId)
+            user?.let {
+                localRepository.updateRSVPNeeded(it, false)
             }
+        return null
     }
 
-    override fun leaveQuest(partyId: String): Flowable<Void> {
+    override suspend fun leaveQuest(partyId: String): Void? {
         return apiClient.leaveQuest(partyId)
     }
 
-    override fun cancelQuest(partyId: String): Flowable<Void> {
-        return apiClient.cancelQuest(partyId)
-            .doOnNext { localRepository.removeQuest(partyId) }
+    override suspend fun cancelQuest(partyId: String): Void? {
+        apiClient.cancelQuest(partyId)
+        localRepository.removeQuest(partyId)
+        return null
     }
 
-    override fun abortQuest(partyId: String): Flowable<Quest> {
-        return apiClient.abortQuest(partyId)
-            .doOnNext { localRepository.removeQuest(partyId) }
+    override suspend fun abortQuest(partyId: String): Quest? {
+        val quest = apiClient.abortQuest(partyId)
+        localRepository.removeQuest(partyId)
+        return quest
     }
 
-    override fun rejectGroupInvite(groupId: String): Flowable<Void> {
-        return apiClient.rejectGroupInvite(groupId)
-            .doOnNext {
-                localRepository.rejectGroupInvitation(userID, groupId)
-            }
+    override suspend fun rejectGroupInvite(groupId: String): Void? {
+        apiClient.rejectGroupInvite(groupId)
+        localRepository.rejectGroupInvitation(userID, groupId)
+        return null
     }
 
-    override fun forceStartQuest(party: Group): Flowable<Quest> {
-        return apiClient.forceStartQuest(party.id, localRepository.getUnmanagedCopy(party))
-            .doOnNext { localRepository.setQuestActivity(party, true) }
+    override suspend fun forceStartQuest(party: Group): Quest? {
+        val quest = apiClient.forceStartQuest(party.id, localRepository.getUnmanagedCopy(party))
+        localRepository.setQuestActivity(party, true)
+        return quest
     }
 
-    override fun getMemberAchievements(userId: String?): Flowable<List<Achievement>> {
+    override suspend fun getMemberAchievements(userId: String?): List<Achievement>? {
         return if (userId == null) {
-            Flowable.empty()
+            null
         } else apiClient.getMemberAchievements(userId)
     }
 
-    override fun transferGems(giftedID: String, amount: Int): Flowable<Void> {
+    override suspend fun transferGems(giftedID: String, amount: Int): Void? {
         return apiClient.transferGems(giftedID, amount)
     }
 }
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 e70a7f83c..ff56233b0 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,58 +4,53 @@ 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.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Single
+import kotlinx.coroutines.flow.Flow
 
 class TagRepositoryImpl(localRepository: TagLocalRepository, apiClient: ApiClient, userID: String) : BaseRepositoryImpl<TagLocalRepository>(localRepository, apiClient, userID), TagRepository {
 
-    override fun getTags(): Flowable<out List<Tag>> {
+    override fun getTags(): Flow<List<Tag>> {
         return getTags(userID)
     }
 
-    override fun getTags(userId: String): Flowable<out List<Tag>> {
+    override fun getTags(userId: String): Flow<List<Tag>> {
         return localRepository.getTags(userId)
     }
 
-    override fun createTag(tag: Tag): Flowable<Tag> {
-        return apiClient.createTag(tag)
-            .doOnNext {
-                it.userId = userID
-                localRepository.save(it)
-            }
+    override suspend fun createTag(tag: Tag): Tag? {
+        val savedTag = apiClient.createTag(tag) ?: return null
+        savedTag.userId = userID
+        localRepository.save(savedTag)
+        return savedTag
     }
 
-    override fun updateTag(tag: Tag): Flowable<Tag> {
-        return apiClient.updateTag(tag.id, tag)
-            .doOnNext {
-                it.userId = userID
-                localRepository.save(it)
-            }
+    override suspend fun updateTag(tag: Tag): Tag? {
+        val savedTag = apiClient.updateTag(tag.id, tag) ?: return null
+        savedTag.userId = userID
+        localRepository.save(savedTag)
+        return savedTag
     }
 
-    override fun deleteTag(id: String): Flowable<Void> {
-        return apiClient.deleteTag(id)
-            .doOnNext {
-                localRepository.deleteTag(id)
-            }
+    override suspend fun deleteTag(id: String): Void? {
+        apiClient.deleteTag(id)
+        localRepository.deleteTag(id)
+        return null
     }
 
-    override fun createTags(tags: Collection<Tag>): Single<List<Tag>> {
-        return Flowable.defer { Flowable.fromIterable(tags) }
-            .filter { tag -> tag.name.isNotEmpty() }
-            .flatMap { this.createTag(it) }
-            .toList()
+    override suspend fun createTags(tags: Collection<Tag>): List<Tag> {
+        return tags.mapNotNull {
+            createTag(it)
+        }
     }
 
-    override fun updateTags(tags: Collection<Tag>): Single<List<Tag>> {
-        return Flowable.defer { Flowable.fromIterable(tags) }
-            .flatMap { this.updateTag(it) }
-            .toList()
+    override suspend fun updateTags(tags: Collection<Tag>): List<Tag> {
+        return tags.mapNotNull {
+            updateTag(it)
+        }
     }
 
-    override fun deleteTags(tagIds: Collection<String>): Single<List<Void>> {
-        return Flowable.defer { Flowable.fromIterable(tagIds) }
-            .flatMap { this.deleteTag(it) }
-            .toList()
+    override suspend fun deleteTags(tagIds: Collection<String>): List<Void> {
+        return tagIds.mapNotNull {
+            deleteTag(it)
+        }
     }
 }
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 b01a08b23..f6a56a701 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
@@ -5,25 +5,24 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.TaskRepository
 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.helpers.launchCatching
 import com.habitrpg.android.habitica.interactors.ScoreTaskLocallyInteractor
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Maybe
-import io.reactivex.rxjava3.core.Single
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -42,40 +41,38 @@ class TaskRepositoryImpl(
     override fun getTasks(taskType: TaskType, userID: String?, includedGroupIDs: Array<String>): Flow<List<Task>> =
         this.localRepository.getTasks(taskType, userID ?: this.userID, includedGroupIDs)
 
-    override fun getTasksFlowable(taskType: TaskType, userID: String?, includedGroupIDs: Array<String>): Flowable<out List<Task>> =
-        this.localRepository.getTasksFlowable(taskType, userID ?: this.userID, includedGroupIDs)
-
     override fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList) {
         localRepository.saveTasks(userId, order, tasks)
     }
 
-    override fun retrieveTasks(userId: String, tasksOrder: TasksOrder): Flowable<TaskList> {
-        return this.apiClient.tasks
-            .doOnNext { res -> this.localRepository.saveTasks(userId, tasksOrder, res) }
+    override suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder): TaskList? {
+        val tasks = apiClient.getTasks() ?: return null
+        this.localRepository.saveTasks(userId, tasksOrder, tasks)
+        return tasks
     }
 
-    override fun retrieveCompletedTodos(userId: String?): Flowable<TaskList> {
-        return this.apiClient.getTasks("completedTodos")
-            .doOnNext { taskList ->
-                val tasks = taskList.tasks
-                this.localRepository.saveCompletedTodos(userId ?: this.userID, tasks.values)
-            }
+    override suspend fun retrieveCompletedTodos(userId: String?): TaskList? {
+        val taskList = this.apiClient.getTasks("completedTodos") ?: return null
+        val tasks = taskList.tasks
+        this.localRepository.saveCompletedTodos(userId ?: this.userID, tasks.values)
+        return taskList
     }
 
-    override fun retrieveTasks(userId: String, tasksOrder: TasksOrder, dueDate: Date): Flowable<TaskList> {
+    override suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder, dueDate: Date): TaskList? {
         val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ", Locale.US)
-        return this.apiClient.getTasks("dailys", formatter.format(dueDate))
-            .doOnNext { res -> this.localRepository.saveTasks(userId, tasksOrder, res) }
+        val taskList = this.apiClient.getTasks("dailys", formatter.format(dueDate)) ?: return null
+        this.localRepository.saveTasks(userId, tasksOrder, taskList)
+        return taskList
     }
 
     @Suppress("ReturnCount")
-    override fun taskChecked(
+    override suspend fun taskChecked(
         user: User?,
         task: Task,
         up: Boolean,
         force: Boolean,
         notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): Flowable<TaskScoringResult> {
+    ): TaskScoringResult? {
         val localData = if (user != null && appConfigManager.enableLocalTaskScoring()) {
             ScoreTaskLocallyInteractor.score(user, task, if (up) TaskDirection.UP else TaskDirection.DOWN)
         } else null
@@ -89,44 +86,36 @@ class TaskRepositoryImpl(
         val now = Date().time
         val id = task.id
         if (lastTaskAction > now - 500 && !force || id == null) {
-            return Flowable.empty()
+            return null
         }
 
         lastTaskAction = now
-        return this.apiClient.postTaskDirection(id, (if (up) TaskDirection.UP else TaskDirection.DOWN).text)
-            .flatMapMaybe {
-                // There are cases where the user object is not set correctly. So the app refetches it as a fallback
-                if (user == null) {
-                    localRepository.getUser(userID).firstElement()
-                } else {
-                    Maybe.just(user)
-                }.map { user -> Pair(it, user) }
-            }
-            .map { (res, user): Pair<TaskDirectionData, User> ->
-                // save local task changes
+        val res = this.apiClient.postTaskDirection(id, (if (up) TaskDirection.UP else TaskDirection.DOWN).text) ?: return null
+        // There are cases where the user object is not set correctly. So the app refetches it as a fallback
+        val thisUser = user ?: localRepository.getUser(userID).firstOrNull() ?: return null
+        // save local task changes
 
-                analyticsManager.logEvent(
-                    "task_scored",
-                    bundleOf(
-                        Pair("type", task.type),
-                        Pair("scored_up", up),
-                        Pair("value", task.value)
-                    )
-                )
-                if (res.lvl == 0) {
-                    // Team tasks that require approval have weird data that we should just ignore.
-                    return@map TaskScoringResult()
-                }
-                val result = TaskScoringResult(res, user.stats)
-                if (localData == null) {
-                    notifyFunc?.invoke(result)
-                }
-                handleTaskResponse(user, res, task, up, localData?.delta ?: 0f)
-                result
-            }
+        analyticsManager.logEvent(
+            "task_scored",
+            bundleOf(
+                Pair("type", task.type),
+                Pair("scored_up", up),
+                Pair("value", task.value)
+            )
+        )
+        if (res.lvl == 0) {
+            // Team tasks that require approval have weird data that we should just ignore.
+            return TaskScoringResult()
+        }
+        val result = TaskScoringResult(res, thisUser.stats)
+        if (localData == null) {
+            notifyFunc?.invoke(result)
+        }
+        handleTaskResponse(thisUser, res, task, up, localData?.delta ?: 0f)
+        return result
     }
 
-    override fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData> {
+    override suspend fun bulkScoreTasks(data: List<Map<String, String>>): BulkTaskScoringData? {
         return apiClient.bulkScoreTasks(data)
     }
 
@@ -143,9 +132,13 @@ class TaskRepositoryImpl(
             if (bgTask.type != TaskType.REWARD && (bgTask.value - localDelta) + res.delta != bgTask.value) {
                 bgTask.value = (bgTask.value - localDelta) + res.delta
                 if (TaskType.DAILY == bgTask.type || TaskType.TODO == bgTask.type) {
-                    bgTask.completed = up
-                    if (TaskType.DAILY == bgTask.type && up) {
-                        bgTask.streak = (bgTask.streak ?: 0) + 1
+                    bgTask.completeForUser(userID, up)
+                    if (TaskType.DAILY == bgTask.type) {
+                        if (up) {
+                            bgTask.streak = (bgTask.streak ?: 0) + 1
+                        } else {
+                            bgTask.streak = (bgTask.streak ?: 0) - 1
+                        }
                     }
                 } else if (TaskType.HABIT == bgTask.type) {
                     if (up) {
@@ -190,36 +183,34 @@ class TaskRepositoryImpl(
         }
     }
 
-    override fun taskChecked(
+    override suspend fun taskChecked(
         user: User?,
         taskId: String,
         up: Boolean,
         force: Boolean,
         notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): Maybe<TaskScoringResult> {
-        return localRepository.getTask(taskId).firstElement()
-            .flatMap { task -> taskChecked(user, task, up, force, notifyFunc).singleElement() }
+    ): TaskScoringResult? {
+        val task = localRepository.getTask(taskId).firstOrNull() ?: return null
+        return taskChecked(user, task, up, force, notifyFunc)
     }
 
-    override fun scoreChecklistItem(taskId: String, itemId: String): Flowable<Task> {
-        return apiClient.scoreChecklistItem(taskId, itemId)
-            .flatMapMaybe { localRepository.getTask(taskId).firstElement() }
-            .doOnNext { task ->
-                val updatedItem: ChecklistItem? = task.checklist?.lastOrNull { itemId == it.id }
-                if (updatedItem != null) {
-                    localRepository.modify(updatedItem) { liveItem -> liveItem.completed = !liveItem.completed }
-                }
-            }
+    override suspend fun scoreChecklistItem(taskId: String, itemId: String): Task? {
+        val task = apiClient.scoreChecklistItem(taskId, itemId)
+        val updatedItem: ChecklistItem? = task?.checklist?.lastOrNull { itemId == it.id }
+        if (updatedItem != null) {
+            localRepository.modify(updatedItem) { liveItem -> liveItem.completed = !liveItem.completed }
+        }
+        return task
     }
 
-    override fun getTask(taskId: String): Flowable<Task> = localRepository.getTask(taskId)
+    override fun getTask(taskId: String) = localRepository.getTask(taskId)
 
-    override fun getTaskCopy(taskId: String): Flowable<Task> = localRepository.getTaskCopy(taskId)
+    override fun getTaskCopy(taskId: String) = localRepository.getTaskCopy(taskId)
 
-    override fun createTask(task: Task, force: Boolean): Flowable<Task> {
+    override suspend fun createTask(task: Task, force: Boolean): Task? {
         val now = Date().time
         if (lastTaskAction > now - 500 && !force) {
-            return Flowable.empty()
+            return null
         }
         lastTaskAction = now
 
@@ -232,61 +223,56 @@ class TaskRepositoryImpl(
         }
         localRepository.saveSyncronous(task)
 
-        return apiClient.createTask(task)
-            .map { task1 ->
-                task1.dateCreated = Date()
-                task1
-            }
-            .doOnNext {
-                it.tags = task.tags
-                localRepository.save(it)
-            }
-            .doOnError {
-                task.hasErrored = true
-                task.isSaving = false
-                localRepository.saveSyncronous(task)
-            }
+        val savedTask = apiClient.createTask(task)
+        savedTask?.dateCreated = Date()
+        if (savedTask != null) {
+            savedTask.tags = task.tags
+            localRepository.save(savedTask)
+        } else {
+            task.hasErrored = true
+            task.isSaving = false
+            localRepository.saveSyncronous(task)
+        }
+        return savedTask
     }
 
     @Suppress("ReturnCount")
-    override fun updateTask(task: Task, force: Boolean): Maybe<Task> {
+    override suspend fun updateTask(task: Task, force: Boolean): Task? {
         val now = Date().time
         if ((lastTaskAction > now - 500 && !force) || !task.isValid) {
-            return Maybe.just(task)
+            return task
         }
         lastTaskAction = now
-        val id = task.id ?: return Maybe.just(task)
+        val id = task.id ?: return task
         val unmanagedTask = localRepository.getUnmanagedCopy(task)
         unmanagedTask.isSaving = true
         unmanagedTask.hasErrored = false
         localRepository.saveSyncronous(unmanagedTask)
-        return apiClient.updateTask(id, unmanagedTask).singleElement()
-            .map { task1 ->
-                task1.position = task.position
-                task1.id = task.id
-                task1
-            }
-            .doOnSuccess {
-                it.tags = task.tags
-                localRepository.save(it)
-            }
-            .doOnError {
-                unmanagedTask.hasErrored = true
-                unmanagedTask.isSaving = false
-                localRepository.saveSyncronous(unmanagedTask)
-            }
+        val savedTask = apiClient.updateTask(id, unmanagedTask)
+        savedTask?.position = task.position
+        savedTask?.id = task.id
+        if (savedTask != null) {
+            savedTask.tags = task.tags
+            localRepository.save(savedTask)
+        } else {
+            unmanagedTask.hasErrored = true
+            unmanagedTask.isSaving = false
+            localRepository.saveSyncronous(unmanagedTask)
+        }
+        return savedTask
     }
 
-    override fun deleteTask(taskId: String): Flowable<Void> {
-        return apiClient.deleteTask(taskId)
-            .doOnNext { localRepository.deleteTask(taskId) }
+    override suspend fun deleteTask(taskId: String): Void? {
+        apiClient.deleteTask(taskId) ?: return null
+        localRepository.deleteTask(taskId)
+        return null
     }
 
     override fun saveTask(task: Task) {
         localRepository.save(task)
     }
 
-    override fun createTasks(newTasks: List<Task>): Flowable<List<Task>> = apiClient.createTasks(newTasks)
+    override suspend fun createTasks(newTasks: List<Task>) = apiClient.createTasks(newTasks)
 
     override fun markTaskCompleted(taskId: String, isCompleted: Boolean) {
         localRepository.markTaskCompleted(taskId, isCompleted)
@@ -300,20 +286,49 @@ class TaskRepositoryImpl(
         localRepository.swapTaskPosition(firstPosition, secondPosition)
     }
 
-    override fun updateTaskPosition(taskType: TaskType, taskID: String, newPosition: Int): Maybe<List<String>> {
-        return apiClient.postTaskNewPosition(taskID, newPosition).firstElement()
-            .doOnSuccess { localRepository.updateTaskPositions(it) }
+    override suspend fun updateTaskPosition(taskType: TaskType, taskID: String, newPosition: Int): List<String>? {
+        val positions = apiClient.postTaskNewPosition(taskID, newPosition) ?: return null
+        localRepository.updateTaskPositions(positions)
+        return positions
     }
 
-    override fun getUnmanagedTask(taskid: String): Flowable<Task> =
-        getTask(taskid).map { localRepository.getUnmanagedCopy(it) }
+    override fun getUnmanagedTask(taskid: String) = getTask(taskid).map { localRepository.getUnmanagedCopy(it) }
 
-    override fun updateTaskInBackground(task: Task) {
-        updateTask(task).subscribe({ }, RxErrorHandler.handleEmptyError())
+    override fun updateTaskInBackground(task: Task, assignChanges: Map<String, MutableList<String>>) {
+        MainScope().launchCatching {
+            val updatedTask = updateTask(task) ?: return@launchCatching
+            handleAssignmentChanges(updatedTask, assignChanges)
+        }
     }
 
-    override fun createTaskInBackground(task: Task) {
-        createTask(task).subscribe({ }, RxErrorHandler.handleEmptyError())
+    override fun createTaskInBackground(task: Task, assignChanges: Map<String, MutableList<String>>) {
+        MainScope().launchCatching {
+            val createdTask = createTask(task) ?: return@launchCatching
+            handleAssignmentChanges(createdTask, assignChanges)
+        }
+    }
+
+    private suspend fun handleAssignmentChanges(task: Task, assignChanges: Map<String, MutableList<String>>) {
+        val taskID = task.id ?: return
+        assignChanges["assign"]?.let { assignments ->
+            if (assignments.isEmpty()) return@let
+            val savedTask = apiClient.assignToTask(taskID, assignments) ?: return@let
+            savedTask.id = task.id
+            savedTask.position = task.position
+            localRepository.save(task)
+        }
+
+        assignChanges["unassign"]?.let { unassignments ->
+            var savedTask: Task? = null
+            for (unassignment in unassignments) {
+                savedTask = apiClient.unassignFromTask(taskID, unassignment)
+            }
+            if (savedTask != null) {
+                savedTask.id = task.id
+                savedTask.position = task.position
+                localRepository.save(task)
+            }
+        }
     }
 
     override fun getTaskCopies(userId: String): Flow<List<Task>> =
@@ -321,29 +336,27 @@ class TaskRepositoryImpl(
 
     override fun getTaskCopies(tasks: List<Task>): List<Task> = localRepository.getUnmanagedCopy(tasks)
 
-    override fun retrieveDailiesFromDate(date: Date): Flowable<TaskList> {
+    override suspend fun retrieveDailiesFromDate(date: Date): TaskList? {
         val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ", Locale.US)
         return apiClient.getTasks("dailys", formatter.format(date))
     }
 
-    override fun syncErroredTasks(): Single<List<Task>> {
-        return localRepository.getErroredTasks(userID).firstElement()
-            .flatMapPublisher { Flowable.fromIterable(it) }
-            .map { localRepository.getUnmanagedCopy(it) }
-            .flatMap {
-                return@flatMap if (it.isCreating) {
-                    createTask(it, true)
-                } else {
-                    updateTask(it, true).toFlowable()
-                }
-            }.toList()
+    override suspend fun syncErroredTasks(): List<Task>? {
+        val tasks = localRepository.getErroredTasks(userID).firstOrNull()
+        return tasks?.map { localRepository.getUnmanagedCopy(it) }?.mapNotNull {
+            if (it.isCreating) {
+                createTask(it, true)
+            } else {
+                updateTask(it, true)
+            }
+        }
     }
 
-    override fun unlinkAllTasks(challengeID: String?, keepOption: String): Flowable<Void> {
+    override suspend fun unlinkAllTasks(challengeID: String?, keepOption: String): Void? {
         return apiClient.unlinkAllTasks(challengeID, keepOption)
     }
 
-    override fun getTasksForChallenge(challengeID: String?): Flowable<out List<Task>> {
+    override fun getTasksForChallenge(challengeID: String?): Flow<List<Task>> {
         return localRepository.getTasksForChallenge(challengeID, userID)
     }
 }
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 faa1a0455..b6bd7e63f 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.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 class TutorialRepositoryImpl(
     localRepository: TutorialLocalRepository,
@@ -12,9 +12,9 @@ class TutorialRepositoryImpl(
     userID: String
 ) : BaseRepositoryImpl<TutorialLocalRepository>(localRepository, apiClient, userID), TutorialRepository {
 
-    override fun getTutorialStep(key: String): Flowable<TutorialStep> =
+    override fun getTutorialStep(key: String): Flow<TutorialStep> =
         localRepository.getTutorialStep(key)
 
-    override fun getTutorialSteps(keys: List<String>): Flowable<out List<TutorialStep>> =
+    override fun getTutorialSteps(keys: List<String>): Flow<List<TutorialStep>> =
         localRepository.getTutorialSteps(keys)
 }
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 66c5c0500..590658941 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
@@ -1,34 +1,28 @@
 package com.habitrpg.android.habitica.data.implementation
 
-import androidx.core.os.bundleOf
 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.models.user.UserQuestStatus
-import com.habitrpg.android.habitica.extensions.filterMapEmpty
 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.responses.SkillResponse
 import com.habitrpg.android.habitica.models.responses.UnlockResponse
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
 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 com.habitrpg.android.habitica.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
-import com.habitrpg.common.habitica.extensions.Optional
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
 import com.habitrpg.shared.habitica.models.tasks.Attribute
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Maybe
-import io.reactivex.rxjava3.functions.BiFunction
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
 import java.util.Date
 import java.util.GregorianCalendar
 import java.util.concurrent.TimeUnit
@@ -45,227 +39,205 @@ class UserRepositoryImpl(
     private var lastSync: Date? = null
 
     override fun getUser(): Flow<User?> = getUser(userID)
-    override fun getUserFlowable(): Flowable<User> = localRepository.getUserFlowable(userID)
-
     override fun getUser(userID: String): Flow<User?> = localRepository.getUser(userID)
 
-    private fun updateUser(userID: String, updateData: Map<String, Any>): Flowable<User> {
-        return Flowable.zip(
-            apiClient.updateUser(updateData),
-            localRepository.getUserFlowable(userID).firstElement().toFlowable()
-        ) { newUser, user -> mergeUser(user, newUser) }
+    private suspend fun updateUser(userID: String, updateData: Map<String, Any>): User? {
+        val networkUser = apiClient.updateUser(updateData) ?: return null
+        val oldUser = localRepository.getUser(userID).firstOrNull()
+        return mergeUser(oldUser, networkUser)
     }
 
-    private fun updateUser(userID: String, key: String, value: Any): Flowable<User> {
+    private suspend fun updateUser(userID: String, key: String, value: Any): User? {
         val updateData = HashMap<String, Any>()
         updateData[key] = value
         return updateUser(userID, updateData)
     }
 
-    override fun updateUser(updateData: Map<String, Any>): Flowable<User> {
+    override suspend fun updateUser(updateData: Map<String, Any>): User? {
         return updateUser(userID, updateData)
     }
 
-    override fun updateUser(key: String, value: Any): Flowable<User> {
+    override suspend fun updateUser(key: String, value: Any): User? {
         return updateUser(userID, key, value)
     }
 
-    override fun retrieveUser(withTasks: Boolean): Flowable<User> =
-        retrieveUser(withTasks, false)
-
     @Suppress("ReturnCount")
-    override fun retrieveUser(withTasks: Boolean, forced: Boolean, overrideExisting: Boolean): Flowable<User> {
+    override suspend fun retrieveUser(withTasks: Boolean, forced: Boolean, overrideExisting: Boolean): User? {
         // Only retrieve again after 3 minutes or it's forced.
         if (forced || this.lastSync == null || Date().time - (this.lastSync?.time ?: 0) > 180000) {
+            val user = apiClient.retrieveUser(withTasks) ?: return null
             lastSync = Date()
-            return apiClient.retrieveUser(withTasks)
-                .doOnNext { localRepository.saveUser(it, overrideExisting) }
-                .doOnNext { user ->
-                    if (withTasks) {
-                        val id = user.id
-                        val tasksOrder = user.tasksOrder
-                        val tasks = user.tasks
-                        if (id != null && tasksOrder != null && tasks != null) {
-                            taskRepository.saveTasks(id, tasksOrder, tasks)
-                        }
-                    }
+            localRepository.saveUser(user)
+            if (withTasks) {
+                val id = user.id
+                val tasksOrder = user.tasksOrder
+                val tasks = user.tasks
+                if (id != null && tasksOrder != null && tasks != null) {
+                    taskRepository.saveTasks(id, tasksOrder, tasks)
                 }
-                .flatMap { user ->
-                    val calendar = GregorianCalendar()
-                    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.id ?: "", "preferences.timezoneOffset", offset.toString())
-                    } else {
-                        return@flatMap Flowable.just(user)
-                    }
-                }
-        } else {
-            return localRepository.getUserFlowable(userID).take(1)
-        }
-    }
-
-    override fun revive(): Flowable<User> = zipWithLiveUser(apiClient.revive()) { newUser, user ->
-        mergeUser(user, newUser)
-    }
-        .flatMap { retrieveUser(false, true) }
-
-    override fun resetTutorial(): Maybe<User> {
-        return localRepository.getTutorialSteps()
-            .firstElement()
-            .map<Map<String, Any>> { tutorialSteps ->
-                val updateData = HashMap<String, Any>()
-                for (step in tutorialSteps) {
-                    updateData[step.flagPath] = false
-                }
-                updateData
             }
-            .flatMap { updateData -> updateUser(updateData).firstElement() }
-    }
-
-    override fun sleep(user: User): Flowable<User> {
-        localRepository.modify(user) { it.preferences?.sleep = !(it.preferences?.sleep ?: false) }
-        return apiClient.sleep().map { user }
-    }
-
-    override fun getSkills(user: User): Flowable<out List<Skill>> =
-        localRepository.getSkills(user)
-
-    override fun getSpecialItems(user: User): Flowable<out List<Skill>> =
-        localRepository.getSpecialItems(user)
-
-    override fun useSkill(key: String, target: String?, taskId: String): Flowable<SkillResponse> {
-        return zipWithLiveUser(apiClient.useSkill(key, target ?: "", taskId)) { response, user ->
-            response.hpDiff = (response.user?.stats?.hp ?: 0.0) - (user.stats?.hp ?: 0.0)
-            response.expDiff = (response.user?.stats?.exp ?: 0.0) - (user.stats?.exp ?: 0.0)
-            response.goldDiff = (response.user?.stats?.gp ?: 0.0) - (user.stats?.gp ?: 0.0)
-            response.damage = (response.user?.party?.quest?.progress?.up ?: 0.0f) - (user.party?.quest?.progress?.up ?: 0.0f)
-            response.user?.let { mergeUser(user, it) }
-            response
+            val calendar = GregorianCalendar()
+            val timeZone = calendar.timeZone
+            val offset = -TimeUnit.MINUTES.convert(timeZone.getOffset(calendar.timeInMillis).toLong(), TimeUnit.MILLISECONDS)
+            return if (offset.toInt() != (user.preferences?.timezoneOffset ?: 0)) {
+                updateUser(user.id ?: "", "preferences.timezoneOffset", offset.toString())
+            } else {
+                user
+            }
+        } else {
+            return null
         }
     }
 
-    override fun useSkill(key: String, target: String?): Flowable<SkillResponse> {
-        return zipWithLiveUser(apiClient.useSkill(key, target ?: "")) { response, user ->
-            response.hpDiff = (response.user?.stats?.hp ?: 0.0) - (user.stats?.hp ?: 0.0)
-            response.expDiff = (response.user?.stats?.exp ?: 0.0) - (user.stats?.exp ?: 0.0)
-            response.goldDiff = (response.user?.stats?.gp ?: 0.0) - (user.stats?.gp ?: 0.0)
-            response.damage = (response.user?.party?.quest?.progress?.up ?: 0.0f) - (user.party?.quest?.progress?.up ?: 0.0f)
-            response.user?.let { mergeUser(user, it) }
-            response
+    override suspend fun revive(): User? {
+        apiClient.revive()
+        return retrieveUser(false, true)
+    }
+
+    override suspend fun resetTutorial(): User? {
+        val tutorialSteps = localRepository.getTutorialSteps().firstOrNull() ?: return null
+        val updateData = HashMap<String, Any>()
+        for (step in tutorialSteps) {
+            updateData[step.flagPath] = false
         }
+        return updateUser(updateData)
     }
 
-    override fun changeClass(): Flowable<User> = apiClient.changeClass().flatMap { retrieveUser(withTasks = false, forced = true) }
-
-    override fun disableClasses(): Flowable<User> = apiClient.disableClasses().flatMap { retrieveUser(withTasks = false, forced = true) }
-
-    override fun changeClass(selectedClass: String): Flowable<User> = apiClient.changeClass(selectedClass)
-        .flatMap { retrieveUser(false) }
-
-    override fun unlockPath(path: String, price: Int): Flowable<UnlockResponse> {
-        return zipWithLiveUser(apiClient.unlockPath(path)) { unlockResponse, copiedUser ->
-            val user = localRepository.getUnmanagedCopy(copiedUser)
-            user.preferences = unlockResponse.preferences
-            user.purchased = unlockResponse.purchased
-            user.items = unlockResponse.items
-            user.balance = copiedUser.balance - (price / 4.0)
-            localRepository.saveUser(copiedUser, false)
-            unlockResponse
+    override suspend fun sleep(user: User): User {
+        val newValue = !(user.preferences?.sleep ?: false)
+        localRepository.modify(user) { it.preferences?.sleep = newValue }
+        if (apiClient.sleep() != true) {
+            localRepository.modify(user) { it.preferences?.sleep = !newValue }
         }
+        return user
     }
 
-    override fun unlockPath(customization: Customization): Flowable<UnlockResponse> {
-        return unlockPath(customization.unlockPath, customization.price ?: 0)
+    override fun getSkills(user: User) = localRepository.getSkills(user)
+
+    override fun getSpecialItems(user: User) = localRepository.getSpecialItems(user)
+
+    override suspend fun useSkill(key: String, target: String?, taskId: String): SkillResponse? {
+        val response = apiClient.useSkill(key, target ?: "", taskId) ?: return null
+        val user = getLiveUser() ?: return response
+        response.hpDiff = (response.user?.stats?.hp ?: 0.0) - (user.stats?.hp ?: 0.0)
+        response.expDiff =(response.user?.stats?.exp ?: 0.0) - (user.stats?.exp ?: 0.0)
+        response.goldDiff = (response.user?.stats?.gp ?: 0.0) - (user.stats?.gp ?: 0.0)
+        response.damage = (response.user?.party?.quest?.progress?.up ?: 0.0f) - (user.party?.quest?.progress?.up ?: 0.0f)
+        response.user?.let { mergeUser(user, it) }
+        return response
     }
 
-    override fun runCron() {
+    override suspend fun useSkill(key: String, target: String?): SkillResponse? {
+        val response = apiClient.useSkill(key, target ?: "") ?: return null
+        val user = getLiveUser() ?: return response
+        response.hpDiff = (response.user?.stats?.hp ?: 0.0) - (user.stats?.hp ?: 0.0)
+        response.expDiff =(response.user?.stats?.exp ?: 0.0) - (user.stats?.exp ?: 0.0)
+        response.goldDiff = (response.user?.stats?.gp ?: 0.0) - (user.stats?.gp ?: 0.0)
+        response.damage = (response.user?.party?.quest?.progress?.up ?: 0.0f) - (user.party?.quest?.progress?.up ?: 0.0f)
+        response.user?.let { mergeUser(user, it) }
+        return response
+    }
+
+    override suspend fun disableClasses(): User? = apiClient.disableClasses()
+
+    override suspend fun changeClass(selectedClass: String?): User? {
+        apiClient.changeClass(selectedClass)
+        return retrieveUser(false, forced = true)
+    }
+
+    override suspend fun unlockPath(customization: Customization): UnlockResponse? {
+        return unlockPath(customization.path, customization.price ?: 0)
+    }
+
+    override suspend fun unlockPath(path: String, price: Int): UnlockResponse? {
+        val unlockResponse = apiClient.unlockPath(path) ?: return null
+        val user = localRepository.getUser(userID).firstOrNull() ?: return unlockResponse
+        user.preferences = unlockResponse.preferences
+        user.purchased = unlockResponse.purchased
+        user.items = unlockResponse.items
+        user.balance = user.balance - (price / 4.0)
+        localRepository.saveUser(user, false)
+        return unlockResponse
+    }
+
+    override suspend fun runCron() {
         runCron(ArrayList())
     }
 
-    override fun readNotification(id: String): Flowable<List<Any>> = apiClient.readNotification(id)
-    override fun getUserQuestStatus(): Flowable<UserQuestStatus> {
+    override suspend fun readNotification(id: String) = apiClient.readNotification(id)
+    override fun getUserQuestStatus(): Flow<UserQuestStatus> {
         return localRepository.getUserQuestStatus(userID)
     }
 
-    override fun reroll(): Flowable<User> {
+    override suspend fun reroll(): User? {
         return apiClient.reroll()
-            .flatMap { retrieveUser(true, true, true) }
     }
 
-    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> =
-        apiClient.readNotifications(notificationIds)
+    override suspend fun readNotifications(notificationIds: Map<String, List<String>>) = apiClient.readNotifications(notificationIds)
 
-    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> =
-        apiClient.seeNotifications(notificationIds)
+    override suspend fun seeNotifications(notificationIds: Map<String, List<String>>) = apiClient.seeNotifications(notificationIds)
 
-    override fun changeCustomDayStart(dayStartTime: Int): Flowable<User> {
+    override suspend fun changeCustomDayStart(dayStartTime: Int): User? {
         val updateObject = HashMap<String, Any>()
         updateObject["dayStart"] = dayStartTime
         return apiClient.changeCustomDayStart(updateObject)
     }
 
-    override fun updateLanguage(languageCode: String): Flowable<User> {
-        return updateUser("preferences.language", languageCode)
-            .doOnNext { apiClient.setLanguageCode(languageCode) }
+    override suspend fun updateLanguage(languageCode: String): User? {
+        val user = updateUser("preferences.language", languageCode)
+        apiClient.languageCode = languageCode
+        return user
     }
 
-    override fun resetAccount(): Flowable<User> {
-        return apiClient.resetAccount().flatMap { retrieveUser(withTasks = true, forced = true) }
+    override suspend fun resetAccount(): User? {
+        apiClient.resetAccount()
+        return retrieveUser(withTasks = true, forced = true)
     }
 
-    override fun deleteAccount(password: String): Flowable<Void> =
-        apiClient.deleteAccount(password)
+    override suspend fun deleteAccount(password: String) = apiClient.deleteAccount(password)
 
-    override fun sendPasswordResetEmail(email: String): Flowable<Void> =
-        apiClient.sendPasswordResetEmail(email)
+    override suspend fun sendPasswordResetEmail(email: String) = apiClient.sendPasswordResetEmail(email)
 
-    override fun updateLoginName(newLoginName: String, password: String?): Maybe<User> {
-        return (
-            if (password != null && password.isNotEmpty()) {
-                apiClient.updateLoginName(newLoginName.trim(), password.trim())
-            } else {
-                apiClient.updateUsername(newLoginName.trim())
-            }
-            ).flatMapMaybe { localRepository.getUserFlowable(userID).firstElement() }
-            .doOnNext { user ->
-                localRepository.modify(user) { liveUser ->
-                    liveUser.authentication?.localAuthentication?.username = newLoginName
-                    liveUser.flags?.verifiedUsername = true
-                }
-            }
-            .firstElement()
+    override suspend fun updateLoginName(newLoginName: String, password: String?): User? {
+        if (password != null && password.isNotEmpty()) {
+            apiClient.updateLoginName(newLoginName.trim(), password.trim())
+        } else {
+            apiClient.updateUsername(newLoginName.trim())
+        }
+        val user = localRepository.getUser(userID).firstOrNull() ?: return null
+        localRepository.modify(user) { liveUser ->
+            liveUser.authentication?.localAuthentication?.username = newLoginName
+            liveUser.flags?.verifiedUsername = true
+        }
+        return user
     }
 
-    override fun verifyUsername(username: String): Flowable<VerifyUsernameResponse> = apiClient.verifyUsername(username.trim())
+    override suspend fun verifyUsername(username: String) = apiClient.verifyUsername(username.trim())
 
-    override fun updateEmail(newEmail: String, password: String): Flowable<Void> =
-        apiClient.updateEmail(newEmail.trim(), password)
+    override suspend fun updateEmail(newEmail: String, password: String) = apiClient.updateEmail(newEmail.trim(), password)
 
-    override fun updatePassword(
+    override suspend fun updatePassword(
         oldPassword: String,
         newPassword: String,
         newPasswordConfirmation: String
-    ): Flowable<Void> =
-        apiClient.updatePassword(oldPassword.trim(), newPassword.trim(), newPasswordConfirmation.trim())
+    ) = apiClient.updatePassword(oldPassword.trim(), newPassword.trim(), newPasswordConfirmation.trim())
 
-    override fun allocatePoint(stat: Attribute): Flowable<Stats> {
-        getLiveUser().firstElement().subscribe(
-            { liveUser ->
-                localRepository.executeTransaction {
-                    when (stat) {
-                        Attribute.STRENGTH -> liveUser.stats?.strength = liveUser.stats?.strength?.inc()
-                        Attribute.INTELLIGENCE -> liveUser.stats?.intelligence = liveUser.stats?.intelligence?.inc()
-                        Attribute.CONSTITUTION -> liveUser.stats?.constitution = liveUser.stats?.constitution?.inc()
-                        Attribute.PERCEPTION -> liveUser.stats?.per = liveUser.stats?.per?.inc()
-                    }
-                    liveUser.stats?.points = liveUser.stats?.points?.dec()
+    override suspend fun allocatePoint(stat: Attribute): Stats? {
+        val liveUser = getLiveUser()
+        if (liveUser != null) {
+            localRepository.executeTransaction {
+                when (stat) {
+                    Attribute.STRENGTH -> liveUser.stats?.strength = liveUser.stats?.strength?.inc()
+                    Attribute.INTELLIGENCE -> liveUser.stats?.intelligence = liveUser.stats?.intelligence?.inc()
+                    Attribute.CONSTITUTION -> liveUser.stats?.constitution = liveUser.stats?.constitution?.inc()
+                    Attribute.PERCEPTION -> liveUser.stats?.per = liveUser.stats?.per?.inc()
                 }
-            },
-            RxErrorHandler.handleEmptyError()
-        )
-        return zipWithLiveUser(apiClient.allocatePoint(stat.value)) { stats, user ->
-            localRepository.modify(user) { liveUser ->
+                liveUser.stats?.points = liveUser.stats?.points?.dec()
+            }
+        }
+        val stats = apiClient.allocatePoint(stat.value) ?: return null
+        if (liveUser != null) {
+            localRepository.executeTransaction {
                 liveUser.stats?.strength = stats.strength
                 liveUser.stats?.constitution = stats.constitution
                 liveUser.stats?.per = stats.per
@@ -273,17 +245,24 @@ class UserRepositoryImpl(
                 liveUser.stats?.points = stats.points
                 liveUser.stats?.mp = stats.mp
             }
-            stats
         }
+        return stats
     }
 
-    override fun bulkAllocatePoints(
+    override suspend fun bulkAllocatePoints(
         strength: Int,
         intelligence: Int,
         constitution: Int,
         perception: Int
-    ): Flowable<Stats> =
-        zipWithLiveUser(apiClient.bulkAllocatePoints(strength, intelligence, constitution, perception)) { stats, user ->
+    ): Stats? {
+        val stats = apiClient.bulkAllocatePoints(
+            strength,
+            intelligence,
+            constitution,
+            perception
+        ) ?: return null
+        val user = getLiveUser()
+        if (user != null) {
             localRepository.modify(user) { liveUser ->
                 liveUser.stats?.strength = stats.strength
                 liveUser.stats?.constitution = stats.constitution
@@ -292,56 +271,54 @@ class UserRepositoryImpl(
                 liveUser.stats?.points = stats.points
                 liveUser.stats?.mp = stats.mp
             }
-            stats
         }
-
-    override fun runCron(tasks: MutableList<Task>) {
-        var observable: Maybe<Any> = localRepository.getUserFlowable(userID).firstElement()
-            .filter { it.needsCron }
-            .map { user ->
-                localRepository.modify(user) { liveUser ->
-                    liveUser.needsCron = false
-                    liveUser.lastCron = Date()
-                }
-                user
-            }
-        if (tasks.isNotEmpty()) {
-            val scoringList = tasks.map { mapOf(Pair("id", it.id ?: ""), Pair("direction", TaskDirection.UP.text)) }
-            observable = observable.flatMap { taskRepository.bulkScoreTasks(scoringList).firstElement() }
-        }
-        observable.flatMap { apiClient.runCron().firstElement() }
-            .flatMap { this.retrieveUser(withTasks = true, forced = true).firstElement() }
-            .subscribe({ }, {
-                analyticsManager.logEvent("cron failed", bundleOf(Pair("error", it.localizedMessage)))
-                RxErrorHandler.reportError(it)
-            })
+        return stats
     }
 
-    override fun useCustomization(type: String, category: String?, identifier: String): Flowable<User> {
+    override suspend fun runCron(tasks: MutableList<Task>) {
+        val user = getLiveUser()
+        if (user != null) {
+            localRepository.modify(user) { liveUser ->
+                liveUser.needsCron = false
+                liveUser.lastCron = Date()
+            }
+        }
+        if (tasks.isNotEmpty()) {
+            val scoringList = mutableListOf<Map<String, String>>()
+            for (task in tasks) {
+                val map = mutableMapOf<String, String>()
+                map["id"] = task.id ?: ""
+                map["direction"] = TaskDirection.UP.text
+                scoringList.add(map)
+            }
+            taskRepository.bulkScoreTasks(scoringList)
+        }
+        apiClient.runCron()
+    }
+
+    override suspend fun useCustomization(type: String, category: String?, identifier: String): User? {
         if (appConfigManager.enableLocalChanges()) {
-            localRepository.getUserFlowable(userID).firstElement().subscribe(
-                { liveUser ->
-                    localRepository.modify(liveUser) { user ->
-                        when (type) {
-                            "skin" -> user.preferences?.skin = identifier
-                            "shirt" -> user.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()
-                                }
+            val liveUser = getLiveUser()
+            if (liveUser != null) {
+                localRepository.modify(liveUser) { user ->
+                    when (type) {
+                        "skin" -> user.preferences?.skin = identifier
+                        "shirt" -> user.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()
                             }
-                            "background" -> user.preferences?.background = identifier
-                            "chair" -> user.preferences?.chair = identifier
                         }
+                        "background" -> user.preferences?.background = identifier
+                        "chair" -> user.preferences?.chair = identifier
                     }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
+                }
+            }
         }
         var updatePath = "preferences.$type"
         if (category != null) {
@@ -350,10 +327,10 @@ class UserRepositoryImpl(
         return updateUser(updatePath, identifier)
     }
 
-    override fun retrieveAchievements(): Flowable<List<Achievement>> {
-        return apiClient.getMemberAchievements(userID).doOnNext {
-            localRepository.save(it)
-        }
+    override suspend fun retrieveAchievements(): List<Achievement>? {
+        val achievements = apiClient.getMemberAchievements(userID) ?: return null
+        localRepository.save(achievements)
+        return achievements
     }
 
     override fun getAchievements(): Flow<List<Achievement>> {
@@ -364,47 +341,42 @@ class UserRepositoryImpl(
         return localRepository.getQuestAchievements(userID)
     }
 
-    override fun retrieveTeamPlans(): Flowable<List<TeamPlan>> {
-        return apiClient.getTeamPlans().doOnNext { teams ->
-            teams.forEach { it.userID = userID }
-            localRepository.save(teams)
-        }
+    override suspend fun retrieveTeamPlans(): List<TeamPlan>? {
+        val teams = apiClient.getTeamPlans() ?: return null
+        teams.forEach { it.userID = userID }
+        localRepository.save(teams)
+        return teams
     }
 
     override fun getTeamPlans(): Flow<List<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
+    override suspend fun retrieveTeamPlan(teamID: String): Group? {
+        val team = apiClient.getGroup(teamID) ?: return null
+        val tasks = apiClient.getTeamPlanTasks(teamID)
+        localRepository.save(team)
+        val id = team.id
+        val tasksOrder = team.tasksOrder
+        if (id.isNotBlank() && tasksOrder != null && tasks != null) {
+            taskRepository.saveTasks(id, tasksOrder, tasks)
         }
-            .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)
-                }
+        val members = apiClient.getGroupMembers(teamID, true) ?: return team
+        localRepository.save(members.map { it.id?.let { member -> GroupMembership(member, id) } }.filterNotNull())
+        members.let { localRepository.save(members) }
+        return team
+    }
+
+    override fun getTeamPlan(teamID: String): Flow<Group?> {
+        return localRepository.getTeamPlan(teamID)
+            .map {
+                it ?: retrieveTeamPlan(teamID)
             }
     }
 
-    override fun getTeamPlan(teamID: String): Flowable<Group> {
-        return localRepository.getTeamPlan(teamID)
-    }
-
-    private fun getLiveUser(): Flowable<User> {
-        return localRepository.getUserFlowable(userID)
-            .map { Optional(localRepository.getLiveObject(it)) }
-            .filterMapEmpty()
-    }
-
-    private fun <T : Any> zipWithLiveUser(flowable: Flowable<T>, mergeFunc: BiFunction<T, User, T>): Flowable<T> {
-        return Flowable.zip(flowable, getLiveUser().firstElement().toFlowable(), mergeFunc)
+    private suspend fun getLiveUser(): User? {
+        val user = localRepository.getUser(userID).firstOrNull() ?: return null
+        return localRepository.getLiveObject(user)
     }
 
     private fun mergeUser(oldUser: User?, newUser: User): User {
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 a549cec18..c72ce4084 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
@@ -3,15 +3,15 @@ package com.habitrpg.android.habitica.data.local
 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.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface ChallengeLocalRepository : BaseLocalRepository {
 
-    val challenges: Flowable<out List<Challenge>>
-    fun getChallenge(id: String): Flowable<Challenge>
-    fun getTasks(challengeID: String): Flowable<out List<Task>>
+    val challenges: Flow<List<Challenge>>
+    fun getChallenge(id: String): Flow<Challenge>
+    fun getTasks(challengeID: String): Flow<List<Task>>
 
-    fun getUserChallenges(userId: String): Flowable<out List<Challenge>>
+    fun getUserChallenges(userId: String): Flow<List<Challenge>>
 
     fun setParticipating(userID: String, challengeID: String, isParticipating: Boolean)
 
@@ -21,7 +21,7 @@ interface ChallengeLocalRepository : BaseLocalRepository {
         memberOnly: Boolean,
         userID: String
     )
-    fun getChallengeMembership(userId: String, id: String): Flowable<ChallengeMembership>
-    fun getChallengeMemberships(userId: String): Flowable<out List<ChallengeMembership>>
-    fun isChallengeMember(userID: String, challengeID: String): Flowable<Boolean>
+    fun getChallengeMembership(userId: String, id: String): Flow<ChallengeMembership>
+    fun getChallengeMemberships(userId: String): Flow<List<ChallengeMembership>>
+    fun isChallengeMember(userID: String, challengeID: String): Flow<Boolean>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.kt
index a3f601ab9..d8a664dea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.kt
@@ -2,10 +2,10 @@ package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface ContentLocalRepository : BaseLocalRepository {
     fun saveContent(contentResult: ContentResult)
     fun saveWorldState(worldState: WorldState)
-    fun getWorldState(): Flowable<WorldState>
+    fun getWorldState(): Flow<WorldState>
 }
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 2b21bae96..122aa7399 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
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.inventory.Customization
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface CustomizationLocalRepository : ContentLocalRepository {
-    fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flowable<out List<Customization>>
+    fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flow<List<Customization>>
 }
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 43bb04245..f7c2b04fb 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
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.FAQArticle
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface FAQLocalRepository : ContentLocalRepository {
-    fun getArticle(position: Int): Flowable<FAQArticle>
+    fun getArticle(position: Int): Flow<FAQArticle>
 
-    val articles: Flowable<out List<FAQArticle>>
+    val articles: Flow<List<FAQArticle>>
 }
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 252e454f5..77cecd4d6 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
@@ -11,13 +11,12 @@ 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.rxjava3.core.Flowable
 import kotlinx.coroutines.flow.Flow
 
 interface InventoryLocalRepository : ContentLocalRepository {
 
     fun getArmoireRemainingCount(): Long
-    fun getOwnedEquipment(): Flowable<out List<Equipment>>
+    fun getOwnedEquipment(): Flow<List<Equipment>>
 
     fun getMounts(): Flow<List<Mount>>
 
@@ -27,31 +26,29 @@ interface InventoryLocalRepository : ContentLocalRepository {
 
     fun getOwnedPets(userID: String): Flow<List<OwnedPet>>
 
-    fun getInAppRewards(): Flowable<out List<ShopItem>>
-    fun getQuestContent(key: String): Flowable<QuestContent>
+    fun getInAppRewards(): Flow<List<ShopItem>>
+    fun getQuestContent(key: String): Flow<QuestContent?>
     fun getQuestContent(keys: List<String>): Flow<List<QuestContent>>
 
-    fun getEquipment(searchedKeys: List<String>): Flowable<out List<Equipment>>
+    fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>>
 
-    fun getOwnedEquipment(type: String): Flowable<out List<Equipment>>
+    fun getOwnedEquipment(type: String): Flow<List<Equipment>>
 
-    fun getItemsFlowable(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>>
-    fun getItemsFlowable(itemClass: Class<out Item>): Flowable<out List<Item>>
     fun getOwnedItems(itemType: String, userID: String, includeZero: Boolean): Flow<List<OwnedItem>>
-    fun getOwnedItems(userID: String, includeZero: Boolean): Flowable<Map<String, OwnedItem>>
-    fun getEquipmentType(type: String, set: String): Flowable<out List<Equipment>>
+    fun getOwnedItems(userID: String, includeZero: Boolean): Flow<Map<String, OwnedItem>>
+    fun getEquipmentType(type: String, set: String): Flow<List<Equipment>>
 
-    fun getEquipment(key: String): Flowable<Equipment>
+    fun getEquipment(key: String): Flow<Equipment>
     fun getMounts(type: String?, group: String?, color: String?): Flow<List<Mount>>
     fun getPets(type: String?, group: String?, color: String?): Flow<List<Pet>>
 
     fun updateOwnedEquipment(user: User)
 
-    fun changeOwnedCount(type: String, key: String, userID: String, amountToAdd: Int)
+    suspend fun changeOwnedCount(type: String, key: String, userID: String, amountToAdd: Int)
     fun changeOwnedCount(item: OwnedItem, amountToAdd: Int?)
 
-    fun getItem(type: String, key: String): Flowable<Item>
-    fun getOwnedItem(userID: String, type: String, key: String, includeZero: Boolean): Flowable<OwnedItem>
+    fun getItem(type: String, key: String): Flow<Item>
+    fun getOwnedItem(userID: String, type: String, key: String, includeZero: Boolean): Flow<OwnedItem>
 
     fun decrementMysteryItemCount(user: User?)
     fun saveInAppRewards(onlineItems: List<ShopItem>)
@@ -59,12 +56,14 @@ interface InventoryLocalRepository : ContentLocalRepository {
     fun hatchPet(eggKey: String, potionKey: String, userID: String)
     fun unhatchPet(eggKey: String, potionKey: String, userID: String)
     fun feedPet(foodKey: String, petKey: String, feedValue: Int, userID: String)
-    fun getLatestMysteryItem(): Flowable<Equipment>
+    fun getLatestMysteryItem(): Flow<Equipment>
     fun soldItem(userID: String, updatedUser: User): User
-    fun getAvailableLimitedItems(): Flowable<List<Item>>
+    fun getAvailableLimitedItems(): Flow<List<Item>>
 
     fun save(items: Items, userID: String)
 
     fun getLiveObject(obj: OwnedItem): OwnedItem?
     fun getItems(itemClass: Class<out Item>): Flow<List<Item>>
+    fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>>
+
 }
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 bd0cc9518..c40981364 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,30 +6,30 @@ 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.rxjava3.core.Flowable
+import io.realm.RealmResults
 import kotlinx.coroutines.flow.Flow
 
 interface SocialLocalRepository : BaseLocalRepository {
-    fun getPublicGuilds(): Flowable<out List<Group>>
+    fun getPublicGuilds(): Flow<List<Group>>
 
-    fun getUserGroups(userID: String, type: String?): Flowable<out List<Group>>
-    fun getGroups(type: String): Flowable<out List<Group>>
+    fun getUserGroups(userID: String, type: String?): Flow<List<Group>>
+    fun getGroups(type: String): Flow<List<Group>>
 
     fun getGroup(id: String): Flow<Group?>
-    fun getGroupFlowable(id: String): Flowable<Group>
     fun saveGroup(group: Group)
 
-    fun getGroupChat(groupId: String): Flowable<out List<ChatMessage>>
+    fun getGroupChat(groupId: String): Flow<List<ChatMessage>>
 
     fun deleteMessage(id: String)
 
-    fun getGroupMembers(partyId: String): Flow<List<Member>>
+    fun getPartyMembers(partyId: String): Flow<List<Member>>
+    fun getGroupMembers(groupID: String): Flow<List<Member>>
 
     fun updateRSVPNeeded(user: User?, newValue: Boolean)
 
     fun likeMessage(chatMessage: ChatMessage, userId: String, liked: Boolean)
 
-    fun saveGroupMembers(groupId: String?, members: List<Member>)
+    fun savePartyMembers(groupId: String?, members: List<Member>)
 
     fun removeQuest(partyId: String)
 
@@ -39,13 +39,13 @@ interface SocialLocalRepository : BaseLocalRepository {
 
     fun doesGroupExist(id: String): Boolean
     fun updateMembership(userId: String, id: String, isMember: Boolean)
-    fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership>
-    fun getGroupMemberships(userId: String): Flowable<out List<GroupMembership>>
+    fun getGroupMembership(userId: String, id: String): Flow<GroupMembership?>
+    fun getGroupMemberships(userId: String): Flow<List<GroupMembership>>
     fun rejectGroupInvitation(userID: String, groupID: String)
 
-    fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<out List<ChatMessage>>
+    fun getInboxMessages(userId: String, replyToUserID: String?): Flow<RealmResults<ChatMessage>>
 
-    fun getInboxConversation(userId: String): Flowable<out List<InboxConversation>>
+    fun getInboxConversation(userId: String): Flow<RealmResults<InboxConversation>>
     fun saveGroupMemberships(userID: String?, memberships: List<GroupMembership>)
     fun saveInboxMessages(
         userID: String,
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 fff81f926..6ca4b3c14 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
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.Tag
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface TagLocalRepository : BaseLocalRepository {
-    fun getTags(userId: String): Flowable<out List<Tag>>
+    fun getTags(userId: String): Flow<List<Tag>>
 
     fun deleteTag(tagID: String)
 }
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 4697c2ead..710518cfc 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,34 +5,31 @@ import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Maybe
 import kotlinx.coroutines.flow.Flow
 
 interface TaskLocalRepository : BaseLocalRepository {
 
     fun getTasks(taskType: TaskType, userID: String, includedGroupIDs: Array<String>): Flow<List<Task>>
-    fun getTasksFlowable(taskType: TaskType, userID: String, includedGroupIDs: Array<String>): Flowable<out List<Task>>
     fun getTasks(userId: String): Flow<List<Task>>
 
     fun saveTasks(ownerID: String, tasksOrder: TasksOrder, tasks: TaskList)
 
     fun deleteTask(taskID: String)
 
-    fun getTask(taskId: String): Flowable<Task>
-    fun getTaskCopy(taskId: String): Flowable<Task>
+    fun getTask(taskId: String): Flow<Task>
+    fun getTaskCopy(taskId: String): Flow<Task>
 
     fun markTaskCompleted(taskId: String, isCompleted: Boolean)
 
     fun swapTaskPosition(firstPosition: Int, secondPosition: Int)
 
-    fun getTaskAtPosition(taskType: String, position: Int): Flowable<Task>
+    fun getTaskAtPosition(taskType: String, position: Int): Flow<Task>
 
-    fun updateIsdue(daily: TaskList): Maybe<TaskList>
+    fun updateIsdue(daily: TaskList): TaskList
 
     fun updateTaskPositions(taskOrder: List<String>)
     fun saveCompletedTodos(userId: String, tasks: MutableCollection<Task>)
-    fun getErroredTasks(userID: String): Flowable<out List<Task>>
-    fun getUser(userID: String): Flowable<User>
-    fun getTasksForChallenge(challengeID: String?, userID: String?): Flowable<out List<Task>>
+    fun getErroredTasks(userID: String): Flow<List<Task>>
+    fun getUser(userID: String): Flow<User>
+    fun getTasksForChallenge(challengeID: String?, userID: String?): Flow<List<Task>>
 }
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 455dc5d75..951986edc 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,10 +1,10 @@
 package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.flow.Flow
 
 interface TutorialLocalRepository : BaseLocalRepository {
 
-    fun getTutorialStep(key: String): Flowable<TutorialStep>
-    fun getTutorialSteps(keys: List<String>): Flowable<out List<TutorialStep>>
+    fun getTutorialStep(key: String): Flow<TutorialStep>
+    fun getTutorialSteps(keys: List<String>): Flow<List<TutorialStep>>
 }
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 3d37970c9..1814760df 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
@@ -9,26 +9,24 @@ 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 com.habitrpg.android.habitica.models.user.UserQuestStatus
-import io.reactivex.rxjava3.core.Flowable
+import io.realm.RealmResults
 import kotlinx.coroutines.flow.Flow
 
 interface UserLocalRepository : BaseLocalRepository {
 
-    fun getTutorialSteps(): Flowable<List<TutorialStep>>
+    suspend fun getTutorialSteps(): Flow<RealmResults<TutorialStep>>
 
     fun getUser(userID: String): Flow<User?>
-    fun getUserFlowable(userID: String): Flowable<User>
-
     fun saveUser(user: User, overrideExisting: Boolean = true)
 
     fun saveMessages(messages: List<ChatMessage>)
 
-    fun getSkills(user: User): Flowable<out List<Skill>>
+    fun getSkills(user: User): Flow<List<Skill>>
 
-    fun getSpecialItems(user: User): Flowable<out List<Skill>>
+    fun getSpecialItems(user: User): Flow<List<Skill>>
     fun getAchievements(): Flow<List<Achievement>>
     fun getQuestAchievements(userID: String): Flow<List<QuestAchievement>>
-    fun getUserQuestStatus(userID: String): Flowable<UserQuestStatus>
+    fun getUserQuestStatus(userID: String): Flow<UserQuestStatus>
     fun getTeamPlans(userID: String): Flow<List<TeamPlan>>
-    fun getTeamPlan(teamID: String): Flowable<Group>
+    fun getTeamPlan(teamID: String): Flow<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 a6c661e3d..8ece9e579 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,12 +1,9 @@
 package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.BaseLocalRepository
-import com.habitrpg.android.habitica.extensions.filterMap
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.BaseObject
 import com.habitrpg.android.habitica.models.user.User
-import hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.kotlin.deleteFromRealm
@@ -115,15 +112,4 @@ abstract class RealmBaseLocalRepository internal constructor(override var realm:
             .filter { it.isLoaded && it.isValid && !it.isEmpty() }
             .map { it.firstOrNull() }
     }
-
-    fun queryUserFlowable(userID: String): Flowable<User> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(User::class.java)
-                .equalTo("id", userID)
-                .findAll()
-                .asFlowable()
-        )
-            .filter { it.isLoaded && it.isValid && !it.isEmpty() }
-            .filterMap { it.first() }
-    }
 }
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 9dfb48d1b..393ab5d4b 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
@@ -1,84 +1,79 @@
 package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository
-import com.habitrpg.android.habitica.extensions.filterMap
 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.user.User
-import hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.Sort
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
 
 class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), ChallengeLocalRepository {
 
-    override fun isChallengeMember(userID: String, challengeID: String): Flowable<Boolean> = RxJavaBridge.toV3Flowable(
-        realm.where(ChallengeMembership::class.java)
+    override fun isChallengeMember(userID: String, challengeID: String): Flow<Boolean> = realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userID)
             .equalTo("challengeID", challengeID)
             .findAll()
-            .asFlowable()
+            .toFlow()
             .filter { it.isLoaded }
-    ).map { it.count() > 0 }
+        .map { it.count() > 0 }
 
-    override fun getChallengeMembership(userId: String, id: String): Flowable<ChallengeMembership> = RxJavaBridge.toV3Flowable(
-        realm.where(ChallengeMembership::class.java)
+    override fun getChallengeMembership(userId: String, id: String) = realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userId)
             .equalTo("challengeID", id)
             .findAll()
-            .asFlowable()
+            .toFlow()
             .filter { it.isLoaded }
-    ).filterMap { it.first() }
+            .map { it.first() }
+        .filterNotNull()
 
-    override fun getChallengeMemberships(userId: String): Flowable<out List<ChallengeMembership>> = RxJavaBridge.toV3Flowable(
-        realm.where(ChallengeMembership::class.java)
+    override fun getChallengeMemberships(userId: String) = realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userId)
             .findAll()
-            .asFlowable()
+            .toFlow()
             .filter { it.isLoaded }
-    )
 
-    override fun getChallenge(id: String): Flowable<Challenge> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Challenge::class.java)
+    override fun getChallenge(id: String): Flow<Challenge> {
+        return realm.where(Challenge::class.java)
                 .equalTo("id", id)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
                 .map { it.first() }
-        )
+            .filterNotNull()
     }
 
-    override fun getTasks(challengeID: String): Flowable<out List<Task>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Task::class.java)
+    override fun getTasks(challengeID: String): Flow<List<Task>> {
+        return realm.where(Task::class.java)
                 .equalTo("userId", challengeID)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { realmObject -> realmObject.isLoaded }
-        )
     }
 
-    override val challenges: Flowable<out List<Challenge>>
-        get() = RxJavaBridge.toV3Flowable(
-            realm.where(Challenge::class.java)
+    override val challenges: Flow<List<Challenge>>
+        get() = realm.where(Challenge::class.java)
                 .isNotNull("name")
                 .sort("official", Sort.DESCENDING, "createdAt", Sort.DESCENDING)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        )
 
-    override fun getUserChallenges(userId: String): Flowable<out List<Challenge>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(ChallengeMembership::class.java)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override fun getUserChallenges(userId: String): Flow<List<Challenge>> {
+        return realm.where(ChallengeMembership::class.java)
                 .equalTo("userID", userId)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        )
-            .flatMap { it ->
+            .flatMapLatest { it ->
                 val ids = it.map {
                     return@map it.challengeID
                 }.toTypedArray()
@@ -91,7 +86,7 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
                     .endGroup()
                     .sort("official", Sort.DESCENDING, "createdAt", Sort.DESCENDING)
                     .findAll()
-                    .asFlowable()
+                    .toFlow()
                     .filter { it.isLoaded }
             }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
index 9445ba11f..eddc37ca9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
@@ -5,9 +5,12 @@ import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.social.Group
-import hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 
 open class RealmContentLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), ContentLocalRepository {
 
@@ -34,14 +37,13 @@ open class RealmContentLocalRepository(realm: Realm) : RealmBaseLocalRepository(
         }
     }
 
-    override fun getWorldState(): Flowable<WorldState> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(WorldState::class.java)
+    override fun getWorldState(): Flow<WorldState> {
+        return realm.where(WorldState::class.java)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded && it.size > 0 }
                 .map { it.first() }
-        )
+            .filterNotNull()
     }
 
     override fun saveWorldState(worldState: WorldState) {
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 c67d3d5a7..f7e564370 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,14 +2,15 @@ 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 hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
 import java.util.Date
 
 class RealmCustomizationLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), CustomizationLocalRepository {
 
-    override fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flowable<out List<Customization>> {
+    override fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flow<List<Customization>> {
         var query = realm.where(Customization::class.java)
             .equalTo("type", type)
             .equalTo("category", category)
@@ -28,13 +29,10 @@ class RealmCustomizationLocalRepository(realm: Realm) : RealmContentLocalReposit
                 .endGroup()
                 .endGroup()
         }
-        return RxJavaBridge.toV3Flowable(
-            query
+        return query
                 .sort("customizationSet")
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-                .map { it }
-        )
     }
 }
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 5a704138f..84be05ed2 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,27 +2,27 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.FAQLocalRepository
 import com.habitrpg.android.habitica.models.FAQArticle
-import hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 
 class RealmFAQLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), FAQLocalRepository {
-    override fun getArticle(position: Int): Flowable<FAQArticle> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(FAQArticle::class.java)
+    override fun getArticle(position: Int): Flow<FAQArticle> {
+        return realm.where(FAQArticle::class.java)
                 .equalTo("position", position)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded && it.count() > 0 }
-                .map { it.first() }
-        )
+                .map { it.firstOrNull() }
+            .filterNotNull()
     }
 
-    override val articles: Flowable<out List<FAQArticle>>
-        get() = RxJavaBridge.toV3Flowable(
-            realm.where(FAQArticle::class.java)
+    override val articles: Flow<List<FAQArticle>>
+        get() = realm.where(FAQArticle::class.java)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .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 366f580af..c3ebc3af8 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,7 +1,6 @@
 package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.InventoryLocalRepository
-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.Food
@@ -17,46 +16,44 @@ 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 hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.Sort
 import io.realm.kotlin.toFlow
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
-class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), InventoryLocalRepository {
+class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(realm),
+    InventoryLocalRepository {
     override fun getQuestContent(keys: List<String>): Flow<List<QuestContent>> {
         return realm.where(QuestContent::class.java)
-                .`in`("key", keys.toTypedArray())
-                .findAll()
-                .toFlow()
-                .filter { it.isLoaded }
+            .`in`("key", keys.toTypedArray())
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
-    override fun getQuestContent(key: String): Flowable<QuestContent> {
-        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() }
-        )
+    override fun getQuestContent(key: String): Flow<QuestContent?> {
+        return realm.where(QuestContent::class.java).equalTo("key", key)
+            .findAll()
+            .toFlow()
+            .filter { content -> content.isLoaded && content.isValid && !content.isEmpty() }
+            .map { content -> content.first() }
     }
 
-    override fun getEquipment(searchedKeys: List<String>): Flowable<out List<Equipment>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Equipment::class.java)
-                .`in`("key", searchedKeys.toTypedArray())
-                .findAll()
-                .asFlowable()
-                .filter { it.isLoaded }
-        )
+    override fun getEquipment(searchedKeys: List<String>): Flow<out List<Equipment>> {
+        return realm.where(Equipment::class.java)
+            .`in`("key", searchedKeys.toTypedArray())
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
     override fun getArmoireRemainingCount(): Long {
@@ -70,39 +67,37 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
             .count()
     }
 
-    override fun getOwnedEquipment(type: String): Flowable<out List<Equipment>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Equipment::class.java)
-                .equalTo("type", type)
-                .equalTo("owned", true)
-                .findAll()
-                .asFlowable()
-                .filter { it.isLoaded }
-        )
+    override fun getOwnedEquipment(type: String): Flow<out List<Equipment>> {
+        return realm.where(Equipment::class.java)
+            .equalTo("type", type)
+            .equalTo("owned", true)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
-    override fun getOwnedEquipment(): Flowable<out List<Equipment>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Equipment::class.java)
-                .equalTo("owned", true)
-                .findAll()
-                .asFlowable()
-                .filter { it.isLoaded }
-        )
+    override fun getOwnedEquipment(): Flow<out List<Equipment>> {
+        return realm.where(Equipment::class.java)
+            .equalTo("owned", true)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
-    override fun getEquipmentType(type: String, set: String): Flowable<out List<Equipment>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Equipment::class.java)
-                .equalTo("type", type)
-                .equalTo("gearSet", set)
-                .findAll()
-                .asFlowable()
-                .filter { it.isLoaded }
-        )
+    override fun getEquipmentType(type: String, set: String): Flow<out List<Equipment>> {
+        return realm.where(Equipment::class.java)
+            .equalTo("type", type)
+            .equalTo("gearSet", set)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
-    override fun getOwnedItems(itemType: String, userID: String, includeZero: Boolean): Flow<List<OwnedItem>> {
+    override fun getOwnedItems(
+        itemType: String,
+        userID: String,
+        includeZero: Boolean
+    ): Flow<List<OwnedItem>> {
         return queryUser(userID).map {
             val items = when (itemType) {
                 "eggs" -> it?.items?.eggs
@@ -120,56 +115,49 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         }
     }
 
-    override fun getItemsFlowable(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>> {
-        return realm.where(itemClass).`in`("key", keys).findAll().toFlow()
-                .filter { it.isLoaded }
-    }
-
-    override fun getItemsFlowable(itemClass: Class<out Item>): Flowable<out List<Item>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(itemClass).findAll().asFlowable()
-                .filter { it.isLoaded }
-        )
-    }
-
     override fun getItems(itemClass: Class<out Item>): Flow<List<Item>> {
         return realm.where(itemClass).findAll().toFlow()
             .filter { it.isLoaded }
     }
 
-    override fun getOwnedItems(userID: String, includeZero: Boolean): Flowable<Map<String, OwnedItem>> {
-        return queryUserFlowable(userID).map {
-            val items = HashMap<String, OwnedItem>()
-            it.items?.eggs?.forEach { items[it.key + "-" + it.itemType] = it }
-            it.items?.food?.forEach { items[it.key + "-" + it.itemType] = it }
-            it.items?.hatchingPotions?.forEach { items[it.key + "-" + it.itemType] = it }
-            it.items?.quests?.forEach { items[it.key + "-" + it.itemType] = it }
-            if (includeZero) {
-                items
-            } else {
-                items.filter { it.value.numberOwned > 0 }
-            }
-        }
+    override fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>> {
+        return realm.where(itemClass).`in`("key", keys).findAll().toFlow()
+            .filter { it.isLoaded }
     }
 
-    override fun getEquipment(key: String): Flowable<Equipment> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Equipment::class.java)
-                .equalTo("key", key)
-                .findAll()
-                .asFlowable()
-                .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
-                .map { it.first() }
-                .cast(Equipment::class.java)
-        )
+    override fun getOwnedItems(userID: String, includeZero: Boolean): Flow<Map<String, OwnedItem>> {
+        return queryUser(userID)
+            .filterNotNull()
+            .map {
+                val items = HashMap<String, OwnedItem>()
+                it.items?.eggs?.forEach { items[it.key + "-" + it.itemType] = it }
+                it.items?.food?.forEach { items[it.key + "-" + it.itemType] = it }
+                it.items?.hatchingPotions?.forEach { items[it.key + "-" + it.itemType] = it }
+                it.items?.quests?.forEach { items[it.key + "-" + it.itemType] = it }
+                if (includeZero) {
+                    items
+                } else {
+                    items.filter { it.value.numberOwned > 0 }
+                }
+            }
+    }
+
+    override fun getEquipment(key: String): Flow<Equipment> {
+        return realm.where(Equipment::class.java)
+            .equalTo("key", key)
+            .findAll()
+            .toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
+            .map { it.first() }
+            .filterNotNull()
     }
 
     override fun getMounts(): Flow<List<Mount>> {
         return realm.where(Mount::class.java)
-                .sort("type", Sort.ASCENDING, "animal", Sort.ASCENDING)
-                .findAll()
-                .toFlow()
-                .filter { it.isLoaded }
+            .sort("type", Sort.ASCENDING, "animal", Sort.ASCENDING)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
     override fun getMounts(type: String?, group: String?, color: String?): Flow<List<Mount>> {
@@ -185,8 +173,8 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
             query = query.equalTo("color", color)
         }
         return query.findAll()
-                .toFlow()
-                .filter { it.isLoaded }
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
     override fun getOwnedMounts(userID: String): Flow<List<OwnedMount>> {
@@ -200,10 +188,10 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
 
     override fun getPets(): Flow<List<Pet>> {
         return realm.where(Pet::class.java)
-                .sort("type", Sort.ASCENDING, "animal", Sort.ASCENDING)
-                .findAll()
-                .toFlow()
-                .filter { it.isLoaded }
+            .sort("type", Sort.ASCENDING, "animal", Sort.ASCENDING)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
     override fun getPets(type: String?, group: String?, color: String?): Flow<List<Pet>> {
@@ -219,15 +207,15 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
             query = query.equalTo("color", color)
         }
         return query.findAll()
-                .toFlow()
-                .filter { it.isLoaded }
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
     override fun getOwnedPets(userID: String): Flow<List<OwnedPet>> {
         return realm.where(User::class.java)
-                .equalTo("id", userID)
-                .findAll()
-                .toFlow()
+            .equalTo("id", userID)
+            .findAll()
+            .toFlow()
             .filter { it.isLoaded && it.isValid && !it.isEmpty() }
             .map {
                 it.first()?.items?.pets?.filter {
@@ -239,8 +227,16 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
     override fun updateOwnedEquipment(user: User) {
     }
 
-    override fun changeOwnedCount(type: String, key: String, userID: String, amountToAdd: Int) {
-        getOwnedItem(userID, type, key, true).firstElement().subscribe({ changeOwnedCount(it, amountToAdd) }, RxErrorHandler.handleEmptyError())
+    override suspend fun changeOwnedCount(
+        type: String,
+        key: String,
+        userID: String,
+        amountToAdd: Int
+    ) {
+        val item = getOwnedItem(userID, type, key, true).firstOrNull()
+        if (item != null) {
+            changeOwnedCount(item, amountToAdd)
+        }
     }
 
     override fun changeOwnedCount(item: OwnedItem, amountToAdd: Int?) {
@@ -250,29 +246,36 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         }
     }
 
-    override fun getOwnedItem(userID: String, type: String, key: String, includeZero: Boolean): Flowable<OwnedItem> {
-        return queryUserFlowable(userID).map {
-            var items = (
-                when (type) {
-                    "eggs" -> it.items?.eggs
-                    "hatchingPotions" -> it.items?.hatchingPotions
-                    "food" -> it.items?.food
-                    "quests" -> it.items?.quests
-                    else -> emptyList()
-                } ?: emptyList()
-                )
-            items = items.filter { it.key == key }
-            if (includeZero) {
-                items
-            } else {
-                items.filter { it.numberOwned > 0 }
+    override fun getOwnedItem(
+        userID: String,
+        type: String,
+        key: String,
+        includeZero: Boolean
+    ): Flow<OwnedItem> {
+        return queryUser(userID)
+            .filterNotNull()
+            .map {
+                var items = (
+                    when (type) {
+                        "eggs" -> it.items?.eggs
+                        "hatchingPotions" -> it.items?.hatchingPotions
+                        "food" -> it.items?.food
+                        "quests" -> it.items?.quests
+                        else -> emptyList()
+                    } ?: emptyList()
+                    )
+                items = items.filter { it.key == key }
+                if (includeZero) {
+                    items
+                } else {
+                    items.filter { it.numberOwned > 0 }
+                }
             }
-        }
             .filter { it.isNotEmpty() }
             .map { it.first() }
     }
 
-    override fun getItem(type: String, key: String): Flowable<Item> {
+    override fun getItem(type: String, key: String): Flow<Item> {
         val itemClass: Class<out RealmObject> = when (type) {
             "eggs" -> Egg::class.java
             "hatchingPotions" -> HatchingPotion::class.java
@@ -281,14 +284,12 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
             "special" -> SpecialItem::class.java
             else -> Egg::class.java
         }
-        return RxJavaBridge.toV3Flowable(
-            realm.where(itemClass).equalTo("key", key)
-                .findAll()
-                .asFlowable()
-                .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
-                .map { it.first() }
-                .cast(Item::class.java)
-        )
+        return realm.where(itemClass).equalTo("key", key)
+            .findAll()
+            .toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
+            .map { it.firstOrNull() as? Item }
+            .filterNotNull()
     }
 
     override fun decrementMysteryItemCount(user: User?) {
@@ -303,18 +304,17 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
                 item.numberOwned = item.numberOwned - 1
             }
             if (liveUser?.isValid == true) {
-                liveUser.purchased?.plan?.mysteryItemCount = (user.purchased?.plan?.mysteryItemCount ?: 0) - 1
+                liveUser.purchased?.plan?.mysteryItemCount =
+                    (user.purchased?.plan?.mysteryItemCount ?: 0) - 1
             }
         }
     }
 
-    override fun getInAppRewards(): Flowable<out List<ShopItem>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(ShopItem::class.java)
-                .findAll()
-                .asFlowable()
-                .filter { it.isLoaded }
-        )
+    override fun getInAppRewards(): Flow<List<ShopItem>> {
+        return realm.where(ShopItem::class.java)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
     override fun saveInAppRewards(onlineItems: List<ShopItem>) {
@@ -335,7 +335,8 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         newPet.trained = 5
         val user = realm.where(User::class.java).equalTo("id", userID).findFirst() ?: return
         val egg = user.items?.eggs?.firstOrNull { it.key == eggKey } ?: return
-        val hatchingPotion = user.items?.hatchingPotions?.firstOrNull { it.key == potionKey } ?: return
+        val hatchingPotion =
+            user.items?.hatchingPotions?.firstOrNull { it.key == potionKey } ?: return
         executeTransaction {
             egg.numberOwned -= 1
             hatchingPotion.numberOwned -= 1
@@ -346,7 +347,8 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
     override fun getLiveObject(obj: OwnedItem): OwnedItem? {
         if (isClosed) return null
         if (!obj.isManaged) return obj
-        return realm.where(OwnedItem::class.java).equalTo("key", obj.key).equalTo("itemType", obj.itemType).findFirst()
+        return realm.where(OwnedItem::class.java).equalTo("key", obj.key)
+            .equalTo("itemType", obj.itemType).findFirst()
     }
 
     override fun save(items: Items, userID: String) {
@@ -361,7 +363,8 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         val pet = realm.where(OwnedPet::class.java).equalTo("key", "$eggKey-$potionKey").findFirst()
         val user = realm.where(User::class.java).equalTo("id", userID).findFirst() ?: return
         val egg = user.items?.eggs?.firstOrNull { it.key == eggKey } ?: return
-        val hatchingPotion = user.items?.hatchingPotions?.firstOrNull { it.key == potionKey } ?: return
+        val hatchingPotion =
+            user.items?.hatchingPotions?.firstOrNull { it.key == potionKey } ?: return
         executeTransaction {
             egg.numberOwned += 1
             hatchingPotion.numberOwned += 1
@@ -386,21 +389,19 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         }
     }
 
-    override fun getLatestMysteryItem(): Flowable<Equipment> {
-        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 {
-                    val format = SimpleDateFormat("yyyyMM", Locale.US)
-                    it.first {
-                        it.key?.contains(format.format(Date())) == true
-                    }
+    override fun getLatestMysteryItem(): Flow<Equipment> {
+        return realm.where(Equipment::class.java)
+            .contains("key", "mystery_2")
+            .sort("mystery", Sort.DESCENDING)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded && it.size > 0 }
+            .map {
+                val format = SimpleDateFormat("yyyyMM", Locale.US)
+                it.first {
+                    it.key?.contains(format.format(Date())) == true
                 }
-        )
+            }
     }
 
     override fun soldItem(userID: String, updatedUser: User): User {
@@ -420,32 +421,42 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         return user
     }
 
-    override fun getAvailableLimitedItems(): Flowable<List<Item>> {
-        return Flowable.combineLatest(
-            realm.where(Egg::class.java)
-                .lessThan("event.start", Date())
-                .greaterThan("event.end", Date())
-                .findAll().asFlowable(),
-            realm.where(Food::class.java)
-                .lessThan("event.start", Date())
-                .greaterThan("event.end", Date())
-                .findAll().asFlowable(),
-            realm.where(HatchingPotion::class.java)
-                .lessThan("event.start", Date())
-                .greaterThan("event.end", Date())
-                .findAll().asFlowable(),
-            realm.where(QuestContent::class.java)
-                .lessThan("event.start", Date())
-                .greaterThan("event.end", Date())
-                .findAll().asFlowable(),
-            { eggs, food, potions, quests ->
+    override fun getAvailableLimitedItems(): Flow<List<Item>> {
+        return realm.where(Egg::class.java)
+            .lessThan("event.start", Date())
+            .greaterThan("event.end", Date())
+            .findAll().toFlow()
+            .map {
                 val items = mutableListOf<Item>()
-                items.addAll(eggs)
-                items.addAll(food)
-                items.addAll(potions)
-                items.addAll(quests)
+                items.addAll(it)
+                items
+            }
+            .combine(
+                realm.where(Food::class.java)
+                    .lessThan("event.start", Date())
+                    .greaterThan("event.end", Date())
+                    .findAll().toFlow()
+            ) { items, food ->
+                items.addAll(food)
+                items
+            }
+            .combine(
+                realm.where(HatchingPotion::class.java)
+                    .lessThan("event.start", Date())
+                    .greaterThan("event.end", Date())
+                    .findAll().toFlow()
+            ) { items, food ->
+                items.addAll(food)
+                items
+            }
+            .combine(
+                realm.where(QuestContent::class.java)
+                    .lessThan("event.start", Date())
+                    .greaterThan("event.end", Date())
+                    .findAll().toFlow()
+            ) { items, food ->
+                items.addAll(food)
                 items
             }
-        )
     }
 }
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 5bc9eeb68..c63e9094a 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
@@ -9,34 +9,30 @@ 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 hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.Sort
 import io.realm.kotlin.toFlow
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 
 class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), SocialLocalRepository {
 
-    override fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership> = RxJavaBridge.toV3Flowable(
-        realm.where(GroupMembership::class.java)
+    override fun getGroupMembership(userId: String, id: String) = realm.where(GroupMembership::class.java)
             .equalTo("userID", userId)
             .equalTo("groupID", id)
             .findAll()
-            .asFlowable()
+            .toFlow()
             .filter { it.isLoaded && it.isNotEmpty() }
             .map { it.first() }
-    )
 
-    override fun getGroupMemberships(userId: String): Flowable<out List<GroupMembership>> = RxJavaBridge.toV3Flowable(
-        realm.where(GroupMembership::class.java)
+    override fun getGroupMemberships(userId: String): Flow<List<GroupMembership>> = realm.where(GroupMembership::class.java)
             .equalTo("userID", userId)
             .findAll()
-            .asFlowable()
+            .toFlow()
             .filter { it.isLoaded }
-    )
 
     override fun updateMembership(userId: String, id: String, isMember: Boolean) {
         if (isMember) {
@@ -123,61 +119,42 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun getPublicGuilds(): Flowable<out List<Group>> = RxJavaBridge.toV3Flowable(
-        realm.where(Group::class.java)
+    override fun getPublicGuilds() = realm.where(Group::class.java)
             .equalTo("type", "guild")
             .equalTo("privacy", "public")
             .notEqualTo("id", Group.TAVERN_ID)
             .sort("memberCount", Sort.DESCENDING)
             .findAll()
-            .asFlowable()
+            .toFlow()
             .filter { it.isLoaded }
-    )
 
-    override fun getUserGroups(userID: String, type: String?): Flowable<out List<Group>> = RxJavaBridge.toV3Flowable(
-        realm.where(GroupMembership::class.java)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override fun getUserGroups(userID: String, type: String?) = realm.where(GroupMembership::class.java)
             .equalTo("userID", userID)
             .findAll()
-            .asFlowable()
-            .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 {
-                            return@map it.groupID
-                        }.toTypedArray()
-                    )
-                    .sort("memberCount", Sort.DESCENDING)
-                    .findAll()
-                    .asFlowable()
-                    .filter { it.isLoaded }
-            )
+            .toFlow()
+        .filter { it.isLoaded }
+        .flatMapLatest { memberships ->
+            realm.where(Group::class.java)
+                .equalTo("type", type ?: "guild")
+                .notEqualTo("id", Group.TAVERN_ID)
+                .`in`(
+                    "id",
+                    memberships.map {
+                        return@map it.groupID
+                    }.toTypedArray()
+                )
+                .sort("memberCount", Sort.DESCENDING)
+                .findAll()
+                .toFlow()
         }
 
-    override fun getGroups(type: String): Flowable<out List<Group>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Group::class.java)
+    override fun getGroups(type: String): Flow<List<Group>> {
+        return realm.where(Group::class.java)
                 .equalTo("type", type)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        )
-    }
-
-    override fun getGroupFlowable(id: String): Flowable<Group> {
-        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() }
-        )
     }
 
     override fun getGroup(id: String): Flow<Group?> {
@@ -189,15 +166,13 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
             .map { groups -> groups.first() }
     }
 
-    override fun getGroupChat(groupId: String): Flowable<out List<ChatMessage>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(ChatMessage::class.java)
+    override fun getGroupChat(groupId: String): Flow<List<ChatMessage>> {
+        return realm.where(ChatMessage::class.java)
                 .equalTo("groupId", groupId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        )
     }
 
     override fun deleteMessage(id: String) {
@@ -205,13 +180,17 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         executeTransaction { chatMessage?.deleteFromRealm() }
     }
 
-    override fun getGroupMembers(partyId: String): Flow<List<Member>> {
-        return realm.where(Member::class.java)
+    override fun getPartyMembers(partyId: String) = realm.where(Member::class.java)
                 .equalTo("party.id", partyId)
                 .findAll()
-                .toFlow()
-                .filter { it.isLoaded }
-    }
+            .toFlow()
+
+    override fun getGroupMembers(groupID: String) = realm.where(GroupMembership::class.java)
+        .equalTo("groupID", groupID)
+        .findAll()
+        .toFlow()
+        .map { memberships -> memberships.map { it.userID }.toTypedArray() }
+        .flatMapLatest { realm.where(Member::class.java).`in`("id", it).findAll().toFlow() }
 
     override fun updateRSVPNeeded(user: User?, newValue: Boolean) {
         executeTransaction { user?.party?.quest?.RSVPNeeded = newValue }
@@ -239,7 +218,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun saveGroupMembers(groupId: String?, members: List<Member>) {
+    override fun savePartyMembers(groupId: String?, members: List<Member>) {
         saveSyncronous(members)
         if (groupId != null) {
             val existingMembers = realm.where(Member::class.java).equalTo("party.id", groupId).findAll()
@@ -302,27 +281,19 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         return party != null && party.isValid
     }
 
-    override fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<out List<ChatMessage>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(ChatMessage::class.java)
+    override fun getInboxMessages(userId: String, replyToUserID: String?) = realm.where(ChatMessage::class.java)
                 .equalTo("isInboxMessage", true)
                 .equalTo("uuid", replyToUserID)
                 .equalTo("userID", userId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        )
-    }
 
-    override fun getInboxConversation(userId: String): Flowable<out List<InboxConversation>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(InboxConversation::class.java)
+    override fun getInboxConversation(userId: String) = realm.where(InboxConversation::class.java)
                 .equalTo("userID", userId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .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 8f1e93c8c..99d26a19c 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,9 +2,9 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.TagLocalRepository
 import com.habitrpg.android.habitica.models.Tag
-import hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
 
 class RealmTagLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TagLocalRepository {
     override fun deleteTag(tagID: String) {
@@ -12,9 +12,7 @@ class RealmTagLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), T
         executeTransaction { tags.deleteAllFromRealm() }
     }
 
-    override fun getTags(userId: String): Flowable<out List<Tag>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Tag::class.java).equalTo("userId", userId).findAll().asFlowable()
-        )
+    override fun getTags(userId: String): Flow<List<Tag>> {
+        return realm.where(Tag::class.java).equalTo("userId", userId).findAll().toFlow()
     }
 }
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 2f8d1e5bd..239cfee26 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
@@ -8,46 +8,49 @@ import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-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.RealmResults
 import io.realm.Sort
 import io.realm.kotlin.toFlow
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 
 class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TaskLocalRepository {
 
     override fun getTasks(taskType: TaskType, userID: String, includedGroupIDs: Array<String>): Flow<List<Task>> {
         if (realm.isClosed) return emptyFlow()
-        return realm.where(Task::class.java)
-            .equalTo("typeValue", taskType.value)
-            .beginGroup()
-            .equalTo("userId", userID)
-            .or()
-            .`in`("group.groupID", includedGroupIDs)
-            .endGroup()
-            .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
-            .findAll()
+        return findTasks(taskType, userID, includedGroupIDs)
             .toFlow()
             .filter { it.isLoaded }
     }
 
-    override fun getTasksFlowable(taskType: TaskType, userID: String, includedGroupIDs: Array<String>): Flowable<out List<Task>> {
-        if (realm.isClosed) return Flowable.empty()
-        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
+    private fun findTasks(
+        taskType: TaskType,
+        ownerID: String,
+        includedGroupIDs: Array<String>
+    ): RealmResults<Task> {
+        return realm.where(Task::class.java)
             .equalTo("typeValue", taskType.value)
             .beginGroup()
-            .equalTo("userId", userID)
+            .equalTo("userId", ownerID)
             .or()
+            .beginGroup()
             .`in`("group.groupID", includedGroupIDs)
+            .and()
+            .beginGroup()
+            .contains("group.assignedUsers", ownerID)
+            .or()
+            .isEmpty("group.assignedUsers")
+            .endGroup()
+            .endGroup()
+            .or()
+            .equalTo("group.groupID", ownerID)
             .endGroup()
             .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
             .findAll()
-            .asFlowable()
-            .filter { it.isLoaded })
     }
 
     override fun getTasks(userId: String): Flow<List<Task>> {
@@ -126,14 +129,13 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         return taskList
     }
 
-    private fun removeOldTasks(userID: String, onlineTaskList: List<Task>) {
-        val groupIDs = onlineTaskList.map { it.group?.groupID }.distinct().toTypedArray()
+    private fun removeOldTasks(ownerID: String, onlineTaskList: List<Task>) {
         if (realm.isClosed) return
         val localTasks = realm.where(Task::class.java)
             .beginGroup()
-            .equalTo("userId", userID)
+            .equalTo("userId", ownerID)
             .or()
-            .`in`("group.groupID", groupIDs)
+            .equalTo("group.groupID", ownerID)
             .endGroup()
             .beginGroup()
             .beginGroup()
@@ -177,19 +179,17 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         }
     }
 
-    override fun getTask(taskId: String): Flowable<Task> {
+    override fun getTask(taskId: String): Flow<Task> {
         if (realm.isClosed) {
-            return Flowable.empty()
+            return emptyFlow()
         }
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Task::class.java).equalTo("id", taskId).findAll().asFlowable()
-                .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
-                .map { it.first() }
-                .cast(Task::class.java)
-        )
+        return realm.where(Task::class.java).equalTo("id", taskId).findAll().toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
+            .map { it.first() }
+            .filterNotNull()
     }
 
-    override fun getTaskCopy(taskId: String): Flowable<Task> {
+    override fun getTaskCopy(taskId: String): Flow<Task> {
         return getTask(taskId)
             .map { task ->
                 return@map if (task.isManaged && task.isValid) {
@@ -216,27 +216,21 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         }
     }
 
-    override fun getTaskAtPosition(taskType: String, position: Int): Flowable<Task> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Task::class.java).equalTo("typeValue", taskType).equalTo("position", position)
+    override fun getTaskAtPosition(taskType: String, position: Int): Flow<Task> {
+        return realm.where(Task::class.java).equalTo("typeValue", taskType).equalTo("position", position)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
                 .map { it.first() }
-                .filter { realmObject -> realmObject.isLoaded }
-                .cast(Task::class.java)
-        )
+            .filterNotNull()
     }
 
-    override fun updateIsdue(daily: TaskList): Maybe<TaskList> {
-        return Flowable.just(realm.where(Task::class.java).equalTo("typeValue", TaskType.DAILY.value).findAll())
-            .firstElement()
-            .map { tasks ->
-                realm.beginTransaction()
-                tasks.filter { daily.tasks.containsKey(it.id) }.forEach { it.isDue = daily.tasks[it.id]?.isDue }
-                realm.commitTransaction()
-                daily
-            }
+    override fun updateIsdue(daily: TaskList): TaskList {
+        val tasks = realm.where(Task::class.java).equalTo("typeValue", TaskType.DAILY.value).findAll()
+        realm.beginTransaction()
+        tasks.filter { daily.tasks.containsKey(it.id) }.forEach { it.isDue = daily.tasks[it.id]?.isDue }
+        realm.commitTransaction()
+        return daily
     }
 
     override fun updateTaskPositions(taskOrder: List<String>) {
@@ -248,38 +242,32 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         }
     }
 
-    override fun getErroredTasks(userID: String): Flowable<out List<Task>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Task::class.java)
+    override fun getErroredTasks(userID: String): Flow<List<Task>> {
+        return realm.where(Task::class.java)
                 .equalTo("userId", userID)
                 .equalTo("hasErrored", true)
                 .sort("position")
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        ).retry(1)
     }
 
-    override fun getUser(userID: String): Flowable<User> {
-        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() }
-        )
+    override fun getUser(userID: String): Flow<User> {
+        return realm.where(User::class.java)
+            .equalTo("id", userID)
+            .findAll()
+            .toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
+            .map { users -> users.first() }
+            .filterNotNull()
     }
 
-    override fun getTasksForChallenge(challengeID: String?, userID: String?): Flowable<out List<Task>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Task::class.java)
+    override fun getTasksForChallenge(challengeID: String?, userID: String?): Flow<List<Task>> {
+        return realm.where(Task::class.java)
                 .equalTo("challengeID", challengeID)
                 .equalTo("userId", userID)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .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 8f7577680..0e7c81185 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,31 +2,32 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
 import com.habitrpg.android.habitica.models.TutorialStep
-import hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 
 class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TutorialLocalRepository {
 
-    override fun getTutorialStep(key: String): Flowable<TutorialStep> {
-        if (realm.isClosed) return Flowable.empty()
-        return RxJavaBridge.toV3Flowable(
-            realm.where(TutorialStep::class.java).equalTo("identifier", key)
+    override fun getTutorialStep(key: String): Flow<TutorialStep> {
+        if (realm.isClosed) return emptyFlow()
+        return realm.where(TutorialStep::class.java).equalTo("identifier", key)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && realmObject.isNotEmpty() }
                 .map { steps -> steps.first() }
-        )
+            .filterNotNull()
     }
 
-    override fun getTutorialSteps(keys: List<String>): Flowable<out List<TutorialStep>> {
-        if (realm.isClosed) return Flowable.empty()
-        return RxJavaBridge.toV3Flowable(
-            realm.where(TutorialStep::class.java)
+    override fun getTutorialSteps(keys: List<String>): Flow<out List<TutorialStep>> {
+        if (realm.isClosed) return emptyFlow()
+        return realm.where(TutorialStep::class.java)
                 .`in`("identifier", keys.toTypedArray())
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .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 af919b312..7a783fbbc 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,8 +1,6 @@
 package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.UserLocalRepository
-import com.habitrpg.android.habitica.models.user.UserQuestStatus
-import com.habitrpg.android.habitica.extensions.filterMap
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.QuestAchievement
 import com.habitrpg.android.habitica.models.Skill
@@ -12,35 +10,40 @@ import com.habitrpg.android.habitica.models.TutorialStep
 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 hu.akarnokd.rxjava3.bridge.RxJavaBridge
-import io.reactivex.rxjava3.core.Flowable
+import com.habitrpg.android.habitica.models.user.UserQuestStatus
 import io.realm.Realm
 import io.realm.kotlin.toFlow
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 
-class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), UserLocalRepository {
-    override fun getUserQuestStatus(userID: String): Flowable<UserQuestStatus> {
-        return getUserFlowable(userID)
+class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
+    UserLocalRepository {
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override fun getUserQuestStatus(userID: String): Flow<UserQuestStatus> {
+        return getUser(userID)
+            .filterNotNull()
             .map { it.party?.id ?: "" }
-            .distinctUntilChanged()
             .filter { it.isNotBlank() }
-            .flatMap {
-                RxJavaBridge.toV3Flowable(
+            .flatMapLatest {
                     realm.where(Group::class.java)
                         .equalTo("id", it)
                         .findAll()
-                        .asFlowable()
+                        .toFlow()
                         .filter { groups -> groups.size > 0 }
-                ).filterMap { it.first() }
+                        .map { it.firstOrNull() }
+                        .filterNotNull()
             }
             .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
+                    it.quest?.progress?.collect?.isNotEmpty()
+                        ?: false -> UserQuestStatus.QUEST_COLLECT
+                    (it.quest?.progress?.hp ?: 0.0) > 0.0 -> UserQuestStatus.QUEST_BOSS
                     else -> UserQuestStatus.QUEST_UNKNOWN
                 }
             }
@@ -48,25 +51,24 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
 
     override fun getAchievements(): Flow<List<Achievement>> {
         return realm.where(Achievement::class.java)
-                .sort("index")
-                .findAll()
-                .toFlow()
-                .filter { it.isLoaded }
+            .sort("index")
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
     }
 
     override fun getQuestAchievements(userID: String): Flow<List<QuestAchievement>> {
         return realm.where(User::class.java)
-                .equalTo("id", userID)
-                .findAll()
-                .toFlow()
-                .filter { it.isLoaded && it.size > 0 }
-                .map { it.first()?.questAchievements ?: emptyList() }
+            .equalTo("id", userID)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded && it.size > 0 }
+            .map { it.first()?.questAchievements ?: emptyList() }
     }
 
-    override fun getTutorialSteps(): Flowable<List<TutorialStep>> = RxJavaBridge.toV3Flowable(
-        realm.where(TutorialStep::class.java).findAll().asFlowable()
+    override suspend fun getTutorialSteps() =
+        realm.where(TutorialStep::class.java).findAll().toFlow()
             .filter { it.isLoaded }.map { it }
-    )
 
     override fun getUser(userID: String): Flow<User?> {
         if (realm.isClosed) return emptyFlow()
@@ -78,17 +80,6 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
             .map { users -> users.first() }
     }
 
-    override fun getUserFlowable(userID: String): Flowable<User> {
-        if (realm.isClosed) return Flowable.empty()
-        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() })
-    }
-
     override fun saveUser(user: User, overrideExisting: Boolean) {
         if (realm.isClosed) return
         val oldUser = realm.where(User::class.java)
@@ -127,50 +118,45 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
 
     override fun getTeamPlans(userID: String): Flow<List<TeamPlan>> {
         return realm.where(TeamPlan::class.java)
-                .equalTo("userID", userID)
+            .equalTo("userID", userID)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
+    }
+
+    override fun getTeamPlan(teamID: String): Flow<Group?> {
+        if (realm.isClosed) return emptyFlow()
+        return realm.where(Group::class.java)
+                .equalTo("id", teamID)
+                .findAll()
+                .toFlow()
+                .filter { realmObject -> realmObject.isLoaded && realmObject.isValid }
+                .map { teams -> teams.firstOrNull() }
+    }
+
+    override fun getSkills(user: User): Flow<List<Skill>> {
+        val habitClass =
+            if (user.preferences?.disableClasses == true) "none" else user.stats?.habitClass
+        return realm.where(Skill::class.java)
+                .equalTo("habitClass", habitClass)
+                .sort("lvl")
                 .findAll()
                 .toFlow()
                 .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<out List<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<out List<Skill>> {
+    override fun getSpecialItems(user: User): Flow<List<Skill>> {
         val specialItems = user.items?.special
         val ownedItems = ArrayList<String>()
         for (key in listOf("snowball", "shinySeed", "seafoam", "spookySparkles")) {
-            if (specialItems?.firstOrNull() { it.key == key }?.numberOwned ?: 0 > 0) {
+            if ((specialItems?.firstOrNull { it.key == key }?.numberOwned ?: 0) > 0) {
                 ownedItems.add(key)
             }
         }
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Skill::class.java)
+        return realm.where(Skill::class.java)
                 .`in`("key", ownedItems.toTypedArray())
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        )
     }
 }
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
deleted file mode 100644
index a8b6b9ba5..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.executors;
-
-
-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
deleted file mode 100644
index 9617314a2..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.habitrpg.android.habitica.executors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Scheduler;
-
-@Singleton
-public class UIThread implements PostExecutionThread {
-
-    @Inject
-    public UIThread() {}
-
-    @Override
-    public Scheduler getScheduler() {
-        return AndroidSchedulers.mainThread();
-    }
-}
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 afab812d6..d2514ac9c 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,13 +1,18 @@
 package com.habitrpg.android.habitica.extensions
 
-import io.reactivex.rxjava3.core.Completable
-import java.util.concurrent.TimeUnit
+import com.habitrpg.android.habitica.helpers.launchCatching
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.delay
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 /**
  * Created by phillip on 01.02.18.
  */
 
-fun runDelayed(interval: Long, timeUnit: TimeUnit, function: () -> Unit) {
-    Completable.complete().delay(interval, timeUnit)
-        .subscribe(function)
+fun runDelayed(interval: Long, timeUnit: DurationUnit, function: () -> Unit) {
+    MainScope().launchCatching {
+        delay(interval.toDuration(timeUnit))
+        function()
+    }
 }
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
deleted file mode 100644
index 6d25b030e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.habitrpg.android.habitica.extensions
-
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.disposables.Disposable
-import io.reactivex.rxjava3.functions.Consumer
-
-fun <T : Any> 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
deleted file mode 100644
index 52ef4419f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.habitrpg.android.habitica.extensions
-
-import com.habitrpg.common.habitica.extensions.Optional
-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 : Any, T : Optional<S>> Flowable<T>.filterOptionalDoOnEmpty(function: () -> Unit): Flowable<S> {
-    return this.doOnNext { if (it.isEmpty) function() }
-        .filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S : Any, T : Optional<S>> Flowable<T>.filterMapEmpty(): Flowable<S> {
-    return this.filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S : Any, T : Any> Flowable<T>.filterMap(function: (T) -> S?): Flowable<S> {
-    return this.map { Optional(function(it)) }
-        .filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S : Any, T : Optional<S>> Observable<T>.filterOptionalDoOnEmpty(function: () -> Unit): Observable<S> {
-    return this.doOnNext { if (it.isEmpty) function() }
-        .filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S : Any, T : Optional<S>> Observable<T>.filterMapEmpty(): Observable<S> {
-    return this.filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S : Any, T : Any> Observable<T>.filterMap(function: (T) -> S?): Observable<S> {
-    return this.map { Optional(function(it)) }
-        .filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S, T : Optional<S>> Single<T>.filterOptionalDoOnEmpty(function: () -> Unit): Maybe<S> {
-    return this.doOnSuccess { if (it.isEmpty) function() }
-        .filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S, T : Optional<S>> Single<T>.filterMapEmpty(): Maybe<S> {
-    return this.filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S, T : Optional<S>> Maybe<T>.filterOptionalDoOnEmpty(function: () -> Unit): Maybe<S> {
-    return this.doOnSuccess { if (it.isEmpty) function() }
-        .filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
-
-fun <S, T : Optional<S>> Maybe<T>.filterMapEmpty(): Maybe<S> {
-    return this.filter { !it.isEmpty }
-        .map { it.assertedValue }
-}
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
index bcbe7b826..c8e33ed26 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.kt
@@ -1,9 +1,12 @@
 package com.habitrpg.android.habitica.helpers
 
-import com.amplitude.api.Amplitude
+import android.content.Context
+import android.content.SharedPreferences
+import com.amplitude.android.Amplitude
+import com.amplitude.android.Configuration
+import com.amplitude.android.events.Identify
 import com.habitrpg.android.habitica.BuildConfig
-import org.json.JSONException
-import org.json.JSONObject
+import com.habitrpg.android.habitica.R
 
 object AmplitudeManager {
     var EVENT_CATEGORY_BEHAVIOUR = "behaviour"
@@ -14,6 +17,8 @@ object AmplitudeManager {
     var EVENT_HITTYPE_REMOVE_WIDGET = "remove"
     var EVENT_HITTYPE_UPDATE_WIDGET = "update"
 
+    lateinit var amplitude: Amplitude
+
     @JvmOverloads
     fun sendEvent(
         eventAction: String?,
@@ -24,20 +29,20 @@ object AmplitudeManager {
         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)
-                }
+        val data = mutableMapOf<String, Any?>(
+            "eventAction" to eventAction,
+            "eventCategory" to eventCategory,
+            "hitType" to hitType,
+            "status" to "displayed"
+        )
+        if (additionalData != null) {
+            for ((key, value) in additionalData) {
+                data.put(key, value)
             }
-        } catch (exception: JSONException) {
         }
-        Amplitude.getInstance().logEvent(eventAction, eventProperties)
+        if (eventAction != null) {
+            amplitude.track(eventAction, data)
+        }
     }
 
     fun sendNavigationEvent(page: String) {
@@ -45,4 +50,20 @@ object AmplitudeManager {
         additionalData["page"] = page
         sendEvent("navigated", EVENT_CATEGORY_NAVIGATION, EVENT_HITTYPE_PAGEVIEW, additionalData)
     }
+
+    fun initialize(context: Context, sharedPrefs: SharedPreferences) {
+        amplitude = Amplitude(
+            Configuration(
+                context.getString(R.string.amplitude_app_id),
+                context
+            )
+        )
+
+        val identify = Identify()
+            .setOnce("androidStore", BuildConfig.STORE)
+        sharedPrefs.getString("launch_screen", "")?.let {
+            identify.set("launch_screen", it)
+        }
+        amplitude.identify(identify)
+    }
 }
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 c23b8c098..95828ea89 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
@@ -12,18 +12,22 @@ import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
 import com.habitrpg.android.habitica.models.promotions.HabiticaWebPromotion
 import com.habitrpg.android.habitica.models.promotions.getHabiticaPromotionFromKey
 import com.habitrpg.common.habitica.helpers.AppTestingLevel
+import kotlinx.coroutines.MainScope
 
 class AppConfigManager(contentRepository: ContentRepository?): com.habitrpg.common.habitica.helpers.AppConfigManager() {
 
     private var worldState: WorldState? = null
 
     init {
-        contentRepository?.getWorldState()?.subscribe(
-            {
-                worldState = it
-            },
-            RxErrorHandler.handleEmptyError()
-        )
+        try {
+            MainScope().launchCatching {
+                contentRepository?.getWorldState()?.collect {
+                        worldState = it
+                    }
+            }
+        } catch (_: java.lang.IllegalStateException) {
+            // pass
+        }
     }
 
     private val remoteConfig = FirebaseRemoteConfig.getInstance()
@@ -137,9 +141,7 @@ class AppConfigManager(contentRepository: ContentRepository?): com.habitrpg.comm
     }
 
     fun enableTeamBoards(): Boolean {
-        if (BuildConfig.DEBUG) {
-            return true
-        }
+        return true
         return remoteConfig.getBoolean("enableTeamBoards")
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
similarity index 60%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
index dce9aebb5..ea1bce780 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
@@ -3,27 +3,30 @@ package com.habitrpg.android.habitica.helpers
 import android.util.Log
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
-import io.reactivex.rxjava3.functions.Consumer
-import java.io.EOFException
-import java.io.IOException
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import okhttp3.internal.http2.ConnectionShutdownException
 import retrofit2.HttpException
+import java.io.EOFException
+import java.io.IOException
 
-class RxErrorHandler {
+class ExceptionHandler {
     private var analyticsManager: AnalyticsManager? = null
 
     companion object {
 
-        private var instance: RxErrorHandler? = null
+        private var instance = ExceptionHandler()
 
         fun init(analyticsManager: AnalyticsManager) {
-            instance = RxErrorHandler()
-            instance?.analyticsManager = analyticsManager
+            instance.analyticsManager = analyticsManager
         }
 
-        fun handleEmptyError(): Consumer<Throwable> {
-            // Can't be turned into a lambda, because it then doesn't work for some reason.
-            return Consumer { reportError(it) }
+        fun coroutine(handler: ((Throwable) -> Unit)? = null): CoroutineExceptionHandler {
+            return CoroutineExceptionHandler { _, throwable ->
+                reportError(throwable)
+                handler?.invoke(throwable)
+            }
         }
 
         fun reportError(throwable: Throwable) {
@@ -37,12 +40,17 @@ class RxErrorHandler {
                     !HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     !retrofit2.HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     !EOFException::class.java.isAssignableFrom(throwable.javaClass) &&
-                    !retrofit2.adapter.rxjava3.HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     throwable !is ConnectionShutdownException
                 ) {
-                    instance?.analyticsManager?.logException(throwable)
+                    instance.analyticsManager?.logException(throwable)
                 }
             }
         }
     }
 }
+
+fun CoroutineScope.launchCatching(errorHandler: ((Throwable) -> Unit)? = null, function: suspend CoroutineScope.() -> Unit) {
+    launch((ExceptionHandler.coroutine {
+        errorHandler?.invoke(it)
+    }), block = function)
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt
new file mode 100644
index 000000000..a7bc2b05b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt
@@ -0,0 +1,11 @@
+package com.habitrpg.android.habitica.helpers
+
+import android.content.res.Resources
+import com.habitrpg.android.habitica.models.tasks.Task
+
+interface GroupPlanInfoProvider {
+    fun assignedTextForTask(resources: Resources, assignedUsers: List<String>): String
+    fun canScoreTask(task: Task): Boolean
+    suspend fun canEditTask(task: Task): Boolean
+    suspend fun canAddTasks(): Boolean
+}
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 a5c6082ba..a5d4089c1 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
@@ -70,6 +70,6 @@ object MainNavigationController {
     }
 
     fun navigateBack() {
-        navController?.navigateUp()
+        navController?.popBackStack()
     }
 }
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 c24f5edaf..803829294 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
@@ -3,56 +3,50 @@ package com.habitrpg.android.habitica.helpers
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.common.habitica.models.Notification
 import com.habitrpg.android.habitica.models.tasks.Task
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.BehaviorSubject
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.common.habitica.models.Notification
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filterNotNull
 import java.lang.ref.WeakReference
 import java.util.Date
 
 interface NotificationsManager {
-    val displayNotificationEvents: Flowable<Notification>
+    val displayNotificationEvents: Flow<Notification>
     var apiClient: WeakReference<ApiClient>?
 
     fun setNotifications(current: List<Notification>)
-    fun getNotifications(): Flowable<List<Notification>>
+    fun getNotifications(): Flow<List<Notification>>
     fun getNotification(id: String): Notification?
     fun dismissTaskNotification(context: Context, task: Task)
 }
 
 class MainNotificationsManager: NotificationsManager {
-    private val displayNotificationSubject = PublishSubject.create<Notification>()
 
     private val seenNotifications: MutableMap<String, Boolean>
     override var apiClient: WeakReference<ApiClient>? = null
-    private val notifications: BehaviorSubject<List<Notification>>
 
     private var lastNotificationHandling: Date? = null
-
-    override val displayNotificationEvents: Flowable<Notification>
-        get() {
-            return displayNotificationSubject.toFlowable(BackpressureStrategy.DROP)
-        }
+    val _notifications = MutableStateFlow<List<Notification>?>(null)
+    val _displaynotificationEvents = MutableStateFlow<Notification?>(null)
+    override val displayNotificationEvents: Flow<Notification> = _displaynotificationEvents.filterNotNull()
 
     init {
         this.seenNotifications = HashMap()
-        this.notifications = BehaviorSubject.create()
     }
 
     override fun setNotifications(current: List<Notification>) {
-        this.notifications.onNext(current)
+        _notifications.value = current
         this.handlePopupNotifications(current)
     }
 
-    override fun getNotifications(): Flowable<List<Notification>> {
-        return this.notifications.startWithArray(emptyList())
-            .toFlowable(BackpressureStrategy.LATEST)
+    override fun getNotifications(): Flow<List<Notification>> {
+        return _notifications.filterNotNull()
     }
 
     override fun getNotification(id: String): Notification? {
-        return this.notifications.value?.find { it.id == id }
+        return _notifications.value?.find { it.id == id }
     }
 
     override fun dismissTaskNotification(context: Context, task: Task) {
@@ -109,7 +103,7 @@ class MainNotificationsManager: NotificationsManager {
                 }
 
                 if (notificationDisplayed) {
-                    displayNotificationSubject.onNext(it)
+                    _displaynotificationEvents.value = it
                     this.seenNotifications[it.id] = true
                     readNotification(it)
                 }
@@ -119,7 +113,8 @@ class MainNotificationsManager: NotificationsManager {
     }
 
     private fun readNotification(notification: Notification) {
-        apiClient?.get()?.readNotification(notification.id)
-            ?.subscribe({ }, RxErrorHandler.handleEmptyError())
+        MainScope().launchCatching {
+            apiClient?.get()?.readNotification(notification.id)
+        }
     }
 }
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 ba9d71278..7d497f91a 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
@@ -25,26 +25,25 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.extensions.addOkButton
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.common.habitica.models.IAPGift
-import com.habitrpg.common.habitica.models.PurchaseValidationRequest
-import com.habitrpg.common.habitica.models.Transaction
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.activities.PurchaseActivity
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.rxjava3.core.Flowable
-import java.util.Date
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
+import com.habitrpg.common.habitica.models.IAPGift
+import com.habitrpg.common.habitica.models.PurchaseValidationRequest
+import com.habitrpg.common.habitica.models.Transaction
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import retrofit2.HttpException
+import java.util.Date
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class PurchaseHandler(
     private val context: Context,
@@ -73,10 +72,13 @@ class PurchaseHandler(
                 val mostRecentSub = findMostRecentSubscription(purchases)
                 val plan = userViewModel.user.value?.purchased?.plan
                 for (purchase in purchases) {
-                    if (plan?.isActive == true && PurchaseTypes.allSubscriptionTypes.contains(purchase.skus.firstOrNull())) {
+                    if (plan?.isActive == true && PurchaseTypes.allSubscriptionTypes.contains(
+                            purchase.skus.firstOrNull()
+                        )
+                    ) {
                         if ((plan.additionalData?.data?.orderId == purchase.orderId &&
-                            ((plan.dateTerminated != null) == purchase.isAutoRenewing)) ||
-                                mostRecentSub?.orderId != purchase.orderId
+                                ((plan.dateTerminated != null) == purchase.isAutoRenewing)) ||
+                            mostRecentSub?.orderId != purchase.orderId
                         ) {
                             return
                         }
@@ -88,7 +90,7 @@ class PurchaseHandler(
                 return
             }
             BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
-                CoroutineScope(Dispatchers.IO).launch {
+                CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
                     for (purchase in purchases) {
                         consume(purchase)
                     }
@@ -139,8 +141,8 @@ class PurchaseHandler(
         billingClient.endConnection()
     }
 
-    fun queryPurchases(){
-        if (billingClientState == BillingClientState.READY){
+    fun queryPurchases() {
+        if (billingClientState == BillingClientState.READY) {
             billingClient.queryPurchasesAsync(
                 BillingClient.SkuType.SUBS,
                 this@PurchaseHandler
@@ -186,7 +188,13 @@ class PurchaseHandler(
         return skuDetailsResult.skuDetailsList
     }
 
-    fun purchase(activity: Activity, skuDetails: SkuDetails, recipient: String? = null) {
+    fun purchase(
+        activity: Activity,
+        skuDetails: SkuDetails,
+        recipient: String? = null,
+        isSaleGemPurchase: Boolean = false
+    ) {
+        this.isSaleGemPurchase = isSaleGemPurchase
         recipient?.let {
             addGift(skuDetails.sku, it)
         }
@@ -216,41 +224,50 @@ class PurchaseHandler(
         when {
             PurchaseTypes.allGemTypes.contains(sku) -> {
                 val validationRequest = buildValidationRequest(purchase)
-                apiClient.validatePurchase(validationRequest).subscribe({
-                    processedPurchase(purchase)
-                    val gift = removeGift(sku)
-                    CoroutineScope(Dispatchers.IO).launch {
-                        consume(purchase)
+                MainScope().launchCatching {
+                    try {
+                        apiClient.validatePurchase(validationRequest)
+                        processedPurchase(purchase)
+                        val gift = removeGift(sku)
+                        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
+                            consume(purchase)
+                        }
+                        displayConfirmationDialog(purchase, gift?.second)
+                    } catch (throwable: Throwable) {
+                        handleError(throwable, purchase)
                     }
-                    displayConfirmationDialog(purchase, gift?.second)
-                }) { throwable: Throwable ->
-                    handleError(throwable, purchase)
                 }
             }
             PurchaseTypes.allSubscriptionNoRenewTypes.contains(sku) -> {
                 val validationRequest = buildValidationRequest(purchase)
-                apiClient.validateNoRenewSubscription(validationRequest).subscribe({
-                    processedPurchase(purchase)
-                    val gift = removeGift(sku)
-                    CoroutineScope(Dispatchers.IO).launch {
-                        consume(purchase)
+                MainScope().launchCatching {
+                    try {
+                        apiClient.validateNoRenewSubscription(validationRequest)
+                        processedPurchase(purchase)
+                        val gift = removeGift(sku)
+                        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
+                            consume(purchase)
+                        }
+                        displayConfirmationDialog(purchase, gift?.second)
+                    } catch (throwable: Throwable) {
+                        handleError(throwable, purchase)
                     }
-                    displayConfirmationDialog(purchase, gift?.second)
-                }) { throwable: Throwable ->
-                    handleError(throwable, purchase)
                 }
             }
             PurchaseTypes.allSubscriptionTypes.contains(sku) -> {
                 val validationRequest = buildValidationRequest(purchase)
-                apiClient.validateSubscription(validationRequest).subscribe({
-                    processedPurchase(purchase)
-                    analyticsManager.logEvent("user_subscribed", bundleOf(Pair("sku", sku)))
-                    CoroutineScope(Dispatchers.IO).launch {
-                        acknowledgePurchase(purchase)
+                MainScope().launchCatching {
+                    try {
+                        apiClient.validateSubscription(validationRequest)
+                        processedPurchase(purchase)
+                        analyticsManager.logEvent("user_subscribed", bundleOf(Pair("sku", sku)))
+                        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
+                            acknowledgePurchase(purchase)
+                        }
+                        displayConfirmationDialog(purchase)
+                    } catch (throwable: Throwable) {
+                        handleError(throwable, purchase)
                     }
-                    displayConfirmationDialog(purchase)
-                }) { throwable: Throwable ->
-                    handleError(throwable, purchase)
                 }
             }
         }
@@ -268,7 +285,9 @@ class PurchaseHandler(
     }
 
     private fun processedPurchase(purchase: Purchase) {
-        userViewModel.userRepository.retrieveUser(false, true).subscribeWithErrorHandler {}
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            userViewModel.userRepository.retrieveUser(false, true)
+        }
     }
 
     private fun buildValidationRequest(purchase: Purchase): PurchaseValidationRequest {
@@ -296,7 +315,7 @@ class PurchaseHandler(
                 if (res.message != null && res.message == "RECEIPT_ALREADY_USED") {
                     processedPurchase(purchase)
                     removeGift(purchase.skus.firstOrNull())
-                    CoroutineScope(Dispatchers.IO).launch {
+                    CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
                         consume(purchase)
                     }
                     return
@@ -318,7 +337,8 @@ class PurchaseHandler(
     }
 
     private fun findMostRecentSubscription(purchasesList: List<Purchase>): Purchase? {
-        val purchases = purchasesList.filter { it.isAcknowledged }.sortedByDescending { it.purchaseTime }
+        val purchases =
+            purchasesList.filter { it.isAcknowledged }.sortedByDescending { it.purchaseTime }
         var fallback: Purchase? = null
         // If there is a subscription that is still active, prioritise that. Otherwise return the most recent one.
         for (purchase in purchases) {
@@ -331,9 +351,9 @@ class PurchaseHandler(
         return fallback
     }
 
-    fun cancelSubscription(): Flowable<User> {
-        return apiClient.cancelSubscription()
-            .flatMap { userViewModel.userRepository.retrieveUser(false, true) }
+    suspend fun cancelSubscription(): User? {
+        apiClient.cancelSubscription()
+        return userViewModel.userRepository.retrieveUser(false, true)
     }
 
     private fun durationString(sku: String): String {
@@ -346,18 +366,31 @@ class PurchaseHandler(
         }
     }
 
+    private var isSaleGemPurchase = false
+
     private fun gemAmountString(sku: String): String {
-        return when (sku) {
-            PurchaseTypes.Purchase4Gems -> "4"
-            PurchaseTypes.Purchase21Gems -> "21"
-            PurchaseTypes.Purchase42Gems -> "42"
-            PurchaseTypes.Purchase84Gems -> "84"
-            else -> ""
+        if (isSaleGemPurchase) {
+            isSaleGemPurchase = false
+            return when (sku) {
+                PurchaseTypes.Purchase4Gems -> "5"
+                PurchaseTypes.Purchase21Gems -> "30"
+                PurchaseTypes.Purchase42Gems -> "60"
+                PurchaseTypes.Purchase84Gems -> "125"
+                else -> ""
+            }
+        } else {
+            return when (sku) {
+                PurchaseTypes.Purchase4Gems -> "4"
+                PurchaseTypes.Purchase21Gems -> "21"
+                PurchaseTypes.Purchase42Gems -> "42"
+                PurchaseTypes.Purchase84Gems -> "84"
+                else -> ""
+            }
         }
     }
 
     private fun displayConfirmationDialog(purchase: Purchase, giftedTo: String? = null) {
-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.Main).launch(ExceptionHandler.coroutine()) {
             val application = (context as? HabiticaBaseApplication)
                 ?: (context.applicationContext as? HabiticaBaseApplication) ?: return@launch
             val sku = purchase.skus.firstOrNull() ?: return@launch
@@ -365,18 +398,29 @@ class PurchaseHandler(
             val message = when {
                 PurchaseTypes.allSubscriptionNoRenewTypes.contains(sku) -> {
                     title = context.getString(R.string.gift_confirmation_title)
-                    context.getString(R.string.gift_confirmation_text_sub, giftedTo, durationString(sku))
+                    context.getString(
+                        R.string.gift_confirmation_text_sub,
+                        giftedTo,
+                        durationString(sku)
+                    )
                 }
                 PurchaseTypes.allSubscriptionTypes.contains(sku) -> {
                     if (sku == PurchaseTypes.Subscription1Month) {
                         context.getString(R.string.subscription_confirmation)
                     } else {
-                        context.getString(R.string.subscription_confirmation_multiple, durationString(sku))
+                        context.getString(
+                            R.string.subscription_confirmation_multiple,
+                            durationString(sku)
+                        )
                     }
                 }
                 PurchaseTypes.allGemTypes.contains(sku) && giftedTo != null -> {
                     title = context.getString(R.string.gift_confirmation_title)
-                    context.getString(R.string.gift_confirmation_text_gems_new, giftedTo, gemAmountString(sku))
+                    context.getString(
+                        R.string.gift_confirmation_text_gems_new,
+                        giftedTo,
+                        gemAmountString(sku)
+                    )
                 }
                 PurchaseTypes.allGemTypes.contains(sku) && giftedTo == null -> {
                     context.getString(R.string.gem_purchase_confirmation, gemAmountString(sku))
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 0864cffe4..c715886b1 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
@@ -37,7 +37,7 @@ class SoundFile(val theme: String, private val fileName: String) {
             player?.setDataSource(file?.path)
             val attributes = AudioAttributes.Builder()
                 .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                .setLegacyStreamType(AudioManager.STREAM_NOTIFICATION)
+                .setLegacyStreamType(AudioManager.STREAM_MUSIC)
                 .build()
             player?.setAudioAttributes(attributes)
             player?.prepare()
@@ -48,7 +48,7 @@ class SoundFile(val theme: String, private val fileName: String) {
             player?.start()
         } catch (e: IllegalStateException) {
         } catch (e: Exception) {
-            RxErrorHandler.reportError(e)
+            ExceptionHandler.reportError(e)
         }
     }
 }
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 98033f7d1..0e61f48af 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,16 +4,15 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Environment
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
-import java.io.File
-import java.io.IOException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okio.buffer
 import okio.sink
+import java.io.File
+import java.io.IOException
 
 // based on http://stackoverflow.com/questions/29838565/downloading-files-using-okhttp-okio-and-rxjava
 class SoundFileLoader(private val context: Context) {
@@ -26,52 +25,42 @@ class SoundFileLoader(private val context: Context) {
         }
 
     @SuppressLint("SetWorldReadable", "ReturnCount")
-    fun download(files: List<SoundFile>): Single<List<SoundFile>> {
-        return Observable.fromIterable(files)
-            .flatMap(
-                { audioFile ->
+    suspend fun download(files: List<SoundFile>): List<SoundFile> {
+        return files.map { audioFile ->
+                withContext(Dispatchers.IO) {
                     val file = File(getFullAudioFilePath(audioFile))
                     if (file.exists() && file.length() > 5000) {
                         // Important, or else the MediaPlayer can't access this file
                         file.setReadable(true, false)
                         audioFile.file = file
-                        return@flatMap Observable.just(audioFile)
+                        return@withContext audioFile
+                    }
+                    val request = Request.Builder().url(audioFile.webUrl).build()
+
+                    val response: Response
+                    try {
+                        response = client.newCall(request).execute()
+                        if (!response.isSuccessful) {
+                            throw IOException()
+                        }
+                    } catch (io: IOException) {
+                        return@withContext audioFile
                     }
 
-                    val fileObservable = Observable.create<SoundFile> { sub ->
-                        val request = Request.Builder().url(audioFile.webUrl).build()
-
-                        val response: Response
-                        try {
-                            response = client.newCall(request).execute()
-                            if (!response.isSuccessful) {
-                                throw IOException()
-                            }
-                        } catch (io: IOException) {
-                            sub.onComplete()
-                            return@create
-                        }
-
-                        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()
+                    try {
+                        val sink = file.sink().buffer()
+                        sink.writeAll(response.body!!.source())
+                        sink.flush()
+                        sink.close()
+                    } catch (io: IOException) {
+                        return@withContext audioFile
                     }
-                    fileObservable.subscribeOn(Schedulers.io())
-                },
-                5
-            )
-            .toList()
+
+                    file.setReadable(true, false)
+                    audioFile.file = file
+                    return@withContext audioFile
+                }
+        }
     }
 
     private fun getFullAudioFilePath(soundFile: SoundFile): String =
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 d4387f280..4eba474b2 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,7 +1,7 @@
 package com.habitrpg.android.habitica.helpers
 
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import io.reactivex.rxjava3.schedulers.Schedulers
+import kotlinx.coroutines.MainScope
 import javax.inject.Inject
 
 class SoundManager {
@@ -33,8 +33,9 @@ class SoundManager {
         soundFiles.add(SoundFile(soundTheme, SoundPlusHabit))
         soundFiles.add(SoundFile(soundTheme, SoundReward))
         soundFiles.add(SoundFile(soundTheme, SoundTodo))
-        soundFileLoader.download(soundFiles)
-            .subscribe({}, RxErrorHandler.handleEmptyError())
+        MainScope().launchCatching {
+            soundFileLoader.download(soundFiles)
+        }
     }
 
     fun loadAndPlayAudio(type: String) {
@@ -48,14 +49,12 @@ class SoundManager {
             val soundFiles = ArrayList<SoundFile>()
 
             soundFiles.add(SoundFile(soundTheme, type))
-            soundFileLoader.download(soundFiles).observeOn(Schedulers.newThread()).subscribe(
-                {
-                    val file = soundFiles[0]
-                    loadedSoundFiles[type] = file
-                    file.play()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
+            MainScope().launchCatching {
+                val newFiles = soundFileLoader.download(soundFiles)
+                val file = newFiles[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 3431f4b88..2550ed7fc 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
@@ -16,7 +16,11 @@ import com.habitrpg.android.habitica.receivers.TaskReceiver
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
 import com.habitrpg.shared.habitica.models.tasks.TaskType
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
@@ -55,10 +59,12 @@ class TaskAlarmManager(
     // We currently only use this function to schedule the next reminder for dailies
     // We may be able to use repeating alarms instead of this in the future
     fun addAlarmForTaskId(taskId: String) {
-        taskRepository.getTaskCopy(taskId)
-            .filter { task -> task.isValid && task.isManaged && TaskType.DAILY == task.type }
-            .firstElement()
-            .subscribe({ this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError())
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            val task = taskRepository.getTaskCopy(taskId)
+                .filter { task -> task.isValid && task.isManaged && TaskType.DAILY == task.type }
+                .first()
+            setAlarmsForTask(task)
+        }
     }
 
     suspend fun scheduleAllSavedAlarms(preventDailyReminder: Boolean) {
@@ -216,7 +222,11 @@ class TaskAlarmManager(
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                 alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, 60000, pendingIntent)
             } else {
-                alarmManager?.setAlarmClock(AlarmClockInfo(time, pendingIntent), pendingIntent)
+                try {
+                    alarmManager?.setAlarmClock(AlarmClockInfo(time, pendingIntent), pendingIntent)
+                } catch (e: SecurityException) {
+                    alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, 60000, pendingIntent)
+                }
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskDescriptionBuilder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskDescriptionBuilder.kt
new file mode 100644
index 000000000..f89555f6b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskDescriptionBuilder.kt
@@ -0,0 +1,48 @@
+package com.habitrpg.android.habitica.helpers
+
+import android.content.Context
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.common.habitica.extensions.nameRes
+import com.habitrpg.shared.habitica.models.tasks.TaskDifficulty
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import java.text.DateFormat
+import java.util.Date
+
+class TaskDescriptionBuilder(private val context: Context) {
+
+    fun describe(task: Task): String {
+        return when (task.type) {
+            TaskType.HABIT -> context.getString(R.string.habit_summary_description, describeHabitDirections(task.up ?: false, task.down ?: false), describeDifficulty(task.priority))
+            TaskType.TODO -> {
+                if (task.dueDate != null) {
+                    context.getString(R.string.todo_summary_description_duedate, describeDifficulty(task.priority), describeDate(task.dueDate!!))
+                } else {
+                    context.getString(R.string.todo_summary_description, describeDifficulty(task.priority))
+                }
+            }
+            TaskType.DAILY -> context.getString(R.string.daily_summary_description, describeDifficulty(task.priority), "sometimes")
+            else -> ""
+        }
+    }
+
+    private val dateFormatter = DateFormat.getDateInstance()
+
+    private fun describeDate(date: Date): String {
+        return dateFormatter.format(date)
+    }
+
+    private fun describeHabitDirections(up: Boolean, down: Boolean): String {
+        return if (up && down) {
+            context.getString(R.string.positive_and_negative)
+        } else if (up) {
+            context.getString(R.string.positive_habit_form)
+        } else {
+            context.getString(R.string.negative_habit_form)
+        }
+    }
+
+    private fun describeDifficulty(difficulty: Float): String {
+        return context.getString(TaskDifficulty.valueOf(difficulty).nameRes)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
index de8b61a14..f75d18a68 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
@@ -25,7 +25,7 @@ class UserStatComputer {
         var stats: String? = null
     }
 
-    fun computeClassBonus(equipmentList: List<Equipment>, user: Avatar): List<StatsRow> {
+    fun computeClassBonus(equipmentList: List<Equipment>?, user: Avatar): List<StatsRow> {
         val skillRows = ArrayList<StatsRow>()
 
         var strAttributes = 0f
@@ -39,7 +39,7 @@ class UserStatComputer {
         var perClassBonus = 0f
 
         // Summarize stats and fill equipment table
-        for (i in equipmentList) {
+        for (i in equipmentList ?: emptyList()) {
             val strength = i.str
             val intelligence = i._int
             val constitution = i.con
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 d4cdcd1ad..93709ac1d 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
@@ -16,13 +16,16 @@ class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
     internal lateinit var pushNotificationManager: PushNotificationManager
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
-        userComponent?.inject(this)
-        if (this::pushNotificationManager.isInitialized) {
-            pushNotificationManager.displayNotification(remoteMessage)
+        try {
+            userComponent?.inject(this)
+        } catch (_: java.lang.IllegalStateException) {
+        }
+        PushNotificationManager.displayNotification(remoteMessage, applicationContext)
 
-            if (remoteMessage.data["identifier"]?.contains(PushNotificationManager.WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true) {
+        if (remoteMessage.data["identifier"]?.contains(PushNotificationManager.WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true) {
+            // if (this::userRepository.isInitialized) {
                 // 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 ec2a1c035..91cb2c279 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
@@ -7,6 +7,7 @@ import android.media.RingtoneManager
 import androidx.annotation.CallSuper
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
 import com.habitrpg.android.habitica.ui.activities.MainActivity
@@ -32,6 +33,7 @@ abstract class HabiticaLocalNotification(
         val path = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
         return notificationBuilder
             .setSound(path)
+            .setColor(ContextCompat.getColor(context, R.color.brand_300))
     }
 
     @CallSuper
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
index a71cfb522..f45e3e122 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
@@ -2,9 +2,6 @@ package com.habitrpg.android.habitica.helpers.notifications
 
 import android.content.Context
 
-/**
- * Created by keithholliday on 6/28/16.
- */
 class HabiticaLocalNotificationFactory {
     // use getShape method to get object of type shape
     fun build(notificationType: String?, context: Context?): HabiticaLocalNotification {
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 f6ce17841..89f2a7ea1 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
@@ -7,8 +7,9 @@ import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.RemoteMessage
 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.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.User
+import kotlinx.coroutines.MainScope
 
 class PushNotificationManager(
     var apiClient: ApiClient,
@@ -34,27 +35,35 @@ class PushNotificationManager(
     }
 
     fun addPushDeviceUsingStoredToken() {
-        FirebaseMessaging.getInstance().token.addOnCompleteListener {
-            if (!it.isSuccessful) {
-                return@addOnCompleteListener
-            }
-            this.refreshedToken = it.result
-            if (this.refreshedToken.isEmpty() || this.user == null || this.userHasPushDevice() || !this.userIsSubscribedToNotifications()) {
-                return@addOnCompleteListener
+        if (refreshedToken.isNotBlank()) {
+            addRefreshToken()
+        } else {
+            FirebaseMessaging.getInstance().token.addOnCompleteListener {
+                refreshedToken = it.result
+                addRefreshToken()
             }
+        }
+    }
 
-            val pushDeviceData = HashMap<String, String>()
-            pushDeviceData["regId"] = this.refreshedToken
-            pushDeviceData["type"] = "android"
-            apiClient.addPushDevice(pushDeviceData).subscribe({ }, RxErrorHandler.handleEmptyError())
+    private fun addRefreshToken() {
+        if (this.refreshedToken.isEmpty() || this.user == null || this.userHasPushDevice()) {
+            return
+        }
+        val pushDeviceData = HashMap<String, String>()
+        pushDeviceData["regId"] = this.refreshedToken
+        pushDeviceData["type"] = "android"
+        MainScope().launchCatching {
+            apiClient.addPushDevice(pushDeviceData)
         }
     }
 
     fun removePushDeviceUsingStoredToken() {
-        if (this.refreshedToken.isEmpty()) {
+        if (this.refreshedToken.isEmpty() || !userHasPushDevice()) {
             return
         }
-        apiClient.deletePushDevice(this.refreshedToken).subscribe({ }, RxErrorHandler.handleEmptyError())
+        MainScope().launchCatching {
+            apiClient.deletePushDevice(refreshedToken)
+        }
     }
 
     private fun userHasPushDevice(): Boolean {
@@ -66,47 +75,17 @@ class PushNotificationManager(
         return this.user?.pushDevices == null
     }
 
-    fun displayNotification(remoteMessage: RemoteMessage) {
-        val remoteMessageIdentifier = remoteMessage.data["identifier"]
-
-        val notificationFactory = HabiticaLocalNotificationFactory()
-        val notification = notificationFactory.build(remoteMessageIdentifier, context)
-        if (userIsSubscribedToNotificationType(remoteMessageIdentifier)) {
-            if (remoteMessage.data.containsKey("sendAnalytics")) {
-                val additionalData = HashMap<String, Any>()
-                additionalData["identifier"] = remoteMessageIdentifier ?: ""
-                AmplitudeManager.sendEvent(
-                    "receive notification",
-                    AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR,
-                    AmplitudeManager.EVENT_HITTYPE_EVENT,
-                    additionalData
-                )
-            }
-            notification.setExtras(remoteMessage.data)
-            notification.notifyLocally(remoteMessage.data["title"], remoteMessage.data["body"], remoteMessage.data)
-        }
-    }
-
-    private fun userIsSubscribedToNotifications(): Boolean {
-        return sharedPreferences.getBoolean("pushNotifications", true)
-    }
-
     private fun userIsSubscribedToNotificationType(type: String?): Boolean {
-        var key = ""
-
-        if (type == null) {
-            return true
-        }
-
-        when {
-            type == PARTY_INVITE_PUSH_NOTIFICATION_KEY -> key = "preference_push_invited_to_party"
-            type.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY) -> key = "preference_push_received_a_private_message"
-            type.contains(RECEIVED_GEMS_PUSH_NOTIFICATION_KEY) -> key = "preference_push_gifted_gems"
-            type.contains(RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY) -> key = "preference_push_gifted_subscription"
-            type.contains(GUILD_INVITE_PUSH_NOTIFICATION_KEY) -> key = "preference_push_invited_to_guild"
-            type.contains(QUEST_INVITE_PUSH_NOTIFICATION_KEY) -> key = "preference_push_invited_to_quest"
-            type.contains(QUEST_BEGUN_PUSH_NOTIFICATION_KEY) -> key = "preference_push_your_quest_has_begun"
-            type.contains(WON_CHALLENGE_PUSH_NOTIFICATION_KEY) -> key = "preference_push_you_won_challenge"
+        val key = when {
+            type == PARTY_INVITE_PUSH_NOTIFICATION_KEY -> "preference_push_invited_to_party"
+            type?.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_received_a_private_message"
+            type?.contains(RECEIVED_GEMS_PUSH_NOTIFICATION_KEY) == true -> "preference_push_gifted_gems"
+            type?.contains(RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY) == true -> "preference_push_gifted_subscription"
+            type?.contains(GUILD_INVITE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_invited_to_guild"
+            type?.contains(QUEST_INVITE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_invited_to_quest"
+            type?.contains(QUEST_BEGUN_PUSH_NOTIFICATION_KEY) == true -> "preference_push_your_quest_has_begun"
+            type?.contains(WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_you_won_challenge"
+            else -> return true
         }
 
         return sharedPreferences.getBoolean(key, true)
@@ -127,5 +106,28 @@ class PushNotificationManager(
         const val GROUP_ACTIVITY_NOTIFICATION_KEY = "groupActivity"
         const val G1G1_PROMO_KEY = "g1g1Promo"
         private const val DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference"
+
+        fun displayNotification(remoteMessage: RemoteMessage, context: Context, pushNotificationManager: PushNotificationManager? = null) {
+            val remoteMessageIdentifier = remoteMessage.data["identifier"]
+
+            val notificationFactory = HabiticaLocalNotificationFactory()
+            val notification = notificationFactory.build(remoteMessageIdentifier,
+                context
+            )
+            if (pushNotificationManager?.userIsSubscribedToNotificationType(remoteMessageIdentifier) != false) {
+                if (remoteMessage.data.containsKey("sendAnalytics")) {
+                    val additionalData = HashMap<String, Any>()
+                    additionalData["identifier"] = remoteMessageIdentifier ?: ""
+                    AmplitudeManager.sendEvent(
+                        "receive notification",
+                        AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR,
+                        AmplitudeManager.EVENT_HITTYPE_EVENT,
+                        additionalData
+                    )
+                }
+                notification.setExtras(remoteMessage.data)
+                notification.notifyLocally(remoteMessage.data["title"], remoteMessage.data["body"], remoteMessage.data)
+            }
+        }
     }
 }
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 8f0c30ac5..617c50a8a 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
@@ -1,30 +1,27 @@
 package com.habitrpg.android.habitica.interactors
 
 import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.executors.PostExecutionThread
 import com.habitrpg.android.habitica.helpers.SoundManager
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.rxjava3.core.Flowable
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import javax.inject.Inject
 
 class BuyRewardUseCase @Inject
 constructor(
     private val taskRepository: TaskRepository,
     private val soundManager: SoundManager,
-    postExecutionThread: PostExecutionThread
-) : UseCase<BuyRewardUseCase.RequestValues, TaskScoringResult?>(postExecutionThread) {
+) : FlowUseCase<BuyRewardUseCase.RequestValues, TaskScoringResult?>() {
 
-    override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<TaskScoringResult?> {
-        return taskRepository
-            .taskChecked(requestValues.user, requestValues.task, false, false, requestValues.notifyFunc)
-            .doOnNext { soundManager.loadAndPlayAudio(SoundManager.SoundReward) }
+    override suspend fun run(requestValues: RequestValues): TaskScoringResult? {
+        val response = taskRepository.taskChecked(requestValues.user, requestValues.task, false, false, requestValues.notifyFunc)
+        soundManager.loadAndPlayAudio(SoundManager.SoundReward)
+        return response
     }
 
     class RequestValues(
         internal val user: User?,
         val task: Task,
         val notifyFunc: (TaskScoringResult) -> Unit
-    ) : UseCase.RequestValues
+    ) : FlowUseCase.RequestValues
 }
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 d0cd898ff..1c2cf3fb7 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
@@ -3,30 +3,23 @@ package com.habitrpg.android.habitica.interactors
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import com.habitrpg.android.habitica.executors.PostExecutionThread
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
-import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
 
-class CheckClassSelectionUseCase @Inject constructor(postExecutionThread: PostExecutionThread) : UseCase<CheckClassSelectionUseCase.RequestValues, Void>(postExecutionThread) {
+class CheckClassSelectionUseCase @Inject constructor() : FlowUseCase<CheckClassSelectionUseCase.RequestValues, Unit>() {
 
-    override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<Void> {
-        return Flowable.defer {
-            val user = requestValues.user
-
-            if (requestValues.currentClass == null) {
-                if (user?.stats?.lvl ?: 0 >= 9 &&
-                    user?.preferences?.disableClasses != true &&
-                    user?.flags?.classSelected != true
-                ) {
-                    displayClassSelectionActivity(true, null, requestValues.activity)
-                }
-            } else {
-                displayClassSelectionActivity(requestValues.isInitialSelection, requestValues.currentClass, requestValues.activity)
+    override suspend fun run(requestValues: RequestValues) {
+        val user = requestValues.user
+        if (requestValues.currentClass == null) {
+            if ((user?.stats?.lvl ?: 0) >= 9 &&
+                user?.preferences?.disableClasses != true &&
+                user?.flags?.classSelected != true
+            ) {
+                displayClassSelectionActivity(true, null, requestValues.activity)
             }
-
-            Flowable.empty()
+        } else {
+            displayClassSelectionActivity(requestValues.isInitialSelection, requestValues.currentClass, requestValues.activity)
         }
     }
 
@@ -49,5 +42,5 @@ class CheckClassSelectionUseCase @Inject constructor(postExecutionThread: PostEx
         val isInitialSelection: Boolean,
         val currentClass: String?,
         val activity: Activity
-    ) : UseCase.RequestValues
+    ) : FlowUseCase.RequestValues
 }
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 c5e841032..f108a63bc 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
@@ -3,11 +3,9 @@ package com.habitrpg.android.habitica.interactors
 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.helpers.SoundManager
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
@@ -15,32 +13,35 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class DisplayItemDropUseCase @Inject
-constructor(private val soundManager: SoundManager, postExecutionThread: PostExecutionThread) : UseCase<DisplayItemDropUseCase.RequestValues, Void>(postExecutionThread) {
+constructor(private val soundManager: SoundManager):
+    FlowUseCase<DisplayItemDropUseCase.RequestValues, Unit>() {
 
-    override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<Void> {
-        return Flowable.defer {
-            val data = requestValues.data
-            val snackbarText = StringBuilder(data?.drop?.dialog ?: "")
+    override suspend fun run(requestValues: RequestValues) {
+        val data = requestValues.data
+        val snackbarText = StringBuilder(data?.drop?.dialog ?: "")
 
-            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()) {
-                MainScope().launch(context = Dispatchers.Main) {
-                    delay(3000L)
-                    HabiticaSnackbar.showSnackbar(
-                        requestValues.snackbarTargetView,
-                        snackbarText, HabiticaSnackbar.SnackbarDisplayType.DROP, true
-                    )
-                    soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop)
-                }
-            }
-
-            Flowable.empty()
+        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()) {
+            MainScope().launch(context = Dispatchers.Main) {
+                delay(3000L)
+                HabiticaSnackbar.showSnackbar(
+                    requestValues.snackbarTargetView,
+                    snackbarText, HabiticaSnackbar.SnackbarDisplayType.DROP, true
+                )
+                soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop)
+            }
+        }
+        return
     }
 
     class RequestValues(
@@ -48,5 +49,5 @@ constructor(private val soundManager: SoundManager, postExecutionThread: PostExe
         val context: AppCompatActivity,
         val snackbarTargetView: ViewGroup,
         val showQuestItems: Boolean
-    ) : UseCase.RequestValues
+    ) : FlowUseCase.RequestValues
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
index eba34e677..5ae6bf77b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
@@ -7,75 +7,75 @@ import android.view.View
 import android.widget.FrameLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.executors.PostExecutionThread
 import com.habitrpg.android.habitica.models.inventory.Food
 import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.shared.habitica.models.responses.FeedResponse
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.rxjava3.core.Flowable
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
+import com.habitrpg.shared.habitica.models.responses.FeedResponse
 import javax.inject.Inject
 
 class FeedPetUseCase @Inject
 constructor(
     private val inventoryRepository: InventoryRepository,
-    postExecutionThread: PostExecutionThread
-) : UseCase<FeedPetUseCase.RequestValues, FeedResponse>(postExecutionThread) {
-    override fun buildUseCaseObservable(requestValues: FeedPetUseCase.RequestValues): Flowable<FeedResponse> {
-        return inventoryRepository.feedPet(requestValues.pet, requestValues.food)
-            .doOnNext { feedResponse ->
-                (requestValues.context as? SnackbarActivity)?.showSnackbar(content = feedResponse.message)
-                if (feedResponse.value == -1) {
-                    val mountWrapper =
-                        View.inflate(
-                            requestValues.context,
-                            R.layout.pet_imageview,
-                            null
-                        ) as? FrameLayout
-                    val mountImageView =
-                        mountWrapper?.findViewById(R.id.pet_imageview) as? PixelArtView
+) : FlowUseCase<FeedPetUseCase.RequestValues, FeedResponse?>() {
+    override suspend fun run(requestValues: FeedPetUseCase.RequestValues): FeedResponse? {
+        val feedResponse = inventoryRepository.feedPet(requestValues.pet, requestValues.food)
+        (requestValues.context as? SnackbarActivity)?.showSnackbar(content = feedResponse?.message)
+        if (feedResponse?.value == -1) {
+            val mountWrapper =
+                View.inflate(
+                    requestValues.context,
+                    R.layout.pet_imageview,
+                    null
+                ) as? FrameLayout
+            val mountImageView =
+                mountWrapper?.findViewById(R.id.pet_imageview) as? PixelArtView
 
-                    mountImageView?.loadImage("Mount_Icon_" + requestValues.pet.key)
-                    val dialog = HabiticaAlertDialog(requestValues.context)
-                    dialog.setTitle(
-                        requestValues.context.getString(
-                            R.string.evolved_pet_title,
-                            requestValues.pet.text
-                        )
+            mountImageView?.loadImage("Mount_Icon_" + requestValues.pet.key)
+            val dialog = HabiticaAlertDialog(requestValues.context)
+            dialog.setTitle(
+                requestValues.context.getString(
+                    R.string.evolved_pet_title,
+                    requestValues.pet.text
+                )
+            )
+            dialog.setAdditionalContentView(mountWrapper)
+            dialog.addButton(R.string.onwards, true)
+            dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
+                val message =
+                    requestValues.context.getString(
+                        R.string.share_raised,
+                        requestValues.pet.text
                     )
-                    dialog.setAdditionalContentView(mountWrapper)
-                    dialog.addButton(R.string.onwards, true)
-                    dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
-                        val message =
-                            requestValues.context.getString(
-                                R.string.share_raised,
-                                requestValues.pet.text
-                            )
-                        val mountImageSideLength = 99
-                        val sharedImage = Bitmap.createBitmap(
-                            mountImageSideLength,
-                            mountImageSideLength,
-                            Bitmap.Config.ARGB_8888
-                        )
-                        val canvas = Canvas(sharedImage)
-                        mountImageView?.drawable?.setBounds(
-                            0,
-                            0,
-                            mountImageSideLength,
-                            mountImageSideLength
-                        )
-                        mountImageView?.drawable?.draw(canvas)
-                        (requestValues.context as? BaseActivity)?.shareContent("raisedPet", message, sharedImage)
-                        hatchingDialog.dismiss()
-                    }
-                    dialog.enqueue()
-                }
+                val mountImageSideLength = 99
+                val sharedImage = Bitmap.createBitmap(
+                    mountImageSideLength,
+                    mountImageSideLength,
+                    Bitmap.Config.ARGB_8888
+                )
+                val canvas = Canvas(sharedImage)
+                mountImageView?.drawable?.setBounds(
+                    0,
+                    0,
+                    mountImageSideLength,
+                    mountImageSideLength
+                )
+                mountImageView?.drawable?.draw(canvas)
+                (requestValues.context as? BaseActivity)?.shareContent(
+                    "raisedPet",
+                    message,
+                    sharedImage
+                )
+                hatchingDialog.dismiss()
             }
+            dialog.enqueue()
+        }
+        return feedResponse
     }
 
     class RequestValues(val pet: Pet, val food: Food, val context: Context) :
-        UseCase.RequestValues
+        FlowUseCase.RequestValues
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
index a6b08896e..b2cbdbb50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
@@ -7,24 +7,21 @@ import android.view.View
 import android.widget.FrameLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.executors.PostExecutionThread
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.views.PixelArtView
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.MainScope
 import javax.inject.Inject
 
 class HatchPetUseCase @Inject
 constructor(
-    private val inventoryRepository: InventoryRepository,
-    postExecutionThread: PostExecutionThread
-) : UseCase<HatchPetUseCase.RequestValues, Items>(postExecutionThread) {
-    override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<Items> {
+    private val inventoryRepository: InventoryRepository) : FlowUseCase<HatchPetUseCase.RequestValues, Items?>() {
+    override suspend fun run(requestValues: RequestValues): Items? {
         return inventoryRepository.hatchPet(requestValues.egg, requestValues.potion) {
             val petWrapper = View.inflate(requestValues.context, R.layout.pet_imageview, null) as? FrameLayout
             val petImageView = petWrapper?.findViewById(R.id.pet_imageview) as? PixelArtView
@@ -36,8 +33,9 @@ constructor(
             dialog.setTitle(requestValues.context.getString(R.string.hatched_pet_title, potionName, eggName))
             dialog.setAdditionalContentView(petWrapper)
             dialog.addButton(R.string.equip, true) { _, _ ->
-                inventoryRepository.equip("pet", requestValues.egg.key + "-" + requestValues.potion.key)
-                    .subscribe({}, RxErrorHandler.handleEmptyError())
+                MainScope().launchCatching {
+                    inventoryRepository.equip("pet", requestValues.egg.key + "-" + requestValues.potion.key)
+                }
             }
             dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
                 val message = requestValues.context.getString(R.string.share_hatched, potionName, eggName)
@@ -54,5 +52,5 @@ constructor(
         }
     }
 
-    class RequestValues(val potion: HatchingPotion, val egg: Egg, val context: Context) : UseCase.RequestValues
+    class RequestValues(val potion: HatchingPotion, val egg: Egg, val context: Context) : FlowUseCase.RequestValues
 }
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 116a782d5..2f0e7b2c6 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
@@ -4,97 +4,94 @@ import android.graphics.Bitmap
 import android.view.ViewGroup
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogLevelup10Binding
-import com.habitrpg.android.habitica.executors.PostExecutionThread
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
 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.rxjava3.core.Flowable
+import com.habitrpg.common.habitica.views.AvatarView
+import kotlinx.coroutines.MainScope
 import javax.inject.Inject
 
 class LevelUpUseCase @Inject
 constructor(
     private val soundManager: SoundManager,
-    postExecutionThread: PostExecutionThread,
     private val checkClassSelectionUseCase: CheckClassSelectionUseCase
-) : UseCase<LevelUpUseCase.RequestValues, Stats>(postExecutionThread) {
+) : FlowUseCase<LevelUpUseCase.RequestValues, Stats?>() {
 
-    override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<Stats> {
-        return Flowable.defer {
-            soundManager.loadAndPlayAudio(SoundManager.SoundLevelUp)
+    override suspend fun run(requestValues: RequestValues): Stats? {
+        soundManager.loadAndPlayAudio(SoundManager.SoundLevelUp)
+        val suppressedModals = requestValues.user.preferences?.suppressModals
 
-            val suppressedModals = requestValues.user.preferences?.suppressModals
+        if (requestValues.newLevel == 10) {
+            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())
 
-            if (requestValues.newLevel == 10) {
-                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(binding.root)
-                alert.addButton(R.string.select_class, true) { _, _ ->
+            val alert = HabiticaAlertDialog(requestValues.activity)
+            alert.setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
+            alert.setAdditionalContentView(binding.root)
+            alert.addButton(R.string.select_class, true) { _, _ ->
+                MainScope().launchCatching {
                     showClassSelection(requestValues)
                 }
-                alert.addButton(R.string.not_now, false)
-                alert.isCelebratory = true
-
-                if (!requestValues.activity.isFinishing) {
-                    alert.enqueue()
-                }
-            } else {
-                if (suppressedModals?.levelUp == true) {
-                    HabiticaSnackbar.showSnackbar(
-                        requestValues.snackbarTargetView,
-                        requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel),
-                        HabiticaSnackbar.SnackbarDisplayType.SUCCESS, true
-                    )
-                    return@defer Flowable.just<Stats>(requestValues.user.stats)
-                }
-                val customView = requestValues.activity.layoutInflater.inflate(R.layout.dialog_levelup, null)
-                if (customView != null) {
-                    val dialogAvatarView = customView.findViewById<AvatarView>(R.id.avatarView)
-                    dialogAvatarView.setAvatar(requestValues.user)
-                }
-
-                val message = requestValues.activity.getString(R.string.share_levelup, requestValues.newLevel)
-                val avatarView = AvatarView(requestValues.activity, showBackground = true, showMount = true, showPet = true)
-                avatarView.setAvatar(requestValues.user)
-                var sharedImage: Bitmap? = null
-                avatarView.onAvatarImageReady { image ->
-                    sharedImage = image
-                }
-
-                val alert = HabiticaAlertDialog(requestValues.activity)
-                alert.setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
-                alert.setAdditionalContentView(customView)
-                alert.addButton(R.string.onwards, true) { _, _ ->
-                    showClassSelection(requestValues)
-                }
-                alert.addButton(R.string.share, false) { _, _ ->
-                    requestValues.activity.shareContent("levelup", message, sharedImage)
-                }
-                alert.isCelebratory = true
-
-                if (!requestValues.activity.isFinishing) {
-                    alert.enqueue()
-                }
             }
+            alert.addButton(R.string.not_now, false)
+            alert.isCelebratory = true
 
-            Flowable.just(requestValues.user.stats!!)
+            if (!requestValues.activity.isFinishing) {
+                alert.enqueue()
+            }
+        } else {
+            if (suppressedModals?.levelUp == true) {
+                HabiticaSnackbar.showSnackbar(
+                    requestValues.snackbarTargetView,
+                    requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel),
+                    HabiticaSnackbar.SnackbarDisplayType.SUCCESS, true
+                )
+                return requestValues.user.stats
+            }
+            val customView = requestValues.activity.layoutInflater.inflate(R.layout.dialog_levelup, null)
+            if (customView != null) {
+                val dialogAvatarView = customView.findViewById<AvatarView>(R.id.avatarView)
+                dialogAvatarView.setAvatar(requestValues.user)
+            }
+
+            val message = requestValues.activity.getString(R.string.share_levelup, requestValues.newLevel)
+            val avatarView = AvatarView(requestValues.activity, showBackground = true, showMount = true, showPet = true)
+            avatarView.setAvatar(requestValues.user)
+            var sharedImage: Bitmap? = null
+            avatarView.onAvatarImageReady { image ->
+                sharedImage = image
+            }
+
+            val alert = HabiticaAlertDialog(requestValues.activity)
+            alert.setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
+            alert.setAdditionalContentView(customView)
+            alert.addButton(R.string.onwards, true) { _, _ ->
+                MainScope().launchCatching {
+                    showClassSelection(requestValues)
+                }
+            }
+            alert.addButton(R.string.share, false) { _, _ ->
+                requestValues.activity.shareContent("levelup", message, sharedImage)
+            }
+            alert.isCelebratory = true
+
+            if (!requestValues.activity.isFinishing) {
+                alert.enqueue()
+            }
         }
+        return requestValues.user.stats
     }
 
-    private fun showClassSelection(requestValues: RequestValues) {
-        checkClassSelectionUseCase.observable(CheckClassSelectionUseCase.RequestValues(requestValues.user, true, null, requestValues.activity))
-            .subscribe({ }, RxErrorHandler.handleEmptyError())
+    private suspend fun showClassSelection(requestValues: RequestValues) {
+        checkClassSelectionUseCase.callInteractor(CheckClassSelectionUseCase.RequestValues(requestValues.user, true, null, requestValues.activity))
     }
 
     class RequestValues(
@@ -102,7 +99,7 @@ constructor(
         val level: Int?,
         val activity: BaseActivity,
         val snackbarTargetView: ViewGroup
-    ) : UseCase.RequestValues {
+    ) : FlowUseCase.RequestValues {
         val newLevel: Int = 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 fa1ffd430..a70070cd0 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
@@ -13,47 +13,37 @@ import androidx.core.content.ContextCompat
 import androidx.core.util.Pair
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.executors.PostExecutionThread
-import com.habitrpg.android.habitica.extensions.filterMap
-import com.habitrpg.shared.habitica.extensions.round
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
 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.rxjava3.core.Flowable
+import com.habitrpg.shared.habitica.extensions.round
 import javax.inject.Inject
 import kotlin.math.abs
 
 class NotifyUserUseCase @Inject
 constructor(
-    postExecutionThread: PostExecutionThread,
     private val levelUpUseCase: LevelUpUseCase,
     private val userRepository: UserRepository
-) : UseCase<NotifyUserUseCase.RequestValues, Stats>(postExecutionThread) {
+) : FlowUseCase<NotifyUserUseCase.RequestValues, Stats?>() {
 
-    override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<Stats> {
-        return Flowable.defer {
-            if (requestValues.user == null) {
-                return@defer Flowable.empty<Stats>()
-            }
-            val stats = requestValues.user.stats
-
-            val pair = getNotificationAndAddStatsToUser(requestValues.context, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp, requestValues.questDamage, requestValues.user)
-            val view = pair.first
-            val type = pair.second
-            if (view != null && type != null) {
-                HabiticaSnackbar.showSnackbar(requestValues.snackbarTargetView, null, null, view, type)
-            }
-            if (requestValues.hasLeveledUp == true) {
-                return@defer levelUpUseCase.observable(LevelUpUseCase.RequestValues(requestValues.user, requestValues.level, requestValues.context, requestValues.snackbarTargetView))
-                    .flatMap { userRepository.retrieveUser(true) }
-                    .filterMap { it.stats }
-            } else {
-                return@defer Flowable.just(stats)
-            }
+    override suspend fun run(requestValues: RequestValues): Stats? {
+        if (requestValues.user == null) {
+            return null
         }
+        val pair = getNotificationAndAddStatsToUser(requestValues.context, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp, requestValues.questDamage, requestValues.user)
+        val view = pair.first
+        val type = pair.second
+        if (view != null && type != null) {
+            HabiticaSnackbar.showSnackbar(requestValues.snackbarTargetView, null, null, view, type)
+        }
+        if (requestValues.hasLeveledUp == true) {
+            levelUpUseCase.callInteractor(LevelUpUseCase.RequestValues(requestValues.user, requestValues.level, requestValues.context, requestValues.snackbarTargetView))
+            userRepository.retrieveUser(true)
+        }
+        return requestValues.user.stats
     }
 
     class RequestValues(
@@ -67,7 +57,7 @@ constructor(
         val questDamage: Double?,
         val hasLeveledUp: Boolean?,
         val level: Int?
-    ) : UseCase.RequestValues
+    ) : FlowUseCase.RequestValues
 
     companion object {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
index 9464d05ab..e81295281 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
@@ -7,6 +7,7 @@ import android.widget.TextView
 import androidx.lifecycle.LifecycleCoroutineScope
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
@@ -126,7 +127,7 @@ class ShowNotificationInteractor(
         } else {
             200
         }
-        lifecycleScope.launch {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             delay(delayTime)
             lifecycleScope.launch(context = Dispatchers.Main) {
                 val dialog = AchievementDialog(activity)
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
deleted file mode 100644
index 7f4088282..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.habitrpg.android.habitica.interactors;
-
-import com.habitrpg.android.habitica.executors.PostExecutionThread;
-
-import io.reactivex.rxjava3.core.Flowable;
-
-public abstract class UseCase<Q extends UseCase.RequestValues, T> {
-
-    private final PostExecutionThread postExecutionThread;
-
-    protected UseCase(PostExecutionThread postExecutionThread) {
-        this.postExecutionThread = postExecutionThread;
-    }
-
-    protected abstract Flowable<T> buildUseCaseObservable(Q requestValues);
-
-    public Flowable<T> observable(Q requestValues) {
-        return this.buildUseCaseObservable(requestValues)
-                .subscribeOn(postExecutionThread.getScheduler())
-                .observeOn(postExecutionThread.getScheduler());
-    }
-
-    public interface RequestValues {
-
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt
new file mode 100644
index 000000000..82222ccf0
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt
@@ -0,0 +1,15 @@
+package com.habitrpg.android.habitica.interactors
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+abstract class FlowUseCase<Q : FlowUseCase.RequestValues?, T> {
+    protected abstract suspend fun run(requestValues: Q): T
+    suspend fun callInteractor(requestValues: Q): T {
+        return withContext(Dispatchers.Main) {
+            run(requestValues)
+        }
+    }
+
+    interface RequestValues
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Assignable.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Assignable.kt
new file mode 100644
index 000000000..077234f1c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Assignable.kt
@@ -0,0 +1,9 @@
+package com.habitrpg.android.habitica.models
+
+import com.habitrpg.shared.habitica.models.Avatar
+
+interface Assignable {
+    val id: String?
+    val avatar: Avatar?
+    val identifiableName: String
+}
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 2f07cb0ff..9f75c5b8d 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
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.models.members
 
 import com.google.gson.annotations.SerializedName
+import com.habitrpg.android.habitica.models.Assignable
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.user.Authentication
@@ -16,11 +17,11 @@ import io.realm.RealmModel
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
-open class Member : RealmObject(), Avatar, BaseMainObject {
+open class Member : RealmObject(), Avatar, BaseMainObject, Assignable {
 
     @PrimaryKey
     @SerializedName("_id")
-    var id: String? = null
+    override var id: String? = null
     override var stats: Stats? = null
     var inbox: Inbox? = null
     override var preferences: MemberPreferences? = null
@@ -50,6 +51,12 @@ open class Member : RealmObject(), Avatar, BaseMainObject {
             ""
         } else this.profile?.name ?: ""
 
+    override val identifiableName: String
+    get() = username ?: ""
+
+    override val avatar: Avatar
+    get() = this
+
     val petsFoundCount: Int
         get() = this.items?.pets?.size ?: 0
     val mountsTamedCount: Int
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 01fa95cc4..0fb1d45c7 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
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.promotions
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -88,18 +89,33 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
     override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
     }
 
+    @SuppressLint("SetTextI18n")
     override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
+        binding.purchaseButton.setTextColor(ContextCompat.getColor(context, R.color.white))
         binding.gemAmount.setTextColor(Color.parseColor("#FEE2B6"))
+        binding.gemLabel.setTextColor(Color.parseColor("#FEE2B6"))
         binding.footerTextView.visibility = View.VISIBLE
         binding.footerTextView.text = context.getString(R.string.usually_x_gems, regularAmount)
-        binding.gemAmount.text = when (regularAmount) {
-            4 -> "5 GEMS"
-            21 -> "30 GEMS"
-            42 -> "60 GEMS"
-            84 -> "125 GEMS"
+        when (regularAmount) {
+            4 -> {
+                binding.gemAmount.text = "5"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_4)
+            }
+            21 -> {
+                binding.gemAmount.text = "30"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_21)
+            }
+            42 -> {
+                binding.gemAmount.text = "60"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_42)
+            }
+            84 -> {
+                binding.gemAmount.text = "125"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_84)
+            }
             else -> regularAmount.toString()
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
index 836614ade..4ebcea8fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.promotions
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -88,18 +89,33 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
     override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
     }
 
+    @SuppressLint("SetTextI18n")
     override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
+        binding.purchaseButton.setTextColor(ContextCompat.getColor(context, R.color.white))
         binding.gemAmount.setTextColor(Color.parseColor("#FEE2B6"))
+        binding.gemLabel.setTextColor(Color.parseColor("#FEE2B6"))
         binding.footerTextView.visibility = View.VISIBLE
         binding.footerTextView.text = context.getString(R.string.usually_x_gems, regularAmount)
-        binding.gemAmount.text = when (regularAmount) {
-            4 -> "5 GEMS"
-            21 -> "30 GEMS"
-            42 -> "60 GEMS"
-            84 -> "125 GEMS"
+        when (regularAmount) {
+            4 -> {
+                binding.gemAmount.text = "5"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_4)
+            }
+            21 -> {
+                binding.gemAmount.text = "30"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_21)
+            }
+            42 -> {
+                binding.gemAmount.text = "60"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_42)
+            }
+            84 -> {
+                binding.gemAmount.text = "125"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_84)
+            }
             else -> regularAmount.toString()
         }
     }
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 85c8e53fb..7668413e6 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
@@ -3,8 +3,6 @@ package com.habitrpg.android.habitica.models.social
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.inventory.Quest
-import com.habitrpg.android.habitica.models.tasks.TaskList
-import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.shared.habitica.models.tasks.TasksOrder
 import io.realm.RealmList
 import io.realm.RealmObject
@@ -28,13 +26,13 @@ open class Group : RealmObject(), BaseMainObject {
     var summary: String? = null
     var leaderID: String? = null
     var leaderName: String? = null
+    var managers: RealmList<String>? = null
     var name: String? = null
     var memberCount: Int = 0
     var type: String? = null
     var logo: String? = null
     var quest: Quest? = null
     var privacy: String? = null
-    var members: RealmList<User>? = null
     var challengeCount: Int = 0
     var leaderMessage: String? = null
     var leaderOnlyChallenges: Boolean = false
@@ -43,8 +41,6 @@ open class Group : RealmObject(), BaseMainObject {
 
     @Ignore
     var tasksOrder: TasksOrder? = null
-    @Ignore
-    var tasks: TaskList? = null
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
@@ -58,6 +54,13 @@ open class Group : RealmObject(), BaseMainObject {
         return id.hashCode()
     }
 
+    fun hasTaskEditPrivileges(userID: String): Boolean {
+        if (leaderID == userID) {
+            return true
+        }
+        return managers?.contains(userID) == true
+    }
+
     companion object {
         const val TAVERN_ID = "00000000-0000-4000-A000-000000000000"
     }
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 aeee02cb1..62c2cab2d 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
@@ -5,7 +5,7 @@ import android.os.Parcelable
 import android.text.Spanned
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.common.habitica.helpers.MarkdownParser
@@ -90,6 +90,14 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
     override var isDue: Boolean? = null
 
     var nextDue: RealmList<Date>? = null
+    var updatedAt: Date? = null
+    val isUpdatedToday: Boolean
+        get() {
+            val updatedAt = updatedAt ?: return false
+            return ZonedDateTime.ofInstant(updatedAt.toInstant(), ZoneId.systemDefault()).toLocalDate()
+                .equals(ZonedDateTime.now().withZoneSameLocal(ZoneId.systemDefault()).toLocalDate())
+        }
+
 
     // Needed for offline creating/updating
     var isSaving: Boolean = false
@@ -109,6 +117,30 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
     val completedChecklistCount: Int
         get() = checklist?.count { it.completed } ?: 0
 
+    fun completed(byUserID: String?): Boolean {
+        return if (isGroupTask) {
+            group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == byUserID }?.completed ?: completed
+        } else {
+            completed
+        }
+    }
+
+    fun completeForUser(userID: String?, completed: Boolean) {
+        if (isGroupTask && group?.assignedUsersDetail?.isNotEmpty() == true) {
+            group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == userID }?.completed = completed
+            if (group?.assignedUsersDetail?.filter { it.completed != completed }?.isEmpty() == true) {
+                this.completed = completed
+            }
+        } else {
+            this.completed = completed
+        }
+    }
+
+    fun isDisplayedActiveForUser(userID: String?): Boolean {
+        val isActive = ((isDue == true && type == TaskType.DAILY) || type == TaskType.TODO)
+        return isActive && !completed(userID)
+    }
+
     val streakString: String?
         get() {
             return if (counterUp != null && (counterUp ?: 0) > 0 && counterDown != null && (counterDown ?: 0) > 0) {
@@ -124,6 +156,32 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
             }
         }
 
+    val lightestTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_700
+                this.value < -10 -> return R.color.red_700
+                this.value < -1 -> return R.color.orange_700
+                this.value < 1 -> return R.color.yellow_700
+                this.value < 5 -> return R.color.green_700
+                this.value < 10 -> return R.color.teal_700
+                else -> R.color.blue_700
+            }
+        }
+
+    val extraExtraLightTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_600
+                this.value < -10 -> return R.color.red_600
+                this.value < -1 -> return R.color.orange_600
+                this.value < 1 -> return R.color.yellow_600
+                this.value < 5 -> return R.color.green_600
+                this.value < 10 -> return R.color.teal_600
+                else -> R.color.blue_600
+            }
+        }
+
     val extraLightTaskColor: Int
         get() {
             return when {
@@ -431,7 +489,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
                         i += 1
                     }
                 } catch (e: JSONException) {
-                    RxErrorHandler.reportError(e)
+                    ExceptionHandler.reportError(e)
                 }
             }
             this.weeksOfMonth = weeksOfMonth.toList()
@@ -460,7 +518,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
                         i += 1
                     }
                 } catch (e: JSONException) {
-                    RxErrorHandler.reportError(e)
+                    ExceptionHandler.reportError(e)
                 }
             }
             this.daysOfMonth = daysOfMonth
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 49e2191da..e0b16b555 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
@@ -7,6 +7,16 @@ import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 import java.util.Date
 
+@RealmClass(embedded = true)
+open class GroupAssignedDetails: RealmObject(), BaseObject {
+    var assignedDate: Date? = null
+    var assignedUsername: String? = null
+    var assignedUserID: String? = null
+    var assigningUsername: String? = null
+    var completed: Boolean = false
+    var completedDate: Date? = null
+}
+
 @RealmClass(embedded = true)
 open class TaskGroupPlan : RealmObject(), BaseObject {
 
@@ -17,6 +27,7 @@ open class TaskGroupPlan : RealmObject(), BaseObject {
     var assignedDate: Date? = null
     var assigningUsername: String? = null
     var assignedUsers: RealmList<String> = RealmList()
+    var assignedUsersDetail: RealmList<GroupAssignedDetails> = RealmList()
 
     var approvalRequested: Boolean? = false
     var approvalApproved: Boolean? = false
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 070cff23e..4113e4ba5 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
@@ -30,7 +30,7 @@ open class Preferences : RealmObject(), AvatarPreferences, BaseObject {
                 } else {
                     "chair_" + field!!
                 }
-            } else null
+            } else "chair_none"
         }
     var language: String? = null
     var sound: String? = null
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 43a1b322f..6758fa30a 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
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.models.user
 
-import android.content.Context
+import android.content.res.Resources
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.BaseObject
@@ -50,13 +50,13 @@ open class Stats : RealmObject(), AvatarStats, BaseObject {
             }
         }
 
-    fun getTranslatedClassName(context: Context): String {
+    fun getTranslatedClassName(resources: Resources): String {
         return when (habitClass) {
-            HEALER -> context.getString(R.string.healer)
-            ROGUE -> context.getString(R.string.rogue)
-            WARRIOR -> context.getString(R.string.warrior)
-            MAGE -> context.getString(R.string.mage)
-            else -> context.getString(R.string.warrior)
+            HEALER -> resources.getString(R.string.healer)
+            ROGUE -> resources.getString(R.string.rogue)
+            WARRIOR -> resources.getString(R.string.warrior)
+            MAGE -> resources.getString(R.string.mage)
+            else -> resources.getString(R.string.warrior)
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt
index 66ee1e4f2..56d23b7f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt
@@ -14,7 +14,6 @@ import com.habitrpg.common.habitica.helpers.KeyHelper
 import dagger.Module
 import dagger.Provides
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import java.lang.ref.WeakReference
 import javax.inject.Singleton
@@ -66,7 +65,6 @@ open class ApiModule {
     fun providesMaintenanceApiService(gsonConverter: GsonConverterFactory): MaintenanceApiService {
         val adapter = Retrofit.Builder()
             .baseUrl("https://habitica-assets.s3.amazonaws.com/mobileApp/endpoint/")
-            .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
             .addConverterFactory(gsonConverter)
             .build()
         return adapter.create(MaintenanceApiService::class.java)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt
index 1737dc1f0..25e29814e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt
@@ -7,8 +7,6 @@ import android.content.res.Resources
 import androidx.preference.PreferenceManager
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
-import com.habitrpg.android.habitica.executors.PostExecutionThread
-import com.habitrpg.android.habitica.executors.UIThread
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.SoundFileLoader
 import com.habitrpg.android.habitica.helpers.SoundManager
@@ -84,12 +82,6 @@ class AppModule(private val application: Application) {
         return SoundManager()
     }
 
-    @Provides
-    @Singleton
-    fun providePostExecutionThread(uiThread: UIThread): PostExecutionThread {
-        return uiThread
-    }
-
     @Provides
     @Singleton
     fun pushNotificationManager(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java
deleted file mode 100644
index 3de77ecbe..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.habitrpg.android.habitica.modules;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.helpers.UserScope;
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel;
-
-import javax.inject.Named;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class UserModule {
-    public static final String NAMED_USER_ID = "userId";
-
-    @Provides
-    @UserScope
-    TaskAlarmManager providesTaskAlarmManager(Context context, TaskRepository taskRepository, @Named(NAMED_USER_ID) String userId) {
-        return new TaskAlarmManager(context, taskRepository, userId);
-    }
-
-    @Provides
-    @Named(NAMED_USER_ID)
-    @UserScope
-    public String providesUserID(SharedPreferences sharedPreferences) {
-        if (BuildConfig.DEBUG && !BuildConfig.TEST_USER_ID.isEmpty()) {
-            return BuildConfig.TEST_USER_ID;
-        } else {
-            return sharedPreferences.getString("UserID", "");
-        }
-    }
-
-    @Provides
-    @UserScope
-    MainUserViewModel providesUserViewModel(UserRepository userRepository) {
-        return new MainUserViewModel(userRepository);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt
new file mode 100644
index 000000000..24acf248f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt
@@ -0,0 +1,50 @@
+package com.habitrpg.android.habitica.modules
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.habitrpg.android.habitica.BuildConfig
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.android.habitica.helpers.UserScope
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import dagger.Module
+import dagger.Provides
+import javax.inject.Named
+
+@Module
+class UserModule {
+    @Provides
+    @UserScope
+    fun providesTaskAlarmManager(
+        context: Context,
+        taskRepository: TaskRepository,
+        @Named(NAMED_USER_ID) userId: String
+    ): TaskAlarmManager {
+        return TaskAlarmManager(context, taskRepository, userId)
+    }
+
+    @Provides
+    @Named(NAMED_USER_ID)
+    @UserScope
+    fun providesUserID(sharedPreferences: SharedPreferences): String {
+        return if (BuildConfig.DEBUG && BuildConfig.TEST_USER_ID.isNotEmpty()) {
+            BuildConfig.TEST_USER_ID
+        } else {
+            sharedPreferences.getString("UserID", "") ?: ""
+        }
+    }
+
+    @Provides
+    @UserScope
+    fun providesUserViewModel(
+        @Named(NAMED_USER_ID) userID: String,
+        userRepository: UserRepository,
+        socialRepository: SocialRepository
+    ) = MainUserViewModel(userID, userRepository, socialRepository)
+
+    companion object {
+        const val NAMED_USER_ID = "userId"
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt
index 0f6b9064c..192f8ddbb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt
@@ -63,6 +63,7 @@ class UserRepositoryModule {
     }
 
     @Provides
+    @UserScope
     fun providesTaskRepository(
         localRepository: TaskLocalRepository,
         apiClient: ApiClient,
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 94c65e650..4e8662a2d 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,9 +14,12 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.SocialRepository
 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.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
 import com.habitrpg.android.habitica.models.user.User
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class LocalNotificationActionReceiver : BroadcastReceiver() {
@@ -56,66 +59,76 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
         when (action) {
             context?.getString(R.string.accept_party_invite) -> {
                 groupID?.let {
-                    socialRepository.joinGroup(it).subscribe({ }, RxErrorHandler.handleEmptyError())
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        socialRepository.joinGroup(it)
+                    }
                 }
             }
             context?.getString(R.string.reject_party_invite) -> {
                 groupID?.let {
-                    socialRepository.rejectGroupInvite(it)
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                    MainScope().launchCatching {
+                        socialRepository.rejectGroupInvite(it)
+                    }
                 }
             }
             context?.getString(R.string.accept_quest_invite) -> {
-                socialRepository.acceptQuest(user).subscribe({ }, RxErrorHandler.handleEmptyError())
+                MainScope().launchCatching {
+                    socialRepository.acceptQuest(user)
+                }
             }
             context?.getString(R.string.reject_quest_invite) -> {
-                socialRepository.rejectQuest(user).subscribe({ }, RxErrorHandler.handleEmptyError())
+                MainScope().launchCatching {
+                    socialRepository.rejectQuest(user)
+                }
             }
             context?.getString(R.string.accept_guild_invite) -> {
                 groupID?.let {
-                    socialRepository.joinGroup(it).subscribe({ }, RxErrorHandler.handleEmptyError())
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        socialRepository.joinGroup(it)
+                    }
                 }
             }
             context?.getString(R.string.reject_guild_invite) -> {
                 groupID?.let {
-                    socialRepository.rejectGroupInvite(it)
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                    MainScope().launchCatching {
+                        socialRepository.rejectGroupInvite(it)
+                    }
                 }
             }
             context?.getString(R.string.group_message_reply) -> {
                 groupID?.let {
                     getMessageText(context?.getString(R.string.group_message_reply))?.let { message ->
-                        socialRepository.postGroupChat(it, message).subscribe(
-                            {
-                                context?.let { c ->
-                                    NotificationManagerCompat.from(c).cancel(it.hashCode())
-                                }
-                            },
-                            RxErrorHandler.handleEmptyError()
-                        )
+                        MainScope().launchCatching {
+                            socialRepository.postGroupChat(it, message)
+                            context?.let { c ->
+                                NotificationManagerCompat.from(c).cancel(it.hashCode())
+                            }
+                        }
                     }
                 }
             }
             context?.getString(R.string.inbox_message_reply) -> {
                 senderID?.let {
                     getMessageText(context?.getString(R.string.inbox_message_reply))?.let { message ->
-                        socialRepository.postPrivateMessage(it, message)
-                            .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        MainScope().launch(ExceptionHandler.coroutine()) {
+                            socialRepository.postPrivateMessage(it, message)
+                        }
                     }
                 }
             }
             context?.getString(R.string.complete_task_action) -> {
                 taskID?.let {
-                    taskRepository.taskChecked(null, it, up = true, force = false) {
-                    }.subscribe({
-                        val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(
-                            it?.experienceDelta,
-                            it?.healthDelta,
-                            it?.goldDelta,
-                            it?.manaDelta
-                        )
-                        showToast(pair.first)
-                    }, RxErrorHandler.handleEmptyError())
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        taskRepository.taskChecked(null, it, up = true, force = false) {
+                            val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(
+                                it.experienceDelta,
+                                it.healthDelta,
+                                it.goldDelta,
+                                it.manaDelta
+                            )
+                            showToast(pair.first)
+                        }
+                    }
                 }
             }
         }
@@ -127,6 +140,8 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
     }
 
     private fun getMessageText(key: String?): String? {
-        return intent?.let { RemoteInput.getResultsFromIntent(it)?.getCharSequence(key)?.toString() }
+        return intent?.let {
+            RemoteInput.getResultsFromIntent(it)?.getCharSequence(key)?.toString()
+        }
     }
 }
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 42bfe863f..979a5323e 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
@@ -15,19 +15,17 @@ 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.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 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.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.reactivex.rxjava3.functions.BiFunction
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
 import java.util.Calendar
 import java.util.Date
 import java.util.Random
 import javax.inject.Inject
 
-@Suppress("DEPRECATION")
 // https://gist.github.com/BrandonSmith/6679223
 class NotificationPublisher : BroadcastReceiver() {
 
@@ -58,26 +56,20 @@ class NotificationPublisher : BroadcastReceiver() {
         }
         val checkDailies = intent.getBooleanExtra(CHECK_DAILIES, false)
         if (checkDailies) {
-            taskRepository.getTasksFlowable(TaskType.DAILY, null, emptyArray()).firstElement().zipWith(
-                userRepository.getUserFlowable().firstElement(),
-                BiFunction<List<Task>, User, Pair<List<Task>, User>> { tasks, user ->
-                    return@BiFunction Pair(tasks, user)
+            MainScope().launchCatching {
+                val tasks = taskRepository.getTasks(TaskType.DAILY, null, emptyArray()).firstOrNull()
+                val user = userRepository.getUser().firstOrNull()
+                var showNotifications = false
+                for (task in tasks ?: emptyList()) {
+                    if (task.checkIfDue()) {
+                        showNotifications = true
+                        break
+                    }
                 }
-            ).subscribe(
-                { pair ->
-                    var showNotifications = false
-                    for (task in pair.first) {
-                        if (task.checkIfDue()) {
-                            showNotifications = true
-                            break
-                        }
-                    }
-                    if (showNotifications) {
-                        notify(intent, buildNotification(wasInactive, pair.second.authentication?.timestamps?.createdAt))
-                    }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
+                if (showNotifications) {
+                    notify(intent, buildNotification(wasInactive, user?.authentication?.timestamps?.createdAt))
+                }
+            }
         } else {
             notify(intent, buildNotification(wasInactive))
         }
@@ -145,8 +137,7 @@ class NotificationPublisher : BroadcastReceiver() {
 
     private fun getRandomDailyTip(): String {
         val thisContext = context ?: return ""
-        val index = Random().nextInt(4)
-        return when (index) {
+        return when (Random().nextInt(10)) {
             0 -> thisContext.getString(R.string.daily_tip_0)
             1 -> thisContext.getString(R.string.daily_tip_1)
             2 -> thisContext.getString(R.string.daily_tip_2)
@@ -162,7 +153,6 @@ class NotificationPublisher : BroadcastReceiver() {
     }
 
     companion object {
-
         var NOTIFICATION_ID = "notification-id"
         var CHECK_DAILIES = "check-dailies"
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
index a7d527141..cb66c792e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
@@ -5,10 +5,10 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -25,7 +25,7 @@ class TaskAlarmBootReceiver : BroadcastReceiver() {
             return
         }
         HabiticaBaseApplication.userComponent?.inject(this)
-        MainScope().launch(Dispatchers.Main) {
+        MainScope().launch(ExceptionHandler.coroutine()) {
             taskAlarmManager.scheduleAllSavedAlarms(sharedPreferences.getBoolean("preventDailyReminder", false))
         }
         HLogger.log(LogLevel.INFO, this::javaClass.name, "onReceive")
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 4edb78de8..b5dfbebb6 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
@@ -9,18 +9,21 @@ import android.media.RingtoneManager
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
-import io.reactivex.rxjava3.functions.Consumer
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class TaskReceiver : BroadcastReceiver() {
@@ -42,18 +45,13 @@ class TaskReceiver : BroadcastReceiver() {
                 taskAlarmManager.addAlarmForTaskId(taskId)
             }
 
-            taskRepository.getTask(taskId ?: "")
-                .firstElement()
-                .subscribe(
-                    Consumer {
-                        if (!it.isValid || it.completed) {
-                            return@Consumer
-                        }
-
-                        createNotification(context, it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            MainScope().launch(ExceptionHandler.coroutine()) {
+                val task = taskRepository.getTask(taskId ?: "").firstOrNull() ?: return@launch
+                if (task.isUpdatedToday && task.completed) {
+                    return@launch
+                }
+                createNotification(context, task)
+            }
         }
     }
 
@@ -67,6 +65,7 @@ class TaskReceiver : BroadcastReceiver() {
 
         var notificationBuilder = NotificationCompat.Builder(context, "default")
             .setSmallIcon(R.drawable.ic_gryphon_white)
+            .setColor(ContextCompat.getColor(context, R.color.brand_300))
             .setContentTitle(task.text)
             .setStyle(
                 NotificationCompat.BigTextStyle()
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 f15bdade5..83839e640 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
@@ -60,7 +60,7 @@ class AvatarWithBarsViewModel(
         binding.avatarView.setAvatar(user)
 
         if (stats.habitClass != null && stats is Stats) {
-            userClass = stats.getTranslatedClassName(context)
+            userClass = stats.getTranslatedClassName(context.resources)
         }
 
         binding.mpBar.visibility = if (stats.habitClass == null || (stats.lvl
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 15b6b6907..55564e5c6 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
@@ -16,8 +16,8 @@ import com.habitrpg.android.habitica.databinding.AdventureGuideItemBinding
 import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.extensions.loadImage
 import javax.inject.Inject
 
 class AdventureGuideActivity : BaseActivity() {
@@ -33,7 +33,7 @@ class AdventureGuideActivity : BaseActivity() {
         return R.layout.activity_main
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityAdventureGuideBinding.inflate(layoutInflater)
         return binding.root
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
index 3430e6981..b1a973642 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
@@ -17,7 +17,8 @@ import com.habitrpg.android.habitica.databinding.ActivityArmoireBinding
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
@@ -25,6 +26,8 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.Animations
 import com.plattysoft.leonids.ParticleSystem
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import java.util.Locale
 import javax.inject.Inject
 
@@ -48,7 +51,7 @@ class ArmoireActivity : BaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityArmoireBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -79,22 +82,20 @@ class ArmoireActivity : BaseActivity() {
                 Log.d("AdHandler", "Giving Armoire")
                 val user = userViewModel.user.value ?: return@AdHandler
                 val currentGold = user.stats?.gp ?: return@AdHandler
-                compositeSubscription.add(
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     userRepository.updateUser("stats.gp", currentGold + 100)
-                        .flatMap { inventoryRepository.buyItem(user, "armoire", 100.0, 1) }
-                        .subscribe({
-                            configure(
-                                it.armoire["type"] ?: "",
-                                it.armoire["dropKey"] ?: "",
-                                it.armoire["dropText"] ?: "",
-                                it.armoire["value"] ?: ""
-                            )
-                            binding.adButton.state = AdButton.State.UNAVAILABLE
-                            binding.adButton.visibility = View.INVISIBLE
-                            hasAnimatedChanges = false
-                            gold = null
-                        }, RxErrorHandler.handleEmptyError())
-                )
+                    val buyResponse = inventoryRepository.buyItem(user, "armoire", 100.0, 1) ?: return@launch
+                    configure(
+                        buyResponse.armoire["type"] ?: "",
+                        buyResponse.armoire["dropKey"] ?: "",
+                        buyResponse.armoire["dropText"] ?: "",
+                        buyResponse.armoire["value"] ?: ""
+                    )
+                    binding.adButton.state = AdButton.State.UNAVAILABLE
+                    binding.adButton.visibility = View.INVISIBLE
+                    hasAnimatedChanges = false
+                    gold = null
+                }
             }
             handler.prepare {
                 if (it && binding.adButton.state == AdButton.State.LOADING) {
@@ -116,7 +117,9 @@ class ArmoireActivity : BaseActivity() {
             finish()
         }
         binding.equipButton.setOnClickListener {
-            equipmentKey?.let { it1 -> inventoryRepository.equip("equipped", it1).subscribe({}, RxErrorHandler.handleEmptyError()) }
+            equipmentKey?.let { it1 ->
+                MainScope().launchCatching { inventoryRepository.equip("equipped", it1) }
+            }
             finish()
         }
         binding.dropRateButton.setOnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index 8eac5a2fc..8f112448c 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
@@ -26,10 +26,10 @@ 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.UserRepository
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.extensions.updateStatusBarColor
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.interactors.ShowNotificationInteractor
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
@@ -37,7 +37,7 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.helpers.LanguageHelper
-import io.reactivex.rxjava3.disposables.CompositeDisposable
+import kotlinx.coroutines.launch
 import java.util.Date
 import java.util.Locale
 import javax.inject.Inject
@@ -60,14 +60,12 @@ abstract class BaseActivity : AppCompatActivity() {
 
     internal var toolbar: Toolbar? = null
 
-    protected abstract fun getLayoutResId(): Int
+    protected abstract fun getLayoutResId(): Int?
 
-    open fun getContentView(): View {
-        return (getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(getLayoutResId(), null)
+    open fun getContentView(layoutResId: Int? = getLayoutResId()): View {
+        return (getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(layoutResId ?: 0, null)
     }
 
-    var compositeSubscription = CompositeDisposable()
-
     private val habiticaApplication: HabiticaApplication
         get() = application as HabiticaApplication
 
@@ -92,18 +90,18 @@ abstract class BaseActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         habiticaApplication
         injectActivity(HabiticaBaseApplication.userComponent)
-        setContentView(getContentView())
-        compositeSubscription = CompositeDisposable()
-        compositeSubscription.add(
-            notificationsManager.displayNotificationEvents.subscribe(
-                {
-                    if (ShowNotificationInteractor(this, lifecycleScope).handleNotification(it)) {
-                        compositeSubscription.add(userRepository.retrieveUser(false, true).subscribeWithErrorHandler {})
+        getLayoutResId()?.let {
+            setContentView(getContentView(it))
+        }
+        lifecycleScope.launchCatching {
+            notificationsManager.displayNotificationEvents.collect {
+                    if (ShowNotificationInteractor(this@BaseActivity, lifecycleScope).handleNotification(it)) {
+                        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                            userRepository.retrieveUser(false, true)
+                        }
                     }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+                }
+        }
     }
 
     override fun onRestart() {
@@ -210,10 +208,6 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun onDestroy() {
         destroyed = true
-
-        if (!compositeSubscription.isDisposed) {
-            compositeSubscription.dispose()
-        }
         super.onDestroy()
     }
 
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 db6cffa9b..64e6fecf1 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
@@ -23,8 +23,9 @@ import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityCreateChallengeBinding
 import com.habitrpg.android.habitica.extensions.addCloseButton
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -38,9 +39,9 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import java.util.UUID
 import javax.inject.Inject
@@ -51,8 +52,10 @@ class ChallengeFormActivity : BaseActivity() {
 
     @Inject
     internal lateinit var challengeRepository: ChallengeRepository
+
     @Inject
     internal lateinit var socialRepository: SocialRepository
+
     @Inject
     internal lateinit var userViewModel: MainUserViewModel
 
@@ -68,6 +71,7 @@ class ChallengeFormActivity : BaseActivity() {
     private val removedTasks = HashMap<String, Task>()
 
     override var overrideModernHeader: Boolean? = true
+
     // Add {*} Items
     private lateinit var addHabit: Task
     private lateinit var addDaily: Task
@@ -77,7 +81,7 @@ class ChallengeFormActivity : BaseActivity() {
 
     private var savingInProgress = false
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityCreateChallengeBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -129,37 +133,34 @@ class ChallengeFormActivity : BaseActivity() {
             savingInProgress = true
             val dialog = HabiticaProgressDialog.show(this, R.string.saving)
 
-            val observable: Flowable<Challenge> = if (editMode) {
-                updateChallenge()
-            } else {
-                createChallenge()
-            }
+            lifecycleScope.launchCatching({
+                dialog?.dismiss()
+                savingInProgress = false
+                ExceptionHandler.reportError(it)
+            }) {
+                val challenge = if (editMode) {
+                    updateChallenge()
+                } else {
+                    createChallenge()
+                }
 
-            compositeSubscription.add(
-                observable
-                    .flatMap {
-                        challengeId = it.id
-                        challengeRepository.retrieveChallenges(0, true)
+                challengeId = challenge?.id
+                challengeRepository.retrieveChallenges(0, true)
+
+                dialog?.dismiss()
+                savingInProgress = false
+                finish()
+                if (!editMode) {
+                    lifecycleScope.launch(context = Dispatchers.Main) {
+                        delay(500L)
+                        MainNavigationController.navigate(
+                            ChallengesOverviewFragmentDirections.openChallengeDetail(
+                                challengeId ?: ""
+                            )
+                        )
                     }
-                    .subscribe(
-                        {
-                            dialog?.dismiss()
-                            savingInProgress = false
-                            finish()
-                            if (!editMode) {
-                                lifecycleScope.launch(context = Dispatchers.Main) {
-                                    delay(500L)
-                                    MainNavigationController.navigate(ChallengesOverviewFragmentDirections.openChallengeDetail(challengeId ?: ""))
-                                }
-                            }
-                        },
-                        { throwable ->
-                            dialog?.dismiss()
-                            savingInProgress = false
-                            RxErrorHandler.reportError(throwable)
-                        }
-                    )
-            )
+                }
+            }
         } else if (item.itemId == android.R.id.home) {
             finish()
             return true
@@ -228,13 +229,11 @@ class ChallengeFormActivity : BaseActivity() {
             openTaskDisabled = false,
             taskActionsDisabled = true
         ).also { challengeTasks = it }
-        compositeSubscription.add(
-            challengeTasks.taskOpenEvents.subscribe {
-                if (it.isValid) {
-                    openNewTaskActivity(it.type, it)
-                }
+        challengeTasks.onTaskOpen = {
+            if (it.isValid) {
+                openNewTaskActivity(it.type, it)
             }
-        )
+        }
         locationAdapter = GroupArrayAdapter(this)
 
         if (bundle != null) {
@@ -337,45 +336,43 @@ class ChallengeFormActivity : BaseActivity() {
         }
 
         locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        compositeSubscription.add(
-            socialRepository.getUserGroups("guild").zipWith(
-                userRepository.getUserFlowable()
-                    .map { it.party?.id ?: "" }
-                    .distinctUntilChanged()
-                    .flatMap {
-                        if (it.isBlank()) {
-                            return@flatMap Flowable.empty<Group>()
-                        }
-                        socialRepository.retrieveGroup(it)
-                    }
-            ) { 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()
-                            tavern.id = "00000000-0000-4000-A000-000000000000"
-                            tavern.name = getString(R.string.public_challenge)
-                            mutableGroups.add(0, tavern)
-                        }
-                        if (groups.second != null) {
-                            mutableGroups.add(groups.second)
-                        }
-                        locationAdapter.clear()
-                        locationAdapter.addAll(mutableGroups)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val groups = socialRepository.getUserGroups("guild").firstOrNull()?.toMutableList()
+                ?: return@launch
+            val partyID = userRepository.getUser().firstOrNull()?.party?.id
+            val party = if (partyID?.isNotBlank() == true) {
+                socialRepository.retrieveGroup(partyID)
+            } else {
+                null
+            }
+            if (groups.firstOrNull { it.id == "00000000-0000-4000-A000-000000000000" } == null) {
+                val tavern = Group()
+                tavern.id = "00000000-0000-4000-A000-000000000000"
+                tavern.name = getString(R.string.public_challenge)
+                groups.add(0, tavern)
+            }
+            if (party != null) {
+                groups.add(party)
+            }
+            locationAdapter.clear()
+            locationAdapter.addAll(groups)
+        }
 
         binding.challengeLocationSpinner.adapter = locationAdapter
-        binding.challengeLocationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
-                checkPrizeAndMinimumForTavern()
-            }
+        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 */ }
-        }
+                override fun onNothingSelected(adapterView: AdapterView<*>) { /* no-on */
+                }
+            }
         binding.createChallengePrize.setOnKeyListener { _, _, _ ->
             checkPrizeAndMinimumForTavern()
 
@@ -389,21 +386,17 @@ class ChallengeFormActivity : BaseActivity() {
         taskList.add(addReward)
 
         challengeTasks.setTasks(taskList)
-        compositeSubscription.add(
-            challengeTasks.addItemObservable().subscribe(
-                { t ->
-                    when (t.text) {
-                        addHabit.text -> openNewTaskActivity(TaskType.HABIT, null)
-                        addDaily.text -> openNewTaskActivity(TaskType.DAILY, null)
-                        addTodo.text -> openNewTaskActivity(TaskType.TODO, null)
-                        addReward.text -> openNewTaskActivity(TaskType.REWARD, null)
-                    }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        challengeTasks.onTaskOpen = { t ->
+            when (t.text) {
+                addHabit.text -> openNewTaskActivity(TaskType.HABIT, null)
+                addDaily.text -> openNewTaskActivity(TaskType.DAILY, null)
+                addTodo.text -> openNewTaskActivity(TaskType.TODO, null)
+                addReward.text -> openNewTaskActivity(TaskType.REWARD, null)
+            }
+        }
 
-        binding.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
@@ -413,13 +406,14 @@ class ChallengeFormActivity : BaseActivity() {
             }
         })
         binding.createChallengeTaskList.adapter = challengeTasks
-        binding.createChallengeTaskList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
+        binding.createChallengeTaskList.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(this)
     }
 
     private fun fillControlsByChallenge() {
         challengeId?.let {
-            challengeRepository.getChallenge(it).subscribe(
-                { challenge ->
+            lifecycleScope.launchCatching {
+                challengeRepository.getChallenge(it).collect { challenge ->
                     groupID = challenge.groupId
                     editMode = true
                     binding.createChallengeTitle.setText(challenge.name)
@@ -437,17 +431,15 @@ class ChallengeFormActivity : BaseActivity() {
                         }
                     }
                     checkPrizeAndMinimumForTavern()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-            challengeRepository.getChallengeTasks(it).subscribe(
-                { tasks ->
+                }
+            }
+            lifecycleScope.launchCatching {
+                challengeRepository.getChallengeTasks(it).collect { tasks ->
                     tasks.forEach { task ->
                         addOrUpdateTaskInList(task, true)
                     }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
+                }
+            }
         }
     }
 
@@ -469,16 +461,17 @@ class ChallengeFormActivity : BaseActivity() {
         newTaskResult.launch(intent)
     }
 
-    private val newTaskResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            val task = it.data?.getParcelableExtra<Task>(TaskFormActivity.PARCELABLE_TASK)
-            if (task != null) {
-                addOrUpdateTaskInList(task)
+    private val newTaskResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                val task = it.data?.getParcelableExtra<Task>(TaskFormActivity.PARCELABLE_TASK)
+                if (task != null) {
+                    addOrUpdateTaskInList(task)
+                }
             }
         }
-    }
 
-    private fun createChallenge(): Flowable<Challenge> {
+    private suspend fun createChallenge(): Challenge? {
         val c = challengeData
 
         val taskList = challengeTasks.taskList
@@ -490,7 +483,7 @@ class ChallengeFormActivity : BaseActivity() {
         return challengeRepository.createChallenge(c, taskList)
     }
 
-    private fun updateChallenge(): Flowable<Challenge> {
+    private suspend fun updateChallenge(): Challenge? {
         val c = challengeData
 
         val taskList = challengeTasks.taskList
@@ -537,7 +530,8 @@ class ChallengeFormActivity : BaseActivity() {
         return editText.text.toString()
     }
 
-    private class GroupArrayAdapter(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? TextView
@@ -546,7 +540,8 @@ class ChallengeFormActivity : BaseActivity() {
         }
 
         override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
-            val checkedTextView = super.getDropDownView(position, convertView, parent) as? AppCompatCheckedTextView
+            val checkedTextView =
+                super.getDropDownView(position, convertView, parent) as? AppCompatCheckedTextView
             checkedTextView?.text = getItem(position)?.name
             return checkedTextView ?: View(context)
         }
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 b84ef5c54..5011641e4 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
@@ -8,24 +8,25 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.ActivityClassSelectionBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.Gear
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Outfit
 import com.habitrpg.android.habitica.models.user.Preferences
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.rxjava3.functions.Consumer
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class ClassSelectionActivity : BaseActivity(), Consumer<User> {
+class ClassSelectionActivity : BaseActivity() {
 
     @Inject
     lateinit var userViewModel: MainUserViewModel
@@ -59,7 +60,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         return R.layout.activity_class_selection
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityClassSelectionBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -85,10 +86,10 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         }
 
         if (!isInitialSelection) {
-            compositeSubscription.add(
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 userRepository.changeClass()
-                    .subscribe({ classWasUnset = true }, RxErrorHandler.handleEmptyError())
-            )
+                classWasUnset
+            }
         }
 
         binding.healerWrapper.setOnClickListener { newClass = "healer" }
@@ -254,20 +255,26 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
     private fun optOutOfClasses() {
         shouldFinish = true
         this.displayProgressDialog(getString(R.string.opting_out_progress))
-        compositeSubscription.add(userRepository.disableClasses().subscribe(this, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.disableClasses()
+            dismiss()
+        }
     }
 
     private fun selectClass(selectedClass: String) {
         shouldFinish = true
         this.displayProgressDialog(getString(R.string.changing_class_progress))
-        compositeSubscription.add(userRepository.changeClass(selectedClass).subscribe(this, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.changeClass(selectedClass)
+            dismiss()
+        }
     }
 
     private fun displayProgressDialog(progressText: String) {
         HabiticaProgressDialog.show(this, progressText)
     }
 
-    override fun accept(user: User) {
+    private fun dismiss() {
         if (shouldFinish == true) {
             progressDialog?.dismiss()
             finish()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
index ae13256f3..64b90d66b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
@@ -15,12 +15,13 @@ import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.common.habitica.helpers.Animations
 import com.plattysoft.leonids.ParticleSystem
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class DeathActivity: BaseActivity() {
@@ -39,7 +40,7 @@ class DeathActivity: BaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityDeathBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -56,11 +57,10 @@ class DeathActivity: BaseActivity() {
                     return@AdHandler
                 }
                 Log.d("AdHandler", "Reviving user")
-                compositeSubscription.add(
-                        userRepository.updateUser("stats.hp", 1).subscribe({
-                                                                           finish()
-                        }, RxErrorHandler.handleEmptyError())
-                )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    userRepository.updateUser("stats.hp", 1)
+                    finish()
+                }
             }
             handler.prepare {
                 if (it && binding.adButton.state == AdButton.State.LOADING) {
@@ -80,9 +80,10 @@ class DeathActivity: BaseActivity() {
 
         binding.restartButton.setOnClickListener {
             binding.restartButton.isEnabled = false
-            userRepository.revive().subscribe({
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.revive()
                 finish()
-            }, RxErrorHandler.handleEmptyError())
+            }
         }
         startAnimating()
     }
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 ba36246ca..7a1286c8c 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
@@ -27,7 +27,7 @@ class FixCharacterValuesActivity : BaseActivity() {
 
     override fun getLayoutResId(): Int = R.layout.activity_fixcharacter
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityFixcharacterBinding.inflate(layoutInflater)
         return binding.root
     }
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 5b7855516..934590abd 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
@@ -13,6 +13,7 @@ import android.widget.TableRow
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
@@ -20,9 +21,10 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityFullProfileBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.UserStatComputer
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.models.members.Member
@@ -38,10 +40,10 @@ import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.RecyclerViewState
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.common.habitica.views.PixelArtView
-import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import javax.inject.Inject
@@ -53,8 +55,10 @@ class FullProfileActivity : BaseActivity() {
 
     @Inject
     lateinit var inventoryRepository: InventoryRepository
+
     @Inject
     lateinit var apiClient: ApiClient
+
     @Inject
     lateinit var socialRepository: SocialRepository
 
@@ -82,29 +86,48 @@ class FullProfileActivity : BaseActivity() {
 
         setTitle(R.string.profile_loading_data)
 
-        compositeSubscription.add(socialRepository.getMember(this.userID).subscribe({ this.updateView(it) }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = socialRepository.retrieveMember(userID)
+            if (member != null) {
+                updateView(member)
+            }
+        }
         avatarWithBars = AvatarWithBarsViewModel(this, binding.avatarWithBars)
 
-        binding.avatarWithBars.root.setBackgroundColor(ContextCompat.getColor(this, R.color.transparent))
-        binding.avatarWithBars.hpBar.barBackgroundColor = getThemeColor(R.color.window_background)
-        binding.avatarWithBars.xpBar.barBackgroundColor = getThemeColor(R.color.window_background)
-        binding.avatarWithBars.mpBar.barBackgroundColor = getThemeColor(R.color.window_background)
+        binding.avatarWithBars.root.setBackgroundColor(
+            ContextCompat.getColor(
+                this,
+                R.color.transparent
+            )
+        )
+        binding.avatarWithBars.hpBar.barBackgroundColor = getThemeColor(R.attr.colorWindowBackground)
+        binding.avatarWithBars.xpBar.barBackgroundColor = getThemeColor(R.attr.colorWindowBackground)
+        binding.avatarWithBars.mpBar.barBackgroundColor = getThemeColor(R.attr.colorWindowBackground)
 
         attributeRows.clear()
         binding.attributesCardView.setOnClickListener { toggleAttributeDetails() }
 
         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.getUserFlowable().subscribe(
-                {
-                    blocks = it.inbox?.blocks ?: listOf()
-                    binding.blockedDisclaimerView.visibility = if (isUserBlocked()) View.VISIBLE else View.GONE
-                },
-                RxErrorHandler.handleEmptyError()
+        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))
+            )
+        }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .collect {
+                    blocks = it?.inbox?.blocks ?: listOf()
+                    binding.blockedDisclaimerView.visibility =
+                        if (isUserBlocked()) View.VISIBLE else View.GONE
+                }
+        }
     }
 
     override fun onDestroy() {
@@ -135,22 +158,26 @@ class FullProfileActivity : BaseActivity() {
                 true
             }
             R.id.copy_username -> {
-                val clipboard = this.getSystemService(Context.CLIPBOARD_SERVICE) as? android.content.ClipboardManager
+                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.binding.scrollView.getChildAt(0) as ViewGroup,
-                    String.format(getString(R.string.username_copied), userDisplayName), SnackbarDisplayType.NORMAL
+                    String.format(getString(R.string.username_copied), userDisplayName),
+                    SnackbarDisplayType.NORMAL
                 )
                 true
             }
             R.id.copy_userid -> {
-                val clipboard = this.getSystemService(Context.CLIPBOARD_SERVICE) as? android.content.ClipboardManager
+                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.binding.scrollView.getChildAt(0) as ViewGroup,
-                    String.format(getString(R.string.id_copied), userDisplayName), SnackbarDisplayType.NORMAL
+                    String.format(getString(R.string.id_copied), userDisplayName),
+                    SnackbarDisplayType.NORMAL
                 )
                 true
             }
@@ -167,16 +194,11 @@ class FullProfileActivity : BaseActivity() {
     }
 
     private fun useBlock() {
-        compositeSubscription.add(
-            socialRepository.blockMember(userID).flatMap {
-                userRepository.retrieveUser()
-            }.subscribe(
-                {
-                    invalidateOptionsMenu()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launchCatching {
+            socialRepository.blockMember(userID)
+            userRepository.retrieveUser()
+            invalidateOptionsMenu()
+        }
     }
 
     private fun showBlockDialog() {
@@ -194,7 +216,10 @@ class FullProfileActivity : BaseActivity() {
         finish()
         MainScope().launch(context = Dispatchers.Main) {
             delay(500L)
-            MainNavigationController.navigate(R.id.inboxMessageListFragment, bundleOf(Pair("username", username), Pair("userID", userID)))
+            MainNavigationController.navigate(
+                R.id.inboxMessageListFragment,
+                bundleOf(Pair("username", username), Pair("userID", userID))
+            )
         }
     }
 
@@ -221,22 +246,33 @@ class FullProfileActivity : BaseActivity() {
             binding.blurbTextView.movementMethod = LinkMovementMethod.getInstance()
         }
 
-        user.authentication?.timestamps?.createdAt?.let { binding.joinedView.text = dateFormatter.format(it) }
-        user.authentication?.timestamps?.lastLoggedIn?.let { binding.lastLoginView.text = dateFormatter.format(it) }
+        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({ gear -> this.gotGear(gear, user) }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launchCatching {
+            loadItemDataByOutfit(user.equipped).collect { gear -> gotGear(gear, user) }
+        }
 
         if (user.preferences?.costume == true) {
-            compositeSubscription.add(loadItemDataByOutfit(user.costume).subscribe({ this.gotCostume(it) }, RxErrorHandler.handleEmptyError()))
+            lifecycleScope.launchCatching {
+                loadItemDataByOutfit(user.costume).collect { gotCostume(it) }
+            }
         } else {
             binding.costumeCard.visibility = View.GONE
         }
 
         // Load the members achievements now
-        compositeSubscription.add(socialRepository.getMemberAchievements(this.userID).subscribe({ this.fillAchievements(it) }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launchCatching {
+            val achievements = socialRepository.getMemberAchievements(userID)
+            fillAchievements(achievements)
+        }
     }
 
     private fun updatePetsMountsView(user: Member) {
@@ -247,9 +283,9 @@ class FullProfileActivity : BaseActivity() {
         if (user.currentMount?.isNotBlank() == true) binding.currentMountDrawee.loadImage("Mount_Icon_" + user.currentMount)
     }
 
-    // endregion
+// endregion
 
-    // region Attributes
+// region Attributes
 
     private fun fillAchievements(achievements: List<Achievement>?) {
         if (achievements == null) {
@@ -257,23 +293,36 @@ class FullProfileActivity : BaseActivity() {
         }
         val items = ArrayList<Any>()
 
-        fillAchievements(R.string.basic_achievements, achievements.filter { it.category == "basic" }, items)
-        fillAchievements(R.string.seasonal_achievements, achievements.filter { it.category == "seasonal" }, items)
-        fillAchievements(R.string.special_achievements, achievements.filter { it.category == "special" }, items)
+        fillAchievements(
+            R.string.basic_achievements,
+            achievements.filter { it.category == "basic" },
+            items
+        )
+        fillAchievements(
+            R.string.seasonal_achievements,
+            achievements.filter { it.category == "seasonal" },
+            items
+        )
+        fillAchievements(
+            R.string.special_achievements,
+            achievements.filter { it.category == "special" },
+            items
+        )
 
         val adapter = AchievementProfileAdapter()
         adapter.setItemList(items)
 
         val layoutManager = androidx.recyclerview.widget.GridLayoutManager(this, 3)
-        layoutManager.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
-            override fun getSpanSize(position: Int): Int {
-                return if (adapter.getItemViewType(position) == 0) {
-                    layoutManager.spanCount
-                } else {
-                    1
+        layoutManager.spanSizeLookup =
+            object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int {
+                    return if (adapter.getItemViewType(position) == 0) {
+                        layoutManager.spanCount
+                    } else {
+                        1
+                    }
                 }
             }
-        }
         binding.achievementGroupList.layoutManager = layoutManager
         binding.achievementGroupList.adapter = adapter
 
@@ -287,7 +336,9 @@ class FullProfileActivity : BaseActivity() {
     ) {
         // Order by ID first
         val achievementList = ArrayList(achievements)
-        achievementList.sortWith { 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)
@@ -313,8 +364,14 @@ class FullProfileActivity : BaseActivity() {
         }
     }
 
-    private fun addEquipmentRow(table: TableLayout, gearKey: String?, text: String?, stats: String?) {
-        val gearRow = layoutInflater.inflate(R.layout.profile_gear_tablerow, table, false) as? TableRow
+    private fun addEquipmentRow(
+        table: TableLayout,
+        gearKey: String?,
+        text: String?,
+        stats: String?
+    ) {
+        val gearRow =
+            layoutInflater.inflate(R.layout.profile_gear_tablerow, table, false) as? TableRow
 
         val draweeView = gearRow?.findViewById<PixelArtView>(R.id.gear_drawee)
 
@@ -343,7 +400,7 @@ class FullProfileActivity : BaseActivity() {
         )
     }
 
-    private fun loadItemDataByOutfit(outfit: Outfit?): Flowable<out List<Equipment>> {
+    private fun loadItemDataByOutfit(outfit: Outfit?): Flow<List<Equipment>> {
         val outfitList = ArrayList<String>()
         if (outfit != null) {
             outfitList.add(outfit.armor)
@@ -376,7 +433,15 @@ class FullProfileActivity : BaseActivity() {
             if (row is UserStatComputer.EquipmentRow) {
                 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)
+                addAttributeRow(
+                    getString(row.labelId),
+                    row.strVal,
+                    row.intVal,
+                    row.conVal,
+                    row.perVal,
+                    row.roundDown,
+                    row.summary
+                )
             }
         }
 
@@ -395,7 +460,11 @@ 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,
+            getString(R.string.profile_allocated),
+            stats.strength?.toFloat() ?: 0f,
+            stats.intelligence?.toFloat() ?: 0f,
+            stats.constitution?.toFloat() ?: 0f,
+            stats.per?.toFloat() ?: 0f,
             roundDown = true,
             isSummary = false
         )
@@ -403,11 +472,23 @@ class FullProfileActivity : BaseActivity() {
             getString(R.string.buffs),
             buffs?.str
                 ?: 0f,
-            buffs?._int ?: 0f, buffs?.con ?: 0f, buffs?.per ?: 0f, roundDown = true, isSummary = false
+            buffs?._int ?: 0f,
+            buffs?.con ?: 0f,
+            buffs?.per ?: 0f,
+            roundDown = true,
+            isSummary = false
         )
 
         // Summary row
-        addAttributeRow("", attributeStrSum, attributeIntSum, attributeConSum, attributePerSum, roundDown = false, isSummary = true)
+        addAttributeRow(
+            "",
+            attributeStrSum,
+            attributeIntSum,
+            attributeConSum,
+            attributePerSum,
+            roundDown = false,
+            isSummary = true
+        )
     }
 
     private fun addAttributeRow(
@@ -419,7 +500,11 @@ class FullProfileActivity : BaseActivity() {
         roundDown: Boolean,
         isSummary: Boolean
     ) {
-        val tableRow = layoutInflater.inflate(R.layout.profile_attributetablerow, binding.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
 
@@ -470,9 +555,9 @@ class FullProfileActivity : BaseActivity() {
         }
     }
 
-    // endregion
+// endregion
 
-    // region Navigation
+// region Navigation
 
     override fun onSupportNavigateUp(): Boolean {
         finish()
@@ -483,15 +568,15 @@ class FullProfileActivity : BaseActivity() {
         finish()
     }
 
-    // endregion
+// endregion
 
-    // region BaseActivity-Overrides
+// region BaseActivity-Overrides
 
     override fun getLayoutResId(): Int {
         return R.layout.activity_full_profile
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityFullProfileBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -512,5 +597,5 @@ class FullProfileActivity : BaseActivity() {
         }
     }
 
-    // endregion
+// endregion
 }
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 873598e5e..a894a2d8c 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,6 +3,7 @@ package com.habitrpg.android.habitica.ui.activities
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.google.android.material.tabs.TabLayoutMediator
@@ -11,12 +12,14 @@ 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.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment
 import com.habitrpg.android.habitica.ui.views.CurrencyView
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class GiftGemsActivity : PurchaseActivity() {
@@ -46,7 +49,7 @@ class GiftGemsActivity : PurchaseActivity() {
         return R.layout.activity_gift_gems
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityGiftGemsBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -74,27 +77,17 @@ class GiftGemsActivity : PurchaseActivity() {
 
         setViewPagerAdapter()
 
-        compositeSubscription.add(
-            socialRepository.getMember(giftedUsername ?: giftedUserID).firstElement().subscribe(
-                {
-                    giftedMember = it
-                    giftedUserID = it.id
-                    giftedUsername = it.username
-                    purchaseFragment?.giftedMember = it
-                    balanceFragment?.giftedMember = it
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = socialRepository.retrieveMember(giftedUsername ?: giftedUserID) ?: return@launch
+            giftedMember = member
+            giftedUserID = member.id
+            giftedUsername = member.username
+            purchaseFragment?.giftedMember = member
+            balanceFragment?.giftedMember = member
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable().subscribe(
-                {
-                    currencyView.value = it.gemCount.toDouble()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+            val user = userRepository.getUser().firstOrNull()
+            currencyView.value = user?.gemCount?.toDouble() ?: 0.0
+        }
     }
 
     private fun setViewPagerAdapter() {
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 365bbfd12..fc755c822 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
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.activities
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 import com.android.billingclient.api.SkuDetails
 import com.habitrpg.android.habitica.R
@@ -10,15 +11,15 @@ 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.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 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.ui.views.subscriptions.SubscriptionOptionView
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
 class GiftSubscriptionActivity : PurchaseActivity() {
 
@@ -45,7 +46,7 @@ class GiftSubscriptionActivity : PurchaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityGiftSubscriptionBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -70,20 +71,15 @@ class GiftSubscriptionActivity : PurchaseActivity() {
         binding.subscriptionButton.setOnClickListener {
             selectedSubscriptionSku?.let { sku -> purchaseSubscription(sku) }
         }
-
-        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()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = socialRepository.retrieveMember(giftedUsername ?: giftedUserID) ?: return@launch
+            binding.avatarView.setAvatar(member)
+            binding.displayNameTextView.username = member.profile?.name
+            binding.displayNameTextView.tier = member.contributor?.level ?: 0
+            binding.usernameTextView.text = "@${member.username}"
+            giftedUserID = member.id
+            giftedUsername = member.username
+        }
 
         if (appConfigManager.activePromo()?.identifier == "g1g1") {
             binding.giftSubscriptionContainer.visibility = View.VISIBLE
@@ -94,7 +90,7 @@ class GiftSubscriptionActivity : PurchaseActivity() {
 
     override fun onStart() {
         super.onStart()
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val subscriptions = purchaseHandler.getAllGiftSubscriptionProducts()
             skus = subscriptions
             withContext(Dispatchers.Main) {
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 726cc1a50..3ebc9adc9 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
@@ -28,7 +28,7 @@ class GroupFormActivity : BaseActivity() {
         return R.layout.activity_group_form
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityGroupFormBinding.inflate(layoutInflater)
         return binding.root
     }
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 b75dedd99..aca79ac48 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
@@ -19,9 +19,9 @@ import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragme
 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 java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Named
+import kotlin.time.DurationUnit
 
 class GroupInviteActivity : BaseActivity() {
 
@@ -38,7 +38,7 @@ class GroupInviteActivity : BaseActivity() {
         return R.layout.activity_party_invite
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityPartyInviteBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -70,7 +70,7 @@ class GroupInviteActivity : BaseActivity() {
                 dismissKeyboard()
                 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)
+                    runDelayed(1, DurationUnit.SECONDS, this::finish)
                 } else {
                     finish()
                 }
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 0dd141463..99e4c2e17 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
@@ -5,7 +5,7 @@ import android.view.MenuItem
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import okhttp3.Call
 import okhttp3.Callback
@@ -31,7 +31,7 @@ class GuidelinesActivity : BaseActivity() {
         val request = Request.Builder().url("https://s3.amazonaws.com/habitica-assets/mobileApp/endpoint/community-guidelines.md").build()
         client.newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
-                RxErrorHandler.reportError(e)
+                ExceptionHandler.reportError(e)
             }
 
             @Throws(IOException::class)
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 269cef412..10f111e5f 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
@@ -12,7 +12,7 @@ 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.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider
@@ -42,7 +42,7 @@ class HabitButtonWidgetActivity : BaseActivity() {
         return R.layout.widget_configure_habit_button
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = WidgetConfigureHabitButtonBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -75,13 +75,12 @@ class HabitButtonWidgetActivity : BaseActivity() {
         }
 
         adapter = SkillTasksRecyclerViewAdapter()
-        adapter?.getTaskSelectionEvents()?.subscribe(
-            { task -> taskSelected(task.id) },
-            RxErrorHandler.handleEmptyError()
-        )?.let { compositeSubscription.add(it) }
+        adapter?.onTaskSelection = {
+            taskSelected(it.id)
+        }
         binding.recyclerView.adapter = adapter
 
-        CoroutineScope(Dispatchers.Main + job).launch {
+        CoroutineScope(Dispatchers.Main + job).launch(ExceptionHandler.coroutine()) {
             adapter?.data = taskRepository.getTasks(TaskType.HABIT, userId, emptyArray()).firstOrNull() ?: listOf()
         }
     }
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 8f242f2ed..1d1786216 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
@@ -10,14 +10,16 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.lifecycle.lifecycleScope
 import androidx.viewpager.widget.ViewPager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.databinding.ActivityIntroBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment
 import com.viewpagerindicator.IconPagerAdapter
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChangeListener {
@@ -30,7 +32,7 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         return R.layout.activity_intro
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityIntroBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -44,7 +46,9 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         binding.skipButton.setOnClickListener(this)
         binding.finishButton.setOnClickListener(this)
 
-        compositeSubscription.add(contentRepository.retrieveContent().subscribe({ }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            contentRepository.retrieveContent()
+        }
 
         window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
         window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
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 813f1ba2d..5d4e59bd3 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
@@ -41,7 +41,8 @@ import com.habitrpg.android.habitica.extensions.addOkButton
 import com.habitrpg.android.habitica.extensions.updateStatusBarColor
 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.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.viewmodels.AuthenticationViewModel
@@ -81,14 +82,15 @@ class LoginActivity : BaseActivity() {
                 showValidationError(getString(R.string.password_too_short, configManager.minimumPasswordLength()))
                 return@OnClickListener
             }
-            apiClient.registerUser(username, email, password, confirmPassword)
-                .subscribe(
-                    { handleAuthResponse(it) },
-                    {
-                        hideProgress()
-                        RxErrorHandler.reportError(it)
-                    }
-                )
+            lifecycleScope.launch(ExceptionHandler.coroutine {
+                hideProgress()
+                ExceptionHandler.reportError(it)
+            }) {
+                val response = apiClient.registerUser(username, email, password, confirmPassword)
+                if (response != null) {
+                    handleAuthResponse(response)
+                }
+            }
         } else {
             val username: String = binding.username.text.toString().trim { it <= ' ' }
             val password: String = binding.password.text.toString()
@@ -97,14 +99,15 @@ class LoginActivity : BaseActivity() {
                 return@OnClickListener
             }
             Log.d("LoginActivity", ": $username, $password")
-            apiClient.connectUser(username, password).subscribe(
-                { handleAuthResponse(it) },
-                {
-                    hideProgress()
-                    RxErrorHandler.reportError(it)
-                    Log.d("LoginActivity", ": ${it.message}", it)
+            lifecycleScope.launch(ExceptionHandler.coroutine {
+                hideProgress()
+                ExceptionHandler.reportError(it)
+            }) {
+                val response = apiClient.connectUser(username, password)
+                if (response != null) {
+                    handleAuthResponse(response)
                 }
-            )
+            }
         }
     }
 
@@ -113,7 +116,7 @@ class LoginActivity : BaseActivity() {
         return R.layout.activity_login
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityLoginBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -261,12 +264,12 @@ class LoginActivity : BaseActivity() {
         } catch (e: Exception) {
             // Wearable API is not available on this device.
         }
-        compositeSubscription.add(
-            userRepository.retrieveUser(true)
-                .subscribe({
-                    handleAuthResponse(it, response.newUser)
-                }, RxErrorHandler.handleEmptyError())
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.retrieveUser(true)
+            if (user != null) {
+                handleAuthResponse(user, response.newUser)
+            }
+        }
     }
 
     private fun handleAuthResponse(user: User, isNew: Boolean) {
@@ -276,20 +279,15 @@ class LoginActivity : BaseActivity() {
         if (isRegistering) {
             FirebaseAnalytics.getInstance(this).logEvent("user_registered", null)
         }
-        compositeSubscription.add(
-            userRepository.retrieveUser(withTasks = true, forced = true)
-                .subscribe(
-                    {
-                        if (isNew) {
-                            this.startSetupActivity()
-                        } else {
-                            this.startMainActivity()
-                            AmplitudeManager.sendEvent("login", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT)
-                        }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            if (isNew) {
+                startSetupActivity()
+            } else {
+                startMainActivity()
+                AmplitudeManager.sendEvent("login", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT)
+            }
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -455,7 +453,10 @@ class LoginActivity : BaseActivity() {
         alertDialog.setMessage(R.string.forgot_password_description)
         alertDialog.setAdditionalContentView(input)
         alertDialog.addButton(R.string.send, true) { _, _ ->
-            userRepository.sendPasswordResetEmail(input.text.toString()).subscribe({ showPasswordEmailConfirmation() }, RxErrorHandler.handleEmptyError())
+            lifecycleScope.launchCatching {
+                userRepository.sendPasswordResetEmail(input.text.toString())
+                showPasswordEmailConfirmation()
+            }
         }
         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 30f23bcde..96c564248 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
@@ -29,28 +29,29 @@ import com.habitrpg.android.habitica.components.UserComponent
 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.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.databinding.ActivityMainBinding
 import com.habitrpg.android.habitica.extensions.hideKeyboard
 import com.habitrpg.android.habitica.extensions.observeOnce
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.extensions.updateStatusBarColor
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationOpenHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.interactors.CheckClassSelectionUseCase
 import com.habitrpg.android.habitica.interactors.DisplayItemDropUseCase
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
 import com.habitrpg.android.habitica.models.TutorialStep
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
+import com.habitrpg.android.habitica.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.ui.TutorialView
 import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.MainActivityViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
+import com.habitrpg.android.habitica.ui.views.AppHeaderView
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.QuestCompletedDialog
 import com.habitrpg.android.habitica.ui.views.yesterdailies.YesterdailyDialog
@@ -61,12 +62,13 @@ import com.habitrpg.android.habitica.widget.TodoListWidgetProvider
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.shared.habitica.models.responses.MaintenanceResponse
 import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import com.habitrpg.common.habitica.views.AvatarView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import java.util.Date
 import javax.inject.Inject
@@ -100,7 +102,6 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
     val snackbarContainer: ViewGroup
         get() = binding.content.snackbarContainer
 
-    private var avatarInHeader: AvatarWithBarsViewModel? = null
     val notificationsViewModel: NotificationsViewModel by viewModels()
     val viewModel: MainActivityViewModel by viewModels()
     private var sideAvatarView: AvatarView? = null
@@ -117,7 +118,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         return R.layout.activity_main
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityMainBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -130,8 +131,8 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         }
         try {
             launchTrace = FirebasePerformance.getInstance().newTrace("MainActivityLaunch")
-        } catch (e: Exception) {
-            // pass
+        } catch (e: IllegalStateException) {
+            ExceptionHandler.reportError(e)
         }
         launchTrace?.start()
         super.onCreate(savedInstanceState)
@@ -147,17 +148,16 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
 
         setupToolbar(binding.content.toolbar)
 
-        avatarInHeader = AvatarWithBarsViewModel(this, binding.content.avatarWithBars, viewModel.userViewModel)
         sideAvatarView = AvatarView(this, showBackground = true, showMount = false, showPet = false)
 
         viewModel.user.observe(this) {
             setUserData(it)
         }
-        compositeSubscription.add(
-            userRepository.getUserQuestStatus().subscribeWithErrorHandler {
+        lifecycleScope.launchCatching {
+            userRepository.getUserQuestStatus().collect {
                 userQuestStatus = it
             }
-        )
+        }
 
         val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
         drawerFragment = supportFragmentManager.findFragmentById(R.id.navigation_drawer) as? NavigationDrawerFragment
@@ -210,6 +210,12 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         supportActionBar?.setHomeButtonEnabled(true)
         setupNotifications()
         setupBottomnavigationLayoutListener()
+        
+        binding.content.headerView.setContent {
+            HabiticaTheme {
+                AppHeaderView(viewModel.userViewModel)
+            }
+        }
 
         viewModel.onCreate()
     }
@@ -275,7 +281,11 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         return if (binding.root.parent is DrawerLayout && drawerToggle?.onOptionsItemSelected(item) == true) {
             true
         } else if (item.itemId == android.R.id.home) {
-            drawerFragment?.toggleDrawer()
+            if (drawerToggle?.isDrawerIndicatorEnabled == true) {
+                drawerFragment?.toggleDrawer()
+            } else {
+                MainNavigationController.navigateBack()
+            }
             true
         } else super.onOptionsItemSelected(item)
     }
@@ -372,7 +382,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         if (user != null) {
             val preferences = user.preferences
 
-            preferences?.language?.let { apiClient.setLanguageCode(it) }
+            preferences?.language?.let { apiClient.languageCode = it }
             if (preferences?.language != viewModel.preferenceLanguage) {
                 viewModel.preferenceLanguage = preferences?.language
             }
@@ -381,23 +391,15 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
             displayDeathDialogIfNeeded()
             YesterdailyDialog.showDialogIfNeeded(this, user.id, userRepository, taskRepository)
 
-            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(
-                        {
-                            QuestCompletedDialog.showWithQuest(this, it)
-
-                            viewModel.updateUser("party.quest.completed", "")
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-                )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val questContent = inventoryRepository.getQuestContent(user.party?.quest?.completed ?: "").firstOrNull()
+                    if (questContent != null) {
+                        QuestCompletedDialog.showWithQuest(this@MainActivity, questContent)
+                    }
+                    viewModel.updateUser("party.quest.completed", "")
+                }
             }
 
             if (user.flags?.welcomed == false) {
@@ -439,22 +441,35 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                 UserQuestStatus.QUEST_BOSS -> data.questDamage
                 else -> 0.0
             }
-            compositeSubscription.add(
-                notifyUserUseCase.observable(
+            lifecycleScope.launchCatching {
+                notifyUserUseCase.callInteractor(
                     NotifyUserUseCase.RequestValues(
-                        this, snackbarContainer,
-                        viewModel.user.value, data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta, damageValue, data.hasLeveledUp, data.level
+                        this@MainActivity,
+                        snackbarContainer,
+                        viewModel.user.value,
+                        data.experienceDelta,
+                        data.healthDelta,
+                        data.goldDelta,
+                        data.manaDelta,
+                        damageValue,
+                        data.hasLeveledUp,
+                        data.level
                     )
                 )
-                    .subscribe({ }, RxErrorHandler.handleEmptyError())
-            )
+            }
         }
 
         val showItemsFound = userQuestStatus == UserQuestStatus.QUEST_COLLECT
-        compositeSubscription.add(
-            displayItemDropUseCase.observable(DisplayItemDropUseCase.RequestValues(data, this, snackbarContainer, showItemsFound))
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        lifecycleScope.launchCatching {
+            displayItemDropUseCase.callInteractor(
+                DisplayItemDropUseCase.RequestValues(
+                    data,
+                    this@MainActivity,
+                    snackbarContainer,
+                    showItemsFound
+                )
+            )
+        }
     }
 
     private var lastDeathDialogDisplay = 0L
@@ -512,7 +527,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                             startActivity(intent)
                         }
                     } catch (e: PackageManager.NameNotFoundException) {
-                        RxErrorHandler.reportError(e)
+                        ExceptionHandler.reportError(e)
                     }
                 }
             }
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 7bef8b85f..4dea75377 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
@@ -5,15 +5,14 @@ import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.View
 import androidx.core.net.toUri
+import androidx.lifecycle.lifecycleScope
 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.helpers.launchCatching
 import com.habitrpg.common.habitica.helpers.setMarkdown
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.schedulers.Schedulers
 import javax.inject.Inject
 
 class MaintenanceActivity : BaseActivity() {
@@ -32,7 +31,7 @@ class MaintenanceActivity : BaseActivity() {
         return R.layout.activity_maintenance
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityMaintenanceBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -66,19 +65,12 @@ class MaintenanceActivity : BaseActivity() {
     override fun onResume() {
         super.onResume()
         if (!isDeprecationNotice) {
-            compositeSubscription.add(
-                this.maintenanceService.maintenanceStatus
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(
-                        { maintenanceResponse ->
-                            if (maintenanceResponse.activeMaintenance == false) {
-                                finish()
-                            }
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+            lifecycleScope.launchCatching {
+                val maintenanceResponse = maintenanceService.getMaintenanceStatus()
+                if (maintenanceResponse?.activeMaintenance == false) {
+                    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 95a444322..a8fbfa936 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
@@ -13,15 +13,18 @@ import android.widget.RatingBar
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 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.ActivityNotificationsBinding
 import com.habitrpg.android.habitica.extensions.fromHtml
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.common.habitica.models.Notification
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
+import com.habitrpg.common.habitica.models.Notification
 import com.habitrpg.common.habitica.models.notifications.GroupTaskApprovedData
 import com.habitrpg.common.habitica.models.notifications.GroupTaskNeedsWorkData
 import com.habitrpg.common.habitica.models.notifications.GroupTaskRequiresApprovalData
@@ -31,7 +34,8 @@ import com.habitrpg.common.habitica.models.notifications.NewStuffData
 import com.habitrpg.common.habitica.models.notifications.PartyInvitationData
 import com.habitrpg.common.habitica.models.notifications.QuestInvitationData
 import com.habitrpg.common.habitica.models.notifications.UnallocatedPointsData
-import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
@@ -48,7 +52,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
 
     override fun getLayoutResId(): Int = R.layout.activity_notifications
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityNotificationsBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -62,15 +66,12 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
 
         inflater = getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
 
-        compositeSubscription.add(
-            viewModel.getNotifications().subscribe(
-                {
-                    this.setNotifications(it)
-                    viewModel.markNotificationsAsSeen(it)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launchCatching {
+            viewModel.getNotifications().collect {
+                setNotifications(it)
+                viewModel.markNotificationsAsSeen(it)
+            }
+        }
 
         binding.notificationsRefreshLayout.setOnRefreshListener(this)
     }
@@ -90,14 +91,10 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
     override fun onRefresh() {
         binding.notificationsRefreshLayout.isRefreshing = true
 
-        compositeSubscription.add(
-            viewModel.refreshNotifications().subscribe(
-                {
-                    binding.notificationsRefreshLayout.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            viewModel.refreshNotifications()
+            binding.notificationsRefreshLayout.isRefreshing = false
+        }
     }
 
     private fun setNotifications(notifications: List<Notification>) {
@@ -314,16 +311,12 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         // hide view until we have loaded quest data and populated the values
         view?.visibility = View.GONE
 
-        compositeSubscription.add(
-            inventoryRepository.getQuestContent(data?.questKey ?: "")
-                .firstElement()
-                .subscribe(
-                    {
-                        updateQuestInvitationView(view, it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val questContent = inventoryRepository.getQuestContent(data?.questKey ?: "").firstOrNull()
+            if (questContent != null) {
+                updateQuestInvitationView(view, questContent)
+            }
+        }
 
         return view
     }
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 dcffeef5a..fbebe5d71 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
@@ -8,16 +8,18 @@ import android.os.Bundle
 import android.view.View
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 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.common.habitica.extensions.getThemeColor
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
+import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.helpers.setMarkdown
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class ReportMessageActivity : BaseActivity() {
@@ -41,7 +43,7 @@ class ReportMessageActivity : BaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityReportMessageBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -94,12 +96,11 @@ class ReportMessageActivity : BaseActivity() {
         }
         isReporting = true
         messageID?.let {
-            socialRepository.flagMessage(it, binding.additionalInfoEdittext.text.toString(), groupID)
-                .doOnError { isReporting = false }
-                .subscribe(
-                    { finish() },
-                    RxErrorHandler.handleEmptyError()
-                )
+            lifecycleScope.launch(ExceptionHandler.coroutine {
+                isReporting = false
+            }) {
+                finish()
+            }
         }
     }
 
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 c692bb219..09f88528b 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
@@ -14,23 +14,25 @@ import androidx.core.content.edit
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import androidx.viewpager.widget.ViewPager
 import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.android.habitica.components.UserComponent
 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.databinding.ActivitySetupBinding
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 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.common.habitica.api.HostConfig
 import com.viewpagerindicator.IconPagerAdapter
-import io.reactivex.rxjava3.core.BackpressureStrategy
+import kotlinx.coroutines.launch
 import java.util.Calendar
 import java.util.Locale
 import javax.inject.Inject
@@ -62,15 +64,19 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         return R.layout.activity_setup
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivitySetupBinding.inflate(layoutInflater)
         return binding.root
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        compositeSubscription.add(userRepository.getUserFlowable().subscribe({ this.onUserReceived(it) }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(userRepository.retrieveUser().subscribe({}, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser().collect { onUserReceived(it) }
+        }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+        }
         val additionalData = HashMap<String, Any>()
         additionalData["status"] = "displayed"
         AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
@@ -78,10 +84,9 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         val currentDeviceLanguage = Locale.getDefault().language
         for (language in resources.getStringArray(R.array.LanguageValues)) {
             if (language == currentDeviceLanguage) {
-                compositeSubscription.add(
+                lifecycleScope.launchCatching {
                     apiClient.registrationLanguage(currentDeviceLanguage)
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
-                )
+                }
             }
         }
 
@@ -135,7 +140,9 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             this.completedSetup = true
             createdTasks = true
             newTasks?.let {
-                this.taskRepository.createTasks(it).subscribe({ onUserReceived(user) }, RxErrorHandler.handleEmptyError())
+                lifecycleScope.launchCatching {
+                    taskRepository.createTasks(it)
+                }
             }
         } else if (binding.viewPager.currentItem == 0) {
 
@@ -203,17 +210,10 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             additionalData["status"] = "completed"
             AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
 
-            compositeSubscription.add(
-                userRepository.updateUser("flags.welcomed", true).subscribe(
-                    {
-                        if (!compositeSubscription.isDisposed) {
-                            compositeSubscription.dispose()
-                        }
-                        startMainActivity()
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-            )
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.updateUser("flags.welcomed", true)
+                startMainActivity()
+            }
             return
         }
         this.user = user
@@ -232,11 +232,10 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     }
 
     private fun confirmNames(displayName: String, username: String) {
-        compositeSubscription.add(
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             userRepository.updateUser("profile.name", displayName)
-                .flatMap { userRepository.updateLoginName(username).toFlowable() }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+            userRepository.updateLoginName(username)
+        }
     }
 
     private inner class ViewPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
@@ -260,9 +259,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
                 else -> {
                     val fragment = WelcomeFragment()
                     welcomeFragment = fragment
-                    welcomeFragment?.nameValidEvents?.toFlowable(BackpressureStrategy.DROP)?.subscribe {
-                        setNextButtonEnabled(it)
-                    }
+                    welcomeFragment?.onNameValid = { setNextButtonEnabled(it == true) }
                     fragment
                 }
             }
@@ -283,9 +280,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
                 }
                 is WelcomeFragment -> {
                     welcomeFragment = item
-                    item.nameValidEvents.toFlowable(BackpressureStrategy.DROP).subscribe {
-                        setNextButtonEnabled(it)
-                    }
+                    item.onNameValid = { setNextButtonEnabled(it == true) }
                 }
             }
             return 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 83dc310d1..1fe0effb4 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
@@ -10,9 +10,13 @@ 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.ActivitySkillMembersBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -33,7 +37,7 @@ class SkillMemberActivity : BaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivitySkillMembersBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -47,23 +51,22 @@ class SkillMemberActivity : BaseActivity() {
     private fun loadMemberList() {
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
         viewAdapter = PartyMemberRecyclerViewAdapter()
-        viewAdapter?.getUserClickedEvents()?.subscribe(
-            { userId ->
+        viewAdapter?.onUserClicked = {
+            lifecycleScope.launchCatching {
                 val resultIntent = Intent()
-                resultIntent.putExtra("member_id", userId)
+                resultIntent.putExtra("member_id", it)
                 setResult(Activity.RESULT_OK, resultIntent)
                 finish()
-            },
-            RxErrorHandler.handleEmptyError()
-        )?.let { compositeSubscription.add(it) }
+            }
+        }
         binding.recyclerView.adapter = viewAdapter
 
-        val user = userViewModel.user.value
-        lifecycleScope.launch {
-            socialRepository.getGroupMembers(user?.party?.id ?: "")
-                .collect {
-                    viewAdapter?.data = it
-                }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .map { it?.party?.id }
+                .filterNotNull()
+                .flatMapLatest { socialRepository.getPartyMembers(it) }
+                .collect { viewAdapter?.data = it }
         }
     }
 }
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 013153777..caa7afae3 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
@@ -13,11 +13,10 @@ 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.shared.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment
+import com.habitrpg.shared.habitica.models.tasks.TaskType
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -41,7 +40,7 @@ class SkillTasksActivity : BaseActivity() {
         loadTaskLists()
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivitySkillTasksBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -60,7 +59,9 @@ class SkillTasksActivity : BaseActivity() {
                     1 -> TaskType.DAILY
                     else -> TaskType.TODO
                 }
-                compositeSubscription.add(fragment.getTaskSelectionEvents().subscribe({ task -> taskSelected(task) }, RxErrorHandler.handleEmptyError()))
+                fragment.onTaskSelection = {
+                        taskSelected(it)
+                }
                 viewFragmentsDictionary.put(position, fragment)
                 return fragment
             }
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 42e13b8b6..210c6c941 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
@@ -4,8 +4,8 @@ import android.app.Activity
 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.Build
 import android.os.Bundle
 import android.os.Handler
 import android.view.Menu
@@ -15,57 +15,126 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.CheckBox
-import android.widget.TextView
+import androidx.activity.viewModels
 import androidx.appcompat.widget.AppCompatCheckBox
-import androidx.core.content.ContextCompat
+import androidx.compose.animation.animateColor
+import androidx.compose.animation.core.FastOutLinearInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.animation.fadeIn
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.toMutableStateList
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.core.os.bundleOf
 import androidx.core.view.children
 import androidx.core.view.forEachIndexed
 import androidx.core.widget.NestedScrollView
+import androidx.lifecycle.lifecycleScope
 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.TagRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 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.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.android.habitica.helpers.launchCatching
+import com.habitrpg.android.habitica.models.Assignable
 import com.habitrpg.android.habitica.models.Tag
+import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskGroupPlan
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.viewmodels.TaskFormViewModel
+import com.habitrpg.android.habitica.ui.views.CompletedAt
+import com.habitrpg.android.habitica.ui.views.UserRow
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.showAsBottomSheet
+import com.habitrpg.android.habitica.ui.views.tasks.form.HabitScoringSelector
+import com.habitrpg.android.habitica.ui.views.tasks.form.LabeledValue
+import com.habitrpg.android.habitica.ui.views.tasks.form.TaskDifficultySelector
+import com.habitrpg.android.habitica.ui.views.tasks.form.TaskFormSelector
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.shared.habitica.models.tasks.Attribute
 import com.habitrpg.shared.habitica.models.tasks.Frequency
 import com.habitrpg.shared.habitica.models.tasks.HabitResetOption
+import com.habitrpg.shared.habitica.models.tasks.TaskDifficulty
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import io.realm.RealmList
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import java.util.Date
 import javax.inject.Inject
 
 class TaskFormActivity : BaseActivity() {
 
+    private val viewModel: TaskFormViewModel by viewModels()
+
     private lateinit var binding: ActivityTaskFormBinding
     private var userScrolled: Boolean = false
     private var isSaving: Boolean = false
+
     @Inject
     lateinit var taskRepository: TaskRepository
+
     @Inject
     lateinit var tagRepository: TagRepository
+
     @Inject
     lateinit var taskAlarmManager: TaskAlarmManager
+
     @Inject
     lateinit var challengeRepository: ChallengeRepository
+
     @Inject
     lateinit var sharedPreferences: SharedPreferences
+
     @Inject
     lateinit var userViewModel: MainUserViewModel
 
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
     private var challenge: Challenge? = null
 
     private var isCreating = true
@@ -75,13 +144,12 @@ class TaskFormActivity : BaseActivity() {
     private var initialTaskInstance: Task? = null
     private var taskType: TaskType = TaskType.HABIT
     private var tags = listOf<Tag>()
+    private var groupID: String? = null
+    private var groupMembers = listOf<Member>()
+    private var assignedIDs = mutableStateListOf<String>()
+    private var taskCompletedMap = mutableStateMapOf<String, Date>()
     private var preselectedTags: ArrayList<String>? = null
     private var hasPreselectedTags = false
-    private var selectedStat = Attribute.STRENGTH
-        set(value) {
-            field = value
-            setSelectedAttribute(value)
-        }
 
     private var isDiscardCancelled: Boolean = false
     private var canSave: Boolean = false
@@ -89,9 +157,6 @@ class TaskFormActivity : BaseActivity() {
     private var tintColor: Int = 0
         set(value) {
             field = value
-            binding.taskDifficultyButtons.tintColor = value
-            binding.habitScoringButtons.tintColor = value
-            binding.habitResetStreakButtons.tintColor = value
             binding.taskSchedulingControls.tintColor = value
             updateTagViewsColors()
         }
@@ -100,7 +165,7 @@ class TaskFormActivity : BaseActivity() {
         return R.layout.activity_task_form
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityTaskFormBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -114,6 +179,7 @@ class TaskFormActivity : BaseActivity() {
         val bundle = intent.extras ?: return
 
         val taskId = bundle.getString(TASK_ID_KEY)
+        groupID = bundle.getString(GROUP_ID_KEY)
         forcedIsNight = false
         forcedTheme = if (taskId != null) {
             val taskValue = bundle.getDouble(TASK_VALUE_KEY)
@@ -131,19 +197,12 @@ class TaskFormActivity : BaseActivity() {
         }
         super.onCreate(savedInstanceState)
 
-        if (forcedTheme == "yellow") {
-            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(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
         tintColor = getThemeColor(R.attr.taskFormTint)
-        val upperTintColor = if (forcedTheme == "taskform") 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))
         binding.upperTextWrapper.setBackgroundColor(upperTintColor)
 
@@ -152,19 +211,17 @@ class TaskFormActivity : BaseActivity() {
         taskType = TaskType.from(bundle.getString(TASK_TYPE_KEY)) ?: TaskType.HABIT
         preselectedTags = bundle.getStringArrayList(SELECTED_TAGS_KEY)
 
-        compositeSubscription.add(
+        lifecycleScope.launchCatching {
             tagRepository.getTags()
                 .map { tagRepository.getUnmanagedCopy(it) }
-                .subscribe(
-                    {
-                        tags = it
-                        setTagViews()
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+                .collect {
+                    tags = it
+                    setTagViews()
+                }
+        }
         userViewModel.user.observe(this) {
-            usesTaskAttributeStats = it?.preferences?.allocationMode == "taskbased" && it.preferences?.automaticAllocation == true
+            usesTaskAttributeStats =
+                it?.preferences?.allocationMode == "taskbased" && it.preferences?.automaticAllocation == true
             configureForm()
         }
 
@@ -180,12 +237,9 @@ class TaskFormActivity : BaseActivity() {
         binding.notesEditText.onFocusChangeListener = View.OnFocusChangeListener { _, isFocused ->
             binding.notesInputLayout.alpha = if (isFocused) 0.8f else 0.6f
         }
-        binding.statStrengthButton.setOnClickListener { selectedStat = Attribute.STRENGTH }
-        binding.statIntelligenceButton.setOnClickListener { selectedStat = Attribute.INTELLIGENCE }
-        binding.statConstitutionButton.setOnClickListener { selectedStat = Attribute.CONSTITUTION }
-        binding.statPerceptionButton.setOnClickListener { selectedStat = Attribute.PERCEPTION }
         binding.scrollView.setOnTouchListener { view, event ->
-            userScrolled = view == binding.scrollView && (event.action == MotionEvent.ACTION_SCROLL || event.action == MotionEvent.ACTION_MOVE)
+            userScrolled =
+                view == binding.scrollView && (event.action == MotionEvent.ACTION_SCROLL || event.action == MotionEvent.ACTION_MOVE)
             return@setOnTouchListener false
         }
         binding.scrollView.setOnScrollChangeListener { _: NestedScrollView?, _: Int, _: Int, _: Int, _: Int ->
@@ -194,40 +248,67 @@ class TaskFormActivity : BaseActivity() {
             }
         }
 
+        if (groupID != null) {
+            binding.assignView.setContent {
+                HabiticaTheme {
+                    AssignedView(
+                        groupMembers.filter { assignedIDs.contains(it.id) },
+                        taskCompletedMap,
+                        task?.extraExtraLightTaskColor?.let { colorResource(it) } ?: Color(
+                            getThemeColor(R.attr.colorTintedBackgroundOffset)
+                        ),
+                        colorResource(task?.darkestTaskColor ?: R.color.text_primary),
+                        {
+                            showAssignDialog()
+                        },
+                        showEditButton = true
+                    )
+                }
+            }
+
+            lifecycleScope.launchCatching {
+                socialRepository.getGroupMembers(groupID ?: "").collect {
+                    groupMembers = it
+                }
+            }
+        } else {
+            binding.assignTitleView.visibility = View.GONE
+            binding.assignView.visibility = View.GONE
+        }
+
         title = ""
         when {
             taskId != null -> {
                 isCreating = false
-                compositeSubscription.add(
-                    taskRepository.getUnmanagedTask(taskId).firstElement().subscribe(
-                        {
-                            if (!it.isValid) return@subscribe
-                            task = it
-                            initialTaskInstance = it
-                            // tintColor = ContextCompat.getColor(this, it.mediumTaskColor)
-                            fillForm(it)
-                            it.challengeID?.let { challengeID ->
-                                compositeSubscription.add(
-                                    challengeRepository.retrieveChallenge(challengeID)
-                                        .subscribe(
-                                            { challenge ->
-                                                this.challenge = challenge
-                                                binding.challengeNameView.text = getString(R.string.challenge_task_name, challenge.name)
-                                                binding.challengeNameView.visibility = View.VISIBLE
-                                                disableEditingForUneditableFieldsInChallengeTask()
-                                            },
-                                            RxErrorHandler.handleEmptyError()
-                                        )
-                                )
-                            }
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-                )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val task =
+                        taskRepository.getUnmanagedTask(taskId).firstOrNull() ?: return@launch
+                    if (!task.isValid) return@launch
+                    this@TaskFormActivity.task = task
+                    initialTaskInstance = task
+                    // tintColor = ContextCompat.getColor(this, it.mediumTaskColor)
+                    fillForm(task)
+                    task.challengeID?.let { challengeID ->
+                        lifecycleScope.launchCatching {
+                            val challenge = challengeRepository.retrieveChallenge(challengeID)
+                                ?: return@launchCatching
+                            this@TaskFormActivity.challenge = challenge
+                            binding.challengeNameView.text =
+                                getString(R.string.challenge_task_name, challenge.name)
+                            binding.challengeNameView.visibility = View.VISIBLE
+                            disableEditingForUneditableFieldsInChallengeTask()
+                        }
+                    }
+                }
             }
             bundle.containsKey(PARCELABLE_TASK) -> {
                 isCreating = false
-                task = bundle.getParcelable(PARCELABLE_TASK)
+                task = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    bundle.getParcelable(PARCELABLE_TASK, Task::class.java)
+                } else {
+                    @Suppress("DEPRECATION")
+                    bundle.getParcelable(PARCELABLE_TASK)
+                }
                 task?.let { fillForm(it) }
             }
             else -> {
@@ -245,12 +326,58 @@ class TaskFormActivity : BaseActivity() {
                 initialTaskInstance = configureTask(Task())
             }
         }
+
+        binding.taskDifficultyButtons.setContent {
+            HabiticaTheme {
+                TaskDifficultySelector(
+                    viewModel.taskDifficulty.value,
+                    onSelect = { viewModel.taskDifficulty.value = it })
+            }
+        }
+
+        if (taskType == TaskType.HABIT) {
+            binding.habitScoringButtons.setContent {
+                HabiticaTheme {
+                    HabitScoringSelector(
+                        viewModel.habitScoringPositive.value,
+                        viewModel.habitScoringNegative.value,
+                        { viewModel.habitScoringPositive.value = !viewModel.habitScoringPositive.value },
+                        { viewModel.habitScoringNegative.value = !viewModel.habitScoringNegative.value })
+                }
+            }
+
+            binding.habitResetStreakButtons.setContent {
+                HabiticaTheme {
+                    TaskFormSelector(
+                        viewModel.habitResetOption.value, listOf(
+                            LabeledValue(getString(R.string.repeat_daily), HabitResetOption.DAILY),
+                            LabeledValue(getString(R.string.weekly), HabitResetOption.WEEKLY),
+                            LabeledValue(getString(R.string.monthly), HabitResetOption.MONTHLY)
+                        ), { viewModel.habitResetOption.value = it }, columnSize = 3
+                    )
+                }
+            }
+        }
+
+
+        binding.statsSelector.setContent {
+            HabiticaTheme {
+                TaskFormSelector(viewModel.selectedAttribute.value, listOf(
+                    LabeledValue(getString(R.string.strength), Attribute.STRENGTH),
+                    LabeledValue(getString(R.string.constitution), Attribute.CONSTITUTION),
+                    LabeledValue(getString(R.string.intelligence), Attribute.INTELLIGENCE),
+                    LabeledValue(getString(R.string.perception), Attribute.PERCEPTION)
+                ), { viewModel.selectedAttribute.value = it })
+            }
+        }
+
         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)
+        val upperTintColor =
+            if (forcedTheme == "taskform") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
         window.statusBarColor = upperTintColor
     }
 
@@ -276,8 +403,8 @@ class TaskFormActivity : BaseActivity() {
                 alert.dismiss()
             }
             alert.setOnDismissListener {
-                    isDiscardCancelled = true
-                }
+                isDiscardCancelled = true
+            }
             alert.show()
         } else {
             super.onBackPressed()
@@ -316,13 +443,11 @@ class TaskFormActivity : BaseActivity() {
         binding.habitScoringButtons.visibility = habitViewsVisibility
         binding.habitResetStreakTitleView.visibility = habitViewsVisibility
         binding.habitResetStreakButtons.visibility = habitViewsVisibility
-        (binding.habitAdjustNegativeStreakView.parent as ViewGroup).visibility = habitViewsVisibility
-        if (taskType == TaskType.HABIT) {
-            binding.habitScoringButtons.isPositive = true
-            binding.habitScoringButtons.isNegative = false
-        }
+        (binding.habitAdjustNegativeStreakView.parent as ViewGroup).visibility =
+            habitViewsVisibility
 
-        val habitDailyVisibility = if (taskType == TaskType.DAILY || taskType == TaskType.HABIT) View.VISIBLE else View.GONE
+        val habitDailyVisibility =
+            if (taskType == TaskType.DAILY || taskType == TaskType.HABIT) View.VISIBLE else View.GONE
         binding.adjustStreakTitleView.visibility = habitDailyVisibility
         binding.adjustStreakWrapper.visibility = habitDailyVisibility
         if (taskType == TaskType.HABIT) {
@@ -333,13 +458,18 @@ class TaskFormActivity : BaseActivity() {
             binding.adjustStreakTitleView.text = getString(R.string.adjust_streak)
         }
 
-        val todoDailyViewsVisibility = if (taskType == TaskType.DAILY || taskType == TaskType.TODO) View.VISIBLE else View.GONE
+        val todoDailyViewsVisibility =
+            if (taskType == TaskType.DAILY || taskType == TaskType.TODO) View.VISIBLE else View.GONE
 
-        binding.checklistTitleView.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
-        binding.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
 
-        binding.remindersTitleView.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
-        binding.remindersContainer.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
+        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
 
@@ -363,6 +493,11 @@ class TaskFormActivity : BaseActivity() {
         if (isCreating) {
             binding.adjustStreakTitleView.visibility = View.GONE
             binding.adjustStreakWrapper.visibility = View.GONE
+
+            if (groupID != null) {
+                binding.habitResetStreakTitleView.visibility = View.GONE
+                binding.habitResetStreakButtons.visibility = View.GONE
+            }
         }
     }
 
@@ -373,6 +508,7 @@ class TaskFormActivity : BaseActivity() {
             val view = CheckBox(this)
             view.setPadding(padding, view.paddingTop, view.paddingRight, view.paddingBottom)
             view.text = tag.name
+            view.setTextColor(getThemeColor(R.attr.colorPrimaryDark))
             if (preselectedTags?.contains(tag.id) == true) {
                 view.isChecked = true
             }
@@ -400,18 +536,21 @@ class TaskFormActivity : BaseActivity() {
         canSave = true
         binding.textEditText.setText(task.text)
         binding.notesEditText.setText(task.notes)
-        binding.taskDifficultyButtons.selectedDifficulty = task.priority
+        viewModel.taskDifficulty.value = TaskDifficulty.valueOf(task.priority)
         when (taskType) {
             TaskType.HABIT -> {
-                binding.habitScoringButtons.isPositive = task.up ?: false
-                binding.habitScoringButtons.isNegative = task.down ?: false
+                viewModel.habitScoringPositive.value = task.up ?: false
+                viewModel.habitScoringNegative.value = task.down ?: false
                 task.frequency?.let {
-                    binding.habitResetStreakButtons.selectedResetOption = HabitResetOption.from(it) ?: HabitResetOption.DAILY
+                    viewModel.habitResetOption.value =
+                        HabitResetOption.from(it) ?: HabitResetOption.DAILY
                 }
                 binding.habitAdjustPositiveStreakView.setText((task.counterUp ?: 0).toString())
                 binding.habitAdjustNegativeStreakView.setText((task.counterDown ?: 0).toString())
-                (binding.habitAdjustPositiveStreakView.parent as ViewGroup).visibility = if (task.up == true) View.VISIBLE else View.GONE
-                (binding.habitAdjustNegativeStreakView.parent as ViewGroup).visibility = if (task.down == true) View.VISIBLE else View.GONE
+                (binding.habitAdjustPositiveStreakView.parent as ViewGroup).visibility =
+                    if (task.up == true) View.VISIBLE else View.GONE
+                (binding.habitAdjustNegativeStreakView.parent as ViewGroup).visibility =
+                    if (task.down == true) View.VISIBLE else View.GONE
                 if (task.up != true && task.down != true) {
                     binding.adjustStreakTitleView.visibility = View.GONE
                     binding.adjustStreakWrapper.visibility = View.GONE
@@ -434,27 +573,26 @@ class TaskFormActivity : BaseActivity() {
             binding.remindersContainer.taskType = taskType
             task.reminders?.let { binding.remindersContainer.reminders = it }
         }
-        task.attribute?.let { selectedStat = it }
-        setAllTagSelections()
-    }
+        task.attribute?.let { viewModel.selectedAttribute.value = it }
 
-    private fun setSelectedAttribute(attributeName: Attribute) {
-        if (!usesTaskAttributeStats) return
-        configureStatsButton(binding.statStrengthButton, attributeName == Attribute.STRENGTH)
-        configureStatsButton(binding.statIntelligenceButton, attributeName == Attribute.INTELLIGENCE)
-        configureStatsButton(binding.statConstitutionButton, attributeName == Attribute.CONSTITUTION)
-        configureStatsButton(binding.statPerceptionButton, attributeName == Attribute.PERCEPTION)
-    }
+        if (task.isGroupTask) {
+            (binding.habitAdjustPositiveStreakView.parent as ViewGroup).visibility = View.GONE
+            (binding.habitAdjustNegativeStreakView.parent as ViewGroup).visibility = View.GONE
+            binding.statWrapper.visibility = View.GONE
+            binding.habitResetStreakTitleView.visibility = View.GONE
+            binding.habitResetStreakButtons.visibility = View.GONE
 
-    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.window_background else R.color.text_secondary
-        button.setTextColor(ContextCompat.getColor(this, textColorID))
-        if (isSelected) {
-            button.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
-        } else {
-            button.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
+            assignedIDs =
+                task.group?.assignedUsersDetail?.map { it.assignedUserID }?.filterNotNull()
+                    ?.toMutableStateList() ?: mutableStateListOf()
+            task.group?.assignedUsersDetail?.forEach {
+                it.completedDate?.let { date ->
+                    taskCompletedMap[it.assignedUserID ?: ""] = date
+                }
+            }
         }
+
+        setAllTagSelections()
     }
 
     private fun updateTagViewsColors() {
@@ -465,7 +603,7 @@ class TaskFormActivity : BaseActivity() {
                     intArrayOf(-android.R.attr.state_checked), // unchecked
                     intArrayOf(android.R.attr.state_checked) // checked
                 ),
-                intArrayOf(ContextCompat.getColor(this, R.color.text_dimmed), tintColor)
+                intArrayOf(getThemeColor(R.attr.colorTintedBackgroundOffset), tintColor)
             )
             tagView?.buttonTintList = colorStateList
         }
@@ -477,14 +615,14 @@ class TaskFormActivity : BaseActivity() {
 
         thisTask.text = binding.textEditText.text.toString()
         thisTask.notes = binding.notesEditText.text.toString()
-        thisTask.priority = binding.taskDifficultyButtons.selectedDifficulty
+        thisTask.priority = viewModel.taskDifficulty.value.value
         if (usesTaskAttributeStats) {
-            thisTask.attribute = selectedStat
+            thisTask.attribute = viewModel.selectedAttribute.value
         }
         if (taskType == TaskType.HABIT) {
-            thisTask.up = binding.habitScoringButtons.isPositive
-            thisTask.down = binding.habitScoringButtons.isNegative
-            thisTask.frequency = binding.habitResetStreakButtons.selectedResetOption.value
+            thisTask.up = viewModel.habitScoringPositive.value
+            thisTask.down = viewModel.habitScoringNegative.value
+            thisTask.frequency = viewModel.habitResetOption.value.value
             if (binding.habitAdjustPositiveStreakView.text?.isNotEmpty() == true) thisTask.counterUp =
                 binding.habitAdjustPositiveStreakView.text.toString().toIntCatchOverflow()
             if (binding.habitAdjustNegativeStreakView.text?.isNotEmpty() == true) thisTask.counterDown =
@@ -519,6 +657,13 @@ class TaskFormActivity : BaseActivity() {
             }
         }
 
+        if (groupID != null) {
+            if (thisTask.group?.groupID != groupID) {
+                thisTask.group = TaskGroupPlan()
+                thisTask.group?.groupID = groupID
+            }
+        }
+
         return thisTask
     }
 
@@ -540,17 +685,32 @@ class TaskFormActivity : BaseActivity() {
 
         val resultIntent = Intent()
         resultIntent.putExtra(TASK_TYPE_KEY, taskType.value)
+
+        val assignChanges = mapOf(
+            "assign" to mutableListOf<String>(),
+            "unassign" to mutableListOf<String>()
+        )
+        if (thisTask.isGroupTask) {
+            for (id in assignedIDs) {
+                if (thisTask.group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == id } == null) {
+                    assignChanges["assign"]?.add(id)
+                }
+            }
+            for (details in thisTask.group?.assignedUsersDetail ?: listOf()) {
+                if (assignedIDs.firstOrNull { it == details.assignedUserID } == null) {
+                    details.assignedUserID?.let { assignChanges["unassign"]?.add(it) }
+                }
+            }
+        }
+
         if (!isChallengeTask) {
             if (isCreating) {
-                if (isDiscardCancelled) {
-                    analyticsManager.logEvent("back_to_task", bundleOf(Pair("is_creating", isCreating)))
-                }
-                taskRepository.createTaskInBackground(thisTask)
+                taskRepository.createTaskInBackground(thisTask, assignChanges)
             } else {
-                if (isDiscardCancelled) {
-                    analyticsManager.logEvent("back_to_task", bundleOf(Pair("is_creating", isCreating)))
-                }
-                taskRepository.updateTaskInBackground(thisTask)
+                taskRepository.updateTaskInBackground(thisTask, assignChanges)
+            }
+            if (isDiscardCancelled) {
+                analyticsManager.logEvent("back_to_task", bundleOf(Pair("is_creating", isCreating)))
             }
 
             if (thisTask.type == TaskType.DAILY || thisTask.type == TaskType.TODO) {
@@ -582,7 +742,11 @@ 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({ }, RxErrorHandler.handleEmptyError()) }
+            task?.id?.let {
+                lifecycleScope.launchCatching {
+                    taskRepository.deleteTask(it)
+                }
+            }
             finish()
         }
         alert.addCancelButton()
@@ -590,48 +754,47 @@ class TaskFormActivity : BaseActivity() {
     }
 
     private fun showChallengeDeleteTask() {
-        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))
-                    alert.setMessage(getString(R.string.delete_challenge_task_description, taskCount, challenge?.name ?: ""))
-                    alert.addButton(R.string.leave_delete_task, isPrimary = true, isDestructive = true) { _, _ ->
-                        challenge?.let {
-                            compositeSubscription.add(
-                                challengeRepository.leaveChallenge(it, "keep-all")
-                                    .flatMap { taskRepository.deleteTask(task?.id ?: "") }
-                                    .flatMap { userRepository.retrieveUser(true, true) }
-                                    .subscribe(
-                                        {
-                                            finish()
-                                        },
-                                        RxErrorHandler.handleEmptyError()
-                                    )
-                            )
-                        }
-                    }
-                    alert.addButton(getString(R.string.leave_delete_x_tasks, taskCount), isPrimary = false, isDestructive = true) { _, _ ->
-                        challenge?.let {
-                            compositeSubscription.add(
-                                challengeRepository.leaveChallenge(it, "remove-all")
-                                    .flatMap { userRepository.retrieveUser(true, true) }
-                                    .subscribe(
-                                        {
-                                            finish()
-                                        },
-                                        RxErrorHandler.handleEmptyError()
-                                    )
-                            )
-                        }
-                    }
-                    alert.setExtraCloseButtonVisibility(View.VISIBLE)
-                    alert.show()
-                },
-                RxErrorHandler.handleEmptyError()
+        lifecycleScope.launchCatching {
+            val tasks = taskRepository.getTasksForChallenge(task?.challengeID).firstOrNull()
+                ?: return@launchCatching
+            val taskCount = tasks.size
+            val alert = HabiticaAlertDialog(this@TaskFormActivity)
+            alert.setTitle(getString(R.string.delete_challenge_task_title))
+            alert.setMessage(
+                getString(
+                    R.string.delete_challenge_task_description,
+                    taskCount,
+                    challenge?.name ?: ""
+                )
             )
-        )
+            alert.addButton(
+                R.string.leave_delete_task,
+                isPrimary = true,
+                isDestructive = true
+            ) { _, _ ->
+                challenge?.let {
+                    lifecycleScope.launchCatching {
+                        challengeRepository.leaveChallenge(it, "keep-all")
+                        taskRepository.deleteTask(task?.id ?: "")
+                        userRepository.retrieveUser(true, true)
+                    }
+                }
+            }
+            alert.addButton(
+                getString(R.string.leave_delete_x_tasks, taskCount),
+                isPrimary = false,
+                isDestructive = true
+            ) { _, _ ->
+                challenge?.let {
+                    lifecycleScope.launchCatching {
+                        challengeRepository.leaveChallenge(it, "remove-all")
+                        userRepository.retrieveUser(true, true)
+                    }
+                }
+            }
+            alert.setExtraCloseButtonVisibility(View.VISIBLE)
+            alert.show()
+        }
     }
 
     private fun showBrokenChallengeDialog() {
@@ -639,39 +802,41 @@ class TaskFormActivity : BaseActivity() {
         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")
-                            .flatMap { userRepository.retrieveUser(true, true) }
-                            .subscribe(
-                                {
-                                    finish()
-                                },
-                                RxErrorHandler.handleEmptyError()
-                            )
-                    }
-                    dialog.addButton(this.getString(R.string.delete_x_tasks, taskCount), false, true) { _, _ ->
-                        taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
-                            .flatMap { userRepository.retrieveUser(true, true) }
-                            .subscribe(
-                                {
-                                    finish()
-                                },
-                                RxErrorHandler.handleEmptyError()
-                            )
-                    }
-                    dialog.setExtraCloseButtonVisibility(View.VISIBLE)
-                    dialog.show()
-                },
-                RxErrorHandler.handleEmptyError()
+        lifecycleScope.launchCatching {
+            val tasks = taskRepository.getTasksForChallenge(task.challengeID).firstOrNull()
+                ?: return@launchCatching
+            val taskCount = tasks.size
+            val dialog = HabiticaAlertDialog(this@TaskFormActivity)
+            dialog.setTitle(R.string.broken_challenge)
+            dialog.setMessage(
+                getString(
+                    R.string.broken_challenge_description,
+                    taskCount
+                )
             )
-        )
+            dialog.addButton(
+                getString(R.string.keep_x_tasks, taskCount),
+                true
+            ) { _, _ ->
+                lifecycleScope.launchCatching {
+                    taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
+                    userRepository.retrieveUser(true, true)
+                }
+            }
+            dialog.addButton(
+                getString(R.string.delete_x_tasks, taskCount),
+                false,
+                true
+            ) { _, _ ->
+                lifecycleScope.launchCatching {
+
+                    taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
+                    userRepository.retrieveUser(true, true)
+                }
+            }
+            dialog.setExtraCloseButtonVisibility(View.VISIBLE)
+            dialog.show()
+        }
     }
 
     private fun disableEditingForUneditableFieldsInChallengeTask() {
@@ -686,9 +851,26 @@ class TaskFormActivity : BaseActivity() {
         super.finish()
     }
 
+    private fun showAssignDialog() {
+        showAsBottomSheet {
+            AssignSheet(
+                groupMembers,
+                assignedIDs,
+                {
+                    if (assignedIDs.contains(it)) {
+                        assignedIDs.remove(it)
+                    } else {
+                        assignedIDs.add(it)
+                    }
+                }
+            )
+        }
+    }
+
     companion object {
         const val SELECTED_TAGS_KEY = "selectedTags"
         const val TASK_ID_KEY = "taskId"
+        const val GROUP_ID_KEY = "groupId"
         const val TASK_VALUE_KEY = "taskValue"
         const val USER_ID_KEY = "userId"
         const val TASK_TYPE_KEY = "type"
@@ -708,3 +890,152 @@ private fun String.toIntCatchOverflow(): Int? {
         0
     }
 }
+
+@Composable
+fun AssignedView(
+    assigned: List<Assignable>,
+    completedAt: Map<String, Date>,
+    backgroundColor: Color,
+    color: Color,
+    onEditClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    showEditButton: Boolean = false
+) {
+    Column(modifier.fillMaxWidth()) {
+        val rowModifier = Modifier
+            .padding(vertical = 4.dp)
+            .background(
+                backgroundColor,
+                MaterialTheme.shapes.medium
+            )
+            .padding(15.dp, 12.dp)
+            .heightIn(min = 24.dp)
+            .fillMaxWidth()
+        for (assignable in assigned) {
+            UserRow(
+                username = assignable.identifiableName, modifier = rowModifier,
+                color = color,
+                extraContent = {
+                    completedAt[assignable.id]?.let { CompletedAt(completedAt = it) }
+                }
+            )
+        }
+        if (showEditButton) {
+            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier
+                .clickable {
+                    onEditClick()
+                }
+                .padding(vertical = 4.dp)
+                .background(
+                    backgroundColor,
+                    MaterialTheme.shapes.medium
+                )
+                .padding(15.dp, 12.dp)
+                .heightIn(min = 24.dp)
+                .fillMaxWidth()) {
+                Image(
+                    painterResource(R.drawable.edit),
+                    null,
+                    colorFilter = ColorFilter.tint(MaterialTheme.colors.primary)
+                )
+                Text(
+                    stringResource(R.string.edit_assignees), color = color,
+                    modifier = Modifier.padding(start = 4.dp)
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun AssignSheet(
+    members: List<Member>,
+    assignedMembers: List<String>,
+    onAssignClick: (String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Column(modifier) {
+        Box {
+            Text(
+                stringResource(R.string.assign_to),
+                fontSize = 16.sp,
+                fontWeight = FontWeight.Medium,
+                color = colorResource(R.color.gray_200),
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 8.dp)
+            )
+            TextButton(
+                onClick = {
+
+                },
+                colors = ButtonDefaults.textButtonColors(),
+                modifier = Modifier.align(Alignment.CenterEnd)
+            ) {
+                Text(stringResource(R.string.done))
+            }
+        }
+        for (member in members) {
+            val isAssigned = assignedMembers.contains(member.id)
+            val transition = updateTransition(isAssigned, label = "isAssigned")
+            val rotation = transition.animateFloat(
+                label = "isAssigned",
+                transitionSpec = { spring(Spring.DampingRatioLowBouncy, Spring.StiffnessLow) }) {
+                if (it) 0f else 45f
+            }
+            val backgroundColor = transition.animateColor(
+                label = "isAssigned",
+                transitionSpec = { tween(400, easing = FastOutLinearInEasing) }) {
+                if (it) MaterialTheme.colors.primary else colorResource(id = R.color.transparent)
+            }
+            val color = transition.animateColor(
+                label = "isAssigned",
+                transitionSpec = { tween(400, easing = FastOutLinearInEasing) }) {
+                fadeIn(tween(10000))
+                colorResource(if (it) R.color.white else R.color.text_dimmed)
+            }
+            val borderColor = transition.animateColor(
+                label = "isAssigned",
+                transitionSpec = { tween(400, easing = FastOutLinearInEasing) }) {
+                fadeIn(tween(10000))
+                if (it) MaterialTheme.colors.primary else colorResource(id = R.color.text_dimmed)
+            }
+            UserRow(
+                username = member.displayName,
+                color = colorResource(R.color.text_primary),
+                extraContent = {
+                    Text(
+                        member.formattedUsername ?: "",
+                        color = colorResource(R.color.text_ternary)
+                    )
+                }, endContent = {
+                    Image(
+                        painterResource(R.drawable.ic_close_white_24dp),
+                        null,
+                        colorFilter = ColorFilter.tint(color.value),
+                        modifier = Modifier
+                            .rotate(rotation.value)
+                            .size(24.dp)
+                            .background(
+                                backgroundColor.value,
+                                CircleShape
+                            )
+                            .border(
+                                2.dp,
+                                borderColor.value,
+                                CircleShape
+                            )
+                            .padding(3.dp)
+                    )
+                }, modifier = Modifier
+                    .clickable {
+                        member.id?.let { onAssignClick(it) }
+                    }
+                    .padding(30.dp, 12.dp)
+                    .heightIn(min = 24.dp)
+                    .fillMaxWidth()
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt
new file mode 100644
index 000000000..b8d9cd0e5
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt
@@ -0,0 +1,276 @@
+package com.habitrpg.android.habitica.ui.activities
+
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.activity.viewModels
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.asLiveData
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
+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.helpers.MainNavigationController
+import com.habitrpg.android.habitica.helpers.TaskDescriptionBuilder
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
+import com.habitrpg.android.habitica.ui.viewmodels.BaseViewModel
+import com.habitrpg.android.habitica.ui.views.CompletedAt
+import com.habitrpg.android.habitica.ui.views.UserRow
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import javax.inject.Inject
+
+class TaskSummaryViewModel(val taskId: String) : BaseViewModel() {
+    @Inject
+    lateinit var taskRespository: TaskRepository
+    val task = taskRespository.getTask(taskId).asLiveData()
+
+    override fun inject(component: UserComponent) {
+        component.inject(this)
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    class Factory(private val taskID: String) : ViewModelProvider.Factory {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            return TaskSummaryViewModel(taskID) as T
+        }
+    }
+}
+
+class TaskSummaryActivity : BaseActivity() {
+    override fun getLayoutResId(): Int? = null
+
+    private val viewModel: TaskSummaryViewModel by viewModels {
+        TaskSummaryViewModel.Factory(
+            intent.extras?.getString(
+                TaskFormActivity.TASK_ID_KEY
+            ) ?: ""
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            HabiticaTheme {
+                TaskSummaryView(viewModel = viewModel)
+            }
+        }
+    }
+
+    override fun injectActivity(component: UserComponent?) {
+        component?.inject(this)
+    }
+}
+
+@Composable
+fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
+    val taskDescriptionBuilder = TaskDescriptionBuilder(LocalContext.current)
+    val task by viewModel.task.observeAsState()
+    val titleModifier = Modifier.padding(top = 30.dp)
+    val textModifier = Modifier.padding(top = 4.dp)
+    if (task != null) {
+        val darkestColor = colorResource(task?.darkestTaskColor ?: R.color.text_primary)
+        val systemUiController = rememberSystemUiController()
+        val statusBarColor = colorResource(task?.lightTaskColor ?: R.color.brand_400)
+        val lightestColor = colorResource(task?.lightestTaskColor ?: R.color.window_background)
+        DisposableEffect(systemUiController) {
+            systemUiController.setStatusBarColor(statusBarColor, darkIcons = true)
+            systemUiController.setNavigationBarColor(lightestColor)
+            onDispose {}
+        }
+        Column(Modifier.background(colorResource(task?.lightTaskColor ?: R.color.brand_300))) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.padding(vertical = 2.dp)
+            ) {
+                Button(
+                    onClick = {
+                        MainNavigationController.navigateBack()
+                    },
+                    colors = ButtonDefaults.textButtonColors(contentColor = darkestColor),
+                    elevation = ButtonDefaults.elevation(0.dp, 0.dp)
+                ) {
+                    Image(
+                        painterResource(R.drawable.arrow_back),
+                        stringResource(R.string.action_back),
+                        colorFilter = ColorFilter.tint(
+                            colorResource(
+                                task?.darkestTaskColor ?: R.color.white
+                            )
+                        )
+                    )
+                }
+                Text(
+                    stringResource(R.string.task_summary),
+                    fontSize = 18.sp,
+                    fontWeight = FontWeight.Medium,
+                    color = darkestColor,
+                    modifier = Modifier.padding(start = 0.dp)
+                )
+            }
+            Column(
+                Modifier
+                    .shadow(16.dp)
+                    .background(
+                        lightestColor,
+                        RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)
+                    )
+                    .padding(20.dp, 5.dp)
+                    .fillMaxWidth()
+                    .fillMaxHeight()
+            ) {
+                Text(
+                    stringResource(R.string.title),
+                    fontSize = 16.sp,
+                    color = darkestColor,
+                    fontWeight = FontWeight.Medium,
+                    modifier = titleModifier
+                )
+                Text(
+                    task?.text ?: "", fontSize = 16.sp, color = darkestColor,
+                    fontWeight = FontWeight.Normal, modifier = textModifier
+                )
+                if (task?.notes?.isNotBlank() == true) {
+                    Text(
+                        stringResource(R.string.notes),
+                        fontSize = 16.sp,
+                        color = darkestColor,
+                        fontWeight = FontWeight.Medium,
+                        modifier = titleModifier
+                    )
+                    Text(
+                        task?.notes ?: "",
+                        fontSize = 16.sp,
+                        color = darkestColor,
+                        fontWeight = FontWeight.Normal,
+                        modifier = textModifier
+                    )
+                }
+                if (task?.type != TaskType.REWARD) {
+                    Text(
+                        stringResource(R.string.description),
+                        fontSize = 16.sp,
+                        color = darkestColor,
+                        fontWeight = FontWeight.Medium,
+                        modifier = titleModifier
+                    )
+                    Text(task?.let { taskDescriptionBuilder.describe(it) }!!.makeBoldComposable(),
+                        fontSize = 16.sp,
+                        color = darkestColor,
+                        fontWeight = FontWeight.Normal,
+                        modifier = textModifier)
+                }
+                if (task?.checklist?.isNotEmpty() == true) {
+                    task?.checklist?.let { checklist ->
+                        Text(
+                            stringResource(R.string.checklist),
+                            fontSize = 16.sp,
+                            color = darkestColor,
+                            fontWeight = FontWeight.Medium,
+                            modifier = titleModifier.padding(bottom = 4.dp)
+                        )
+                        for (item in checklist) {
+                            Text(
+                                item.text ?: "",
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.Medium,
+                                color = darkestColor,
+                                modifier = Modifier
+                                    .padding(vertical = 4.dp)
+                                    .background(
+                                        colorResource(
+                                            task?.extraExtraLightTaskColor ?: R.color.gray_700
+                                        ),
+                                        MaterialTheme.shapes.medium
+                                    )
+                                    .padding(15.dp)
+                                    .fillMaxWidth()
+                            )
+                        }
+                    }
+                }
+                if (task?.group?.assignedUsersDetail?.isNotEmpty() == true) {
+                    Text(
+                        stringResource(R.string.assigned_to),
+                        fontSize = 16.sp,
+                        color = darkestColor,
+                        fontWeight = FontWeight.Medium,
+                        modifier = titleModifier.padding(bottom = 4.dp)
+                    )
+                    for (item in task?.group?.assignedUsersDetail ?: emptyList()) {
+                        UserRow(
+                            item.assignedUsername ?: "", Modifier
+                                .padding(vertical = 4.dp)
+                                .background(
+                                    colorResource(
+                                        task?.extraExtraLightTaskColor ?: R.color.gray_700
+                                    ),
+                                    MaterialTheme.shapes.medium
+                                )
+                                .padding(15.dp, 12.dp)
+                                .heightIn(min = 24.dp)
+                                .fillMaxWidth(),
+                            color = darkestColor,
+                            extraContent = if (item.completed) ({
+                                CompletedAt(item.completedDate)
+                            }) else null
+                        )
+                    }
+                    task?.group?.assignedUsersDetail?.find { it.assignedUserID == viewModel.userViewModel.userID }?.let {
+                        Text("", )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private fun String.makeBoldComposable(): AnnotatedString {
+    return buildAnnotatedString {
+        var isBold = false
+        for (segment in split("**")) {
+            withStyle(style = SpanStyle(fontWeight = if (isBold) FontWeight.SemiBold else FontWeight.Normal)) {
+                append(segment)
+            }
+            isBold = !isBold
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun TaskSummaryViewPreview() {
+    TaskSummaryView(TaskSummaryViewModel(""))
+}
\ No newline at end of file
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
deleted file mode 100644
index 1e9845793..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.View
-import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-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.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
-import java.util.concurrent.TimeUnit
-
-class VerifyUsernameActivity : BaseActivity() {
-    private lateinit var binding: ActivityVerifyUsernameBinding
-
-    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.text_green), 1f))
-    }
-    private val alertIcon: Drawable by lazy {
-        BitmapDrawable(resources, HabiticaIconsHelper.imageOfAlertIcon())
-    }
-
-    override fun getLayoutResId(): Int {
-        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)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding.wikiTextView.movementMethod = LinkMovementMethod.getInstance()
-        binding.footerTextView.movementMethod = LinkMovementMethod.getInstance()
-
-        binding.confirmUsernameButton.setOnClickListener { confirmNames() }
-
-        binding.displayNameEditText.addTextChangedListener(
-            OnChangeTextWatcher { p0, _, _, _ ->
-                displayNameVerificationEvents.onNext(p0.toString())
-            }
-        )
-        binding.usernameEditText.addTextChangedListener(
-            OnChangeTextWatcher { p0, _, _, _ ->
-                usernameVerificationEvents.onNext(p0.toString())
-            }
-        )
-
-        compositeSubscription.add(
-            Flowable.combineLatest(
-                displayNameVerificationEvents.toFlowable(BackpressureStrategy.DROP)
-                    .map { it.length in 1..30 }
-                    .doOnNext {
-                        if (it) {
-                            binding.displayNameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
-                            binding.issuesTextView.visibility = View.GONE
-                        } else {
-                            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(binding.usernameEditText.text.toString()) }
-                    .doOnNext {
-                        if (it.isUsable) {
-                            binding.usernameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
-                            binding.issuesTextView.visibility = View.GONE
-                        } else {
-                            binding.usernameEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
-                            binding.issuesTextView.visibility = View.VISIBLE
-                            binding.issuesTextView.text = it.issues.joinToString("\n")
-                        }
-                    },
-                { displayNameUsable, usernameUsable -> displayNameUsable && usernameUsable.isUsable }
-            )
-                .subscribe(
-                    {
-                        binding.confirmUsernameButton.isEnabled = it
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
-
-        compositeSubscription.add(
-            userRepository.getUserFlowable().firstElement().subscribe {
-                binding.displayNameEditText.setText(it.profile?.name)
-                displayNameVerificationEvents.onNext(it.profile?.name ?: "")
-                binding.usernameEditText.setText(it.authentication?.localAuthentication?.username)
-                usernameVerificationEvents.onNext(it.username ?: "")
-            }
-        )
-    }
-
-    private fun confirmNames() {
-        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 { binding.confirmUsernameButton.isClickable = true }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
-    }
-
-    private fun showConfirmationAndFinish() {
-        HabiticaSnackbar.showSnackbar(binding.snackbarView, getString(R.string.username_confirmed), HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
-        runDelayed(3, TimeUnit.SECONDS) {
-            finish()
-        }
-    }
-
-    override fun onBackPressed() {
-        moveTaskToBack(true)
-    }
-}
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
deleted file mode 100644
index a1e8f30ba..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.habitrpg.android.habitica.ui.adapter
-
-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.core.content.ContextCompat
-import androidx.core.os.bundleOf
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
-import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.inventory.CustomizationSet
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.common.habitica.views.PixelArtView
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
-
-class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
-
-    var gemBalance: Int = 0
-    var equipmentList: MutableList<Equipment> =
-        ArrayList()
-        set(value) {
-                field = value
-                notifyDataSetChanged()
-            }
-    var activeEquipment: String? = null
-        set(value) {
-            field = value
-            this.notifyDataSetChanged()
-        }
-
-    private val selectCustomizationEvents = PublishSubject.create<Equipment>()
-    private val unlockCustomizationEvents = PublishSubject.create<Equipment>()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
-        val viewID: Int = R.layout.customization_grid_item
-
-        val view = LayoutInflater.from(parent.context).inflate(viewID, parent, false)
-        return EquipmentViewHolder(view)
-    }
-
-    override fun onBindViewHolder(
-        holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
-        position: Int
-    ) {
-        (holder as EquipmentViewHolder).bind(equipmentList[position])
-    }
-
-    override fun getItemCount(): Int {
-        return equipmentList.size
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (equipmentList.size <= position) return 0
-        return if (this.equipmentList[position].javaClass == CustomizationSet::class.java) {
-            0
-        } else {
-            1
-        }
-    }
-
-    fun setEquipment(newEquipmentList: List<Equipment>) {
-        this.equipmentList = newEquipmentList.toMutableList()
-        val emptyEquipment = Equipment()
-        equipmentList.add(0, emptyEquipment)
-        this.notifyDataSetChanged()
-    }
-
-    fun getSelectCustomizationEvents(): Flowable<Equipment> {
-        return selectCustomizationEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    fun getUnlockCustomizationEvents(): Flowable<Equipment> {
-        return unlockCustomizationEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    internal inner class EquipmentViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
-        private val binding = CustomizationGridItemBinding.bind(itemView)
-        var equipment: Equipment? = null
-
-        init {
-            itemView.setOnClickListener(this)
-        }
-
-        fun bind(equipment: Equipment) {
-            this.equipment = equipment
-            binding.imageView.loadImage("shop_" + this.equipment?.key)
-            if (equipment.owned == true || equipment.value == 0.0) {
-                binding.buyButton.visibility = View.GONE
-            } else {
-                binding.buyButton.visibility = View.VISIBLE
-                binding.priceLabel.currency = "gems"
-                binding.priceLabel.value = if (equipment.gearSet == "animal") {
-                    2.0
-                } else {
-                    equipment.value
-                }
-            }
-
-            if (activeEquipment == equipment.key || (activeEquipment?.contains("base_0") == true && equipment.key?.isNotBlank() != true)) {
-                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window_tint_border)
-            } else {
-                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window)
-            }
-        }
-
-        override fun onClick(v: View) {
-            if (equipment?.owned != true && (equipment?.value ?: 0.0) > 0.0) {
-                val dialogContent = LayoutInflater.from(itemView.context).inflate(R.layout.dialog_purchase_customization, null) as LinearLayout
-
-                val imageView = dialogContent.findViewById<PixelArtView>(R.id.imageView)
-                imageView.loadImage("shop_" + this.equipment?.key)
-
-                val priceLabel = dialogContent.findViewById<TextView>(R.id.priceLabel)
-                priceLabel.text = if (equipment?.gearSet == "animal") {
-                    2.0
-                } else {
-                    equipment?.value ?: 0
-                }.toString()
-
-                (dialogContent.findViewById<View>(R.id.gem_icon) as? ImageView)?.setImageBitmap(
-                    HabiticaIconsHelper.imageOfGem())
-
-                val dialog = HabiticaAlertDialog(itemView.context)
-                dialog.addButton(R.string.purchase_button, true) { _, _ ->
-                    if (equipment?.value ?: 0.0 > gemBalance) {
-                        MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", false)))
-                        return@addButton
-                    }
-
-                    equipment?.let {
-                        unlockCustomizationEvents.onNext(it)
-                    }
-                }
-                dialog.setTitle(R.string.purchase_customization)
-                dialog.setAdditionalContentView(dialogContent)
-                dialog.addButton(R.string.reward_dialog_dismiss, false)
-                dialog.show()
-                return
-            }
-
-            if (equipment?.key == activeEquipment) {
-                return
-            }
-
-            equipment?.let {
-                selectCustomizationEvents.onNext(it)
-            }
-        }
-    }
-}
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 3238e6245..9b44cfe63 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
@@ -18,11 +18,8 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.shared.habitica.models.Avatar
 import com.habitrpg.common.habitica.views.AvatarView
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.shared.habitica.models.Avatar
 import java.util.Date
 import java.util.EnumMap
 import kotlin.math.min
@@ -46,7 +43,7 @@ class CustomizationRecyclerViewAdapter() : androidx.recyclerview.widget.Recycler
     var ownedCustomizations: List<String> = listOf()
     private var pinnedItemKeys: List<String> = ArrayList()
 
-    private val selectCustomizationEvents = PublishSubject.create<Customization>()
+    var onCustomizationSelected: ((Customization) -> Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
         return when (viewType) {
@@ -152,10 +149,6 @@ class CustomizationRecyclerViewAdapter() : androidx.recyclerview.widget.Recycler
         this.notifyDataSetChanged()
     }
 
-    fun getSelectCustomizationEvents(): Flowable<Customization> {
-        return selectCustomizationEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
     fun setPinnedItemKeys(pinnedItemKeys: List<String>) {
         this.pinnedItemKeys = pinnedItemKeys
         if (customizationList.size > 0) this.notifyDataSetChanged()
@@ -234,7 +227,7 @@ class CustomizationRecyclerViewAdapter() : androidx.recyclerview.widget.Recycler
                 alert.setMessage(customization?.notes)
                 alert.addButton(R.string.equip, true) { _, _ ->
                     customization?.let {
-                        selectCustomizationEvents.onNext(it)
+                        onCustomizationSelected?.invoke(it)
                     }
                 }
                 alert.addButton(R.string.close, false) { _, _ ->
@@ -243,7 +236,7 @@ class CustomizationRecyclerViewAdapter() : androidx.recyclerview.widget.Recycler
                 alert.show()
             } else {
                 customization?.let {
-                    selectCustomizationEvents.onNext(it)
+                    onCustomizationSelected?.invoke(it)
                 }
             }
         }
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 f961d9f07..870e5985c 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,16 @@ 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.common.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.fragments.NavigationDrawerFragment
 import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem
 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.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.common.habitica.extensions.dpToPx
 
 class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
@@ -49,14 +43,11 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
             notifyDataSetChanged()
         }
 
-    private val itemSelectedEvents = PublishSubject.create<HabiticaDrawerItem>()
-    private val promoClosedSubject = PublishSubject.create<String>()
+    var itemSelectedEvents: ((HabiticaDrawerItem) -> Unit)? = null
+    var promoClosedSubject: ((String) -> Unit)? = null
 
     var activePromo: HabiticaPromotion? = null
 
-    fun getItemSelectionEvents(): Flowable<HabiticaDrawerItem> = itemSelectedEvents.toFlowable(BackpressureStrategy.DROP)
-    fun getPromoCloseEvents(): Flowable<String> = promoClosedSubject.toFlowable(BackpressureStrategy.DROP)
-
     fun getItemWithIdentifier(identifier: String): HabiticaDrawerItem? =
         items.find { it.identifier == identifier }
 
@@ -77,32 +68,6 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
         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)
-                notifyItemRemoved(x)
-            }
-            for ((index, team) in teams.withIndex()) {
-                val item = HabiticaDrawerItem(R.id.tasksFragment, team.id, team.summary)
-                item.bundle = bundleOf(Pair("ownerID", team.id))
-                val newIndex = teamHeaderIndex + index + 1
-                items.add(newIndex, item)
-                notifyItemInserted(newIndex)
-            }
-        }
-    }
-
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val drawerItem = getItem(position)
         when {
@@ -110,7 +75,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
                 val itemHolder = holder as? DrawerItemViewHolder
                 itemHolder?.tintColor = tintColor
                 itemHolder?.bind(drawerItem, drawerItem.transitionId == selectedItem)
-                itemHolder?.itemView?.setOnClickListener { itemSelectedEvents.onNext(drawerItem) }
+                itemHolder?.itemView?.setOnClickListener { itemSelectedEvents?.invoke(drawerItem) }
             }
             getItemViewType(position) == 1 -> {
                 (holder as? SectionHeaderViewHolder)?.backgroundTintColor = backgroundTintColor
@@ -120,7 +85,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
                 activePromo?.let { promo ->
                     (holder as? PromoMenuViewHolder)?.bind(promo)
                     (holder as? PromoMenuViewHolder)?.promoView?.binding?.closeButton?.setOnClickListener {
-                        promoClosedSubject.onNext(promo.identifier)
+                        promoClosedSubject?.invoke(promo.identifier)
                     }
                 }
             }
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 e519a18fd..2496b7fdf 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
@@ -8,14 +8,11 @@ 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 io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.UUID
 
 class SkillTasksRecyclerViewAdapter : BaseRecyclerViewAdapter<Task, SkillTasksRecyclerViewAdapter.TaskViewHolder>() {
 
-    private val taskSelectionEvents = PublishSubject.create<Task>()
+    var onTaskSelection: ((Task) -> Unit)? = null
 
     override fun getItemId(position: Int): Long {
         val task = getItem(position)
@@ -35,10 +32,6 @@ class SkillTasksRecyclerViewAdapter : BaseRecyclerViewAdapter<Task, SkillTasksRe
         holder.bindHolder(data[position])
     }
 
-    fun getTaskSelectionEvents(): Flowable<Task> {
-        return taskSelectionEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
     inner class TaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
         private val binding = SkillTaskItemCardBinding.bind(itemView)
         var task: Task? = null
@@ -63,7 +56,7 @@ class SkillTasksRecyclerViewAdapter : BaseRecyclerViewAdapter<Task, SkillTasksRe
         override fun onClick(v: View) {
             if (v == itemView) {
                 task?.let {
-                    taskSelectionEvents.onNext(it)
+                    onTaskSelection?.invoke(it)
                 }
             }
         }
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 043b5a1cd..26f0b6121 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
@@ -10,20 +10,16 @@ import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.SkillListItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.extensions.loadImage
 import io.realm.RealmList
 
 class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter.SkillViewHolder>() {
 
-    private val useSkillSubject = PublishSubject.create<Skill>()
-    val useSkillEvents: Flowable<Skill> = useSkillSubject.toFlowable(BackpressureStrategy.DROP)
+    var onUseSkill: ((Skill) -> Unit)? = null
 
     var mana: Double = 0.0
         set(value) {
@@ -130,7 +126,7 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
 
         override fun onClick(v: View) {
             if ((skill?.lvl ?: 0) <= level) {
-                skill?.let { useSkillSubject.onNext(it) }
+                skill?.let { onUseSkill?.invoke(it) }
             }
         }
 
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 ba218b5b8..953b1afba 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
@@ -12,9 +12,8 @@ import com.habitrpg.android.habitica.R
 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.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.common.habitica.extensions.loadImage
 
 class EquipmentRecyclerViewAdapter : BaseRecyclerViewAdapter<Equipment, EquipmentRecyclerViewAdapter.GearViewHolder>() {
 
@@ -22,7 +21,7 @@ class EquipmentRecyclerViewAdapter : BaseRecyclerViewAdapter<Equipment, Equipmen
     var isCostume: Boolean? = null
     var type: String? = null
 
-    val equipEvents: PublishSubject<String> = PublishSubject.create()
+    var onEquip: ((String) -> Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GearViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(R.layout.gear_list_item, parent, false)
@@ -45,7 +44,7 @@ class EquipmentRecyclerViewAdapter : BaseRecyclerViewAdapter<Equipment, Equipmen
             itemView.setOnClickListener {
                 val key = gear?.key
                 if (key != null) {
-                    equipEvents.onNext(key)
+                    onEquip?.invoke(key)
                     equippedGear = if (key == equippedGear) {
                         type + "_base_0"
                     } else {
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 e66a08d7d..86901deed 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
@@ -24,9 +24,6 @@ import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
 import com.habitrpg.android.habitica.ui.views.dialogs.DetailDialog
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.extensions.loadImage
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -46,31 +43,14 @@ class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter<OwnedI
             notifyDataSetChanged()
         }
 
-    private val sellItemEvents = PublishSubject.create<OwnedItem>()
-    private val questInvitationEvents = PublishSubject.create<QuestContent>()
-    private val openMysteryItemEvents = PublishSubject.create<Item>()
-    private val startHatchingSubject = PublishSubject.create<Item>()
-    private val hatchPetSubject = PublishSubject.create<Pair<HatchingPotion, Egg>>()
-    private val feedPetSubject = PublishSubject.create<Food>()
-    private val createNewPartySubject = PublishSubject.create<Boolean>()
-    private val useSpecialSubject = PublishSubject.create<SpecialItem>()
-
-    fun getSellItemFlowable(): Flowable<OwnedItem> {
-        return sellItemEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    fun getQuestInvitationFlowable(): Flowable<QuestContent> {
-        return questInvitationEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-    fun getOpenMysteryItemFlowable(): Flowable<Item> {
-        return openMysteryItemEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    val startHatchingEvents: Flowable<Item> = startHatchingSubject.toFlowable(BackpressureStrategy.DROP)
-    val hatchPetEvents: Flowable<Pair<HatchingPotion, Egg>> = hatchPetSubject.toFlowable(BackpressureStrategy.DROP)
-    val feedPetEvents: Flowable<Food> = feedPetSubject.toFlowable(BackpressureStrategy.DROP)
-    val startNewPartyEvents: Flowable<Boolean> = createNewPartySubject.toFlowable(BackpressureStrategy.DROP)
-    val useSpecialEvents: Flowable<SpecialItem> = useSpecialSubject.toFlowable(BackpressureStrategy.DROP)
+    var onSellItem: ((OwnedItem) -> Unit)? = null
+    var onQuestInvitation: ((QuestContent) -> Unit)? = null
+    var onOpenMysteryItem: ((Item) -> Unit)? = null
+    var onStartHatching: ((Item) -> Unit)? = null
+    var onHatchPet: ((HatchingPotion, Egg) -> Unit)? = null
+    var onFeedPet: ((Food) -> Unit)? = null
+    var onCreateNewParty: (() -> Unit)? = null
+    var onUseSpecialItem: ((SpecialItem) -> Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
         return ItemViewHolder(ItemItemBinding.inflate(context.layoutInflater, parent, false))
@@ -188,12 +168,12 @@ class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter<OwnedI
                 menu.setSelectionRunnable { index ->
                     item?.let { selectedItem ->
                         if (!(selectedItem is QuestContent || selectedItem is SpecialItem) && index == 0) {
-                            ownedItem?.let { selectedOwnedItem -> sellItemEvents.onNext(selectedOwnedItem) }
+                            ownedItem?.let { selectedOwnedItem -> onSellItem?.invoke(selectedOwnedItem) }
                             return@let
                         }
                         when (selectedItem) {
-                            is Egg -> item?.let { startHatchingSubject.onNext(it) }
-                            is HatchingPotion -> startHatchingSubject.onNext(selectedItem)
+                            is Egg -> item?.let { onStartHatching?.invoke(it) }
+                            is HatchingPotion -> onStartHatching?.invoke(selectedItem)
                             is QuestContent -> {
                                 if (index == 0) {
                                     val dialog = DetailDialog(context)
@@ -201,17 +181,17 @@ class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter<OwnedI
                                     dialog.show()
                                 } else {
                                     if (user?.hasParty == true) {
-                                        questInvitationEvents.onNext(selectedItem)
+                                        onQuestInvitation?.invoke(selectedItem)
                                     } else {
-                                        createNewPartySubject.onNext(true)
+                                        onCreateNewParty?.invoke()
                                     }
                                 }
                             }
                             is SpecialItem ->
                                 if (item?.key != "inventory_present") {
-                                    useSpecialSubject.onNext(selectedItem)
+                                    onUseSpecialItem?.invoke(selectedItem)
                                 } else {
-                                    openMysteryItemEvents.onNext(selectedItem)
+                                    onOpenMysteryItem?.invoke(selectedItem)
                                 }
                         }
                     }
@@ -224,17 +204,17 @@ class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter<OwnedI
                 item?.let { firstItem ->
                     if (firstItem is Egg) {
                         (hatchingItem as? HatchingPotion)?.let { potion ->
-                            hatchPetSubject.onNext(Pair(potion, firstItem))
+                            onHatchPet?.invoke(potion, firstItem)
                         }
                     } else if (firstItem is HatchingPotion) {
                         (hatchingItem as? Egg)?.let { egg ->
-                            hatchPetSubject.onNext(Pair(firstItem, egg))
+                            onHatchPet?.invoke(firstItem, egg)
                         }
                     }
                     return@let
                 }
             } else if (isFeeding) {
-                feedPetSubject.onNext(item as Food?)
+                (item as Food?)?.let { onFeedPet?.invoke(it) }
                 fragment?.dismiss()
             }
         }
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 865550a3c..2fef47148 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
@@ -6,14 +6,11 @@ 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.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>() {
+    var onEquip: ((String) -> Unit)? = null
     private var ownedMounts: Map<String, OwnedMount>? = null
 
-    private val equipEvents = PublishSubject.create<String>()
     var currentMount: String? = null
         set(value) {
             field = value
@@ -27,14 +24,10 @@ class MountDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Ada
         this.notifyDataSetChanged()
     }
 
-    fun getEquipFlowable(): Flowable<String> {
-        return equipEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder =
         when (viewType) {
             1 -> SectionViewHolder(parent)
-            else -> MountViewHolder(parent, equipEvents)
+            else -> MountViewHolder(parent, onEquip)
         }
 
     override fun onBindViewHolder(
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 f06af2b9f..9f030f4ce 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
@@ -5,7 +5,6 @@ import android.view.ViewGroup
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.CanHatchItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.android.habitica.models.inventory.Animal
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Food
@@ -16,15 +15,15 @@ import com.habitrpg.android.habitica.models.inventory.StableSection
 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.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
 import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.Animations
 
 class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
+    var onFeed: ((Pet, Food?) -> Unit)? = null
+    var onEquip: ((String) -> Unit)? = null
     private var existingMounts: List<Mount>? = null
     private var ownedPets: Map<String, OwnedPet>? = null
     private var ownedMounts: Map<String, OwnedMount>? = null
@@ -34,8 +33,6 @@ class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapt
             field = value
             notifyDataSetChanged()
         }
-    private val equipEvents = PublishSubject.create<String>()
-    private val feedEvents = PublishSubject.create<Pair<Pet, Food?>>()
     private var ownsSaddles: Boolean = false
 
     private var itemList: List<Any> = ArrayList()
@@ -45,12 +42,6 @@ class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapt
         this.notifyDataSetChanged()
     }
 
-    fun getEquipFlowable(): Flowable<String> {
-        return equipEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    var feedFlowable: Flowable<Pair<Pet, Food?>> = feedEvents.toFlowable(BackpressureStrategy.DROP)
-
     var animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)? = null
 
     private fun canRaiseToMount(pet: Pet): Boolean {
@@ -74,7 +65,7 @@ class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapt
         when (viewType) {
             1 -> SectionViewHolder(parent)
             2 -> CanHatchViewHolder(parent, animalIngredientsRetriever)
-            else -> PetViewHolder(parent, equipEvents, feedEvents, animalIngredientsRetriever)
+            else -> PetViewHolder(parent, onEquip, onFeed, animalIngredientsRetriever)
         }
 
     override fun onBindViewHolder(
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 08bdeea26..f6103f4a0 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
@@ -18,9 +18,6 @@ import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.BehaviorSubject
 
 class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
 
@@ -28,8 +25,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<an
     private var shopIdentifier: String? = null
     private var ownedItems: Map<String, OwnedItem> = HashMap()
 
-    private val changeClassSubject = BehaviorSubject.create<String>()
-    val changeClassEvents: Flowable<String> = changeClassSubject.toFlowable(BackpressureStrategy.DROP)
+    var changeClassEvents: ((String) -> Unit)? = null
 
     var shopSpriteSuffix: String = ""
         set(value) {
@@ -128,7 +124,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<an
                                 sectionHolder.notesView?.text = context.getString(R.string.class_gear_disclaimer)
                                 if (user?.hasClass == true) {
                                     sectionHolder.switchClassButton?.setOnClickListener {
-                                        changeClassSubject.onNext(selectedGearCategory)
+                                        changeClassEvents?.invoke(selectedGearCategory)
                                     }
                                     // TODO: Enable this again when we have a nicer design
                                     sectionHolder.switchClassButton?.visibility = View.GONE
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 c9c4c06e0..d16b06f27 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
@@ -25,16 +25,13 @@ import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.views.PixelArtView
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
 
 class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     var shopSpriteSuffix: String? = null
     private var eggs: Map<String, Egg> = mapOf()
     var animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)? = null
-    private val feedEvents = PublishSubject.create<Pair<Pet, Food?>>()
+    var onFeed: ((Pet, Food?) -> Unit)? = null
     var itemType: String? = null
     var currentPet: String? = null
         set(value) {
@@ -46,16 +43,13 @@ class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
             field = value
             notifyDataSetChanged()
         }
-    private val equipEvents = PublishSubject.create<String>()
+   var onEquip: ((String) -> Unit)? = null
     private var existingMounts: List<Mount>? = null
     private var ownedMounts: Map<String, OwnedMount>? = null
     private var ownedItems: Map<String, OwnedItem>? = null
     private var ownsSaddles: Boolean = false
     private var itemList: List<Any> = ArrayList()
 
-    fun getEquipFlowable(): Flowable<String> {
-        return equipEvents.toFlowable(BackpressureStrategy.DROP)
-    }
 
     private fun canRaiseToMount(pet: Pet): Boolean {
         if (pet.type == "special") return false
@@ -101,8 +95,8 @@ class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
             1 -> SectionViewHolder(parent)
             4 -> StableViewHolder(parent.inflate(R.layout.pet_overview_item))
             5 -> StableViewHolder(parent.inflate(R.layout.mount_overview_item))
-            2 -> PetViewHolder(parent, equipEvents, feedEvents, animalIngredientsRetriever)
-            3 -> MountViewHolder(parent, equipEvents)
+            2 -> PetViewHolder(parent, onEquip, onFeed, animalIngredientsRetriever)
+            3 -> MountViewHolder(parent, onEquip)
             else -> StableHeaderViewHolder(parent)
         }
 
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 afcd17483..dbe59c6da 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
@@ -12,9 +12,6 @@ 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 io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
 
 internal class CustomizationSetupAdapter : RecyclerView.Adapter<CustomizationSetupAdapter.CustomizationViewHolder>() {
 
@@ -22,10 +19,8 @@ internal class CustomizationSetupAdapter : RecyclerView.Adapter<CustomizationSet
     var user: User? = null
     private var customizationList: List<SetupCustomization> = emptyList()
 
-    private val equipGearEventSubject = PublishSubject.create<String>()
-    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)
+    var onEquipGear: ((String) -> Unit)? = null
+    var onUpdateUser: ((Map<String, Any>) -> Unit)? = null
 
     fun setCustomizationList(newCustomizationList: List<SetupCustomization>) {
         this.customizationList = newCustomizationList
@@ -123,12 +118,12 @@ internal class CustomizationSetupAdapter : RecyclerView.Adapter<CustomizationSet
                     } else {
                         selectedCustomization.key
                     }
-                    key?.let { equipGearEventSubject.onNext(it) }
+                    key?.let { onEquipGear?.invoke(it) }
                 } else {
                     val updateData = HashMap<String, Any>()
                     val updatePath = "preferences." + selectedCustomization.path
                     updateData[updatePath] = selectedCustomization.key
-                    updateUserEventsSubject.onNext(updateData)
+                    onUpdateUser?.invoke(updateData)
                 }
             }
         }
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 92d62dffe..073f5087a 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
@@ -12,9 +12,7 @@ import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.helpers.EmojiParser
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+
 import io.realm.OrderedRealmCollection
 
 class ChallengesListViewAdapter(
@@ -24,7 +22,7 @@ class ChallengesListViewAdapter(
     private var unfilteredData: List<Challenge>? = null
     private var challengeMemberships: List<ChallengeMembership>? = null
 
-    private val openChallengeFragmentEvents = PublishSubject.create<String>()
+    var onOpenChallengeFragment: ((String) -> Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChallengeViewHolder {
         return ChallengeViewHolder(parent.inflate(R.layout.challenge_item), viewUserChallengesOnly)
@@ -36,7 +34,7 @@ class ChallengesListViewAdapter(
             holder.itemView.setOnClickListener {
                 if (challenge.isManaged && challenge.isValid) {
                     challenge.id?.let {
-                        openChallengeFragmentEvents.onNext(it)
+                        onOpenChallengeFragment?.invoke(it)
                     }
                 }
             }
@@ -76,10 +74,6 @@ class ChallengesListViewAdapter(
         }
     }
 
-    fun getOpenDetailFragmentFlowable(): Flowable<String> {
-        return openChallengeFragmentEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
     class ChallengeViewHolder internal constructor(
         itemView: View,
         private val viewUserChallengesOnly: Boolean
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 52e936006..867050fdc 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
@@ -12,9 +12,6 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.DiffCallback
 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 ChatDiffCallback(oldList: List<BaseMainObject>, newList: List<BaseMainObject>) :
     DiffCallback<ChatMessage>(oldList, newList) {
@@ -39,11 +36,11 @@ class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) : Base
     private var expandedMessageId: String? = null
 
     var onMessageLike: ((ChatMessage) -> Unit)? = null
-    private val userLabelClickEvents = PublishSubject.create<String>()
-    private val deleteMessageEvents = PublishSubject.create<ChatMessage>()
-    private val flagMessageEvents = PublishSubject.create<ChatMessage>()
-    private val replyMessageEvents = PublishSubject.create<String>()
-    private val copyMessageEvents = PublishSubject.create<ChatMessage>()
+    var onOpenProfile: ((String) -> Unit)? = null
+    var onDeleteMessage: ((ChatMessage) -> Unit)? = null
+    var onFlagMessage: ((ChatMessage) -> Unit)? = null
+    var onReply: ((String) -> Unit)? = null
+    var onCopyMessage: ((ChatMessage) -> Unit)? = null
 
     override fun getDiffCallback(
         oldList: List<ChatMessage>,
@@ -83,12 +80,12 @@ class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) : Base
                 expandedMessageId == message.id
             )
             chatHolder.onShouldExpand = { expandMessage(message, position) }
-            chatHolder.onLikeMessage = { onMessageLike?.invoke(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) }
+            chatHolder.onLikeMessage = onMessageLike
+            chatHolder.onOpenProfile = onOpenProfile
+            chatHolder.onReply = onReply
+            chatHolder.onCopyMessage = onCopyMessage
+            chatHolder.onFlagMessage = onFlagMessage
+            chatHolder.onDeleteMessage = onDeleteMessage
         }
     }
 
@@ -97,26 +94,6 @@ class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) : Base
         return if (data[position].isSystemMessage) 0 else 1
     }
 
-    fun getUserLabelClickFlowable(): Flowable<String> {
-        return userLabelClickEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    fun getFlagMessageClickFlowable(): Flowable<ChatMessage> {
-        return flagMessageEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    fun getDeleteMessageFlowable(): Flowable<ChatMessage> {
-        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(message: ChatMessage, position: Int?) {
         expandedMessageId = if (expandedMessageId == message.id) {
             null
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 bfa0fe6f5..829ea2315 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
@@ -11,20 +11,17 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerIntroViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerViewHolder
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
 
-class InboxAdapter(private var user: User?, private var replyToUser: Member) : PagedListAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
+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
 
     private var expandedMessageId: String? = null
-    private val userLabelClickEvents = PublishSubject.create<String>()
-    private val deleteMessageEvents = PublishSubject.create<ChatMessage>()
-    private val flagMessageEvents = PublishSubject.create<ChatMessage>()
-    private val replyMessageEvents = PublishSubject.create<String>()
-    private val copyMessageEvents = PublishSubject.create<ChatMessage>()
+    var onOpenProfile: ((String) -> Unit)? = null
+    var onDeleteMessage: ((ChatMessage) -> Unit)? = null
+    var onFlagMessage: ((ChatMessage) -> Unit)? = null
+    var onReply: ((String) -> Unit)? = null
+    var onCopyMessage: ((ChatMessage) -> Unit)? = null
 
     private fun isPositionIntroMessage(position: Int): Boolean {
         return (position == super.getItemCount() - 1)
@@ -43,7 +40,7 @@ class InboxAdapter(private var user: User?, private var replyToUser: Member) : P
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatRecyclerViewHolder {
-        return if (viewType == FIRST_MESSAGE) ChatRecyclerIntroViewHolder(parent.inflate(R.layout.tavern_chat_intro_item), replyToUser.id!!)
+        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)
     }
 
@@ -52,7 +49,7 @@ class InboxAdapter(private var user: User?, private var replyToUser: Member) : P
         if (firstMessage) {
             val introHolder = holder as ChatRecyclerIntroViewHolder
             introHolder.bind(replyToUser)
-            introHolder.onOpenProfile = { userLabelClickEvents.onNext(it) }
+            introHolder.onOpenProfile = onOpenProfile
         } else {
             val message: ChatMessage = getItem(position) ?: return
             val messageHolder = holder as ChatRecyclerMessageViewHolder
@@ -63,30 +60,14 @@ class InboxAdapter(private var user: User?, private var replyToUser: Member) : P
                 expandedMessageId == message.id
             )
             messageHolder.onShouldExpand = { expandMessage(message.id, position) }
-            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) }
+            messageHolder.onOpenProfile = onOpenProfile
+            messageHolder.onReply = onReply
+            messageHolder.onCopyMessage = onCopyMessage
+            messageHolder.onFlagMessage = onFlagMessage
+            messageHolder.onDeleteMessage = onDeleteMessage
         }
     }
 
-    fun getUserLabelClickFlowable(): Flowable<String> {
-        return userLabelClickEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    fun getFlagMessageClickFlowable(): Flowable<ChatMessage> {
-        return flagMessageEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    fun getDeleteMessageFlowable(): Flowable<ChatMessage> {
-        return deleteMessageEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    fun getCopyMessageFlowable(): Flowable<ChatMessage> {
-        return copyMessageEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
     private fun expandMessage(id: String, position: Int) {
         if (isPositionIntroMessage(position))
             return
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 b1127ecc7..7e8b4bf36 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
@@ -6,15 +6,12 @@ import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.members.Member
 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 : BaseRecyclerViewAdapter<Member, GroupMemberViewHolder>() {
 
     var leaderID: String? = null
 
-    private val userClickedEvents = PublishSubject.create<String>()
+    var onUserClicked: ((String) -> Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupMemberViewHolder {
         return GroupMemberViewHolder(parent.inflate(R.layout.party_member))
@@ -23,11 +20,7 @@ class PartyMemberRecyclerViewAdapter : BaseRecyclerViewAdapter<Member, GroupMemb
     override fun onBindViewHolder(holder: GroupMemberViewHolder, position: Int) {
         holder.bind(data[position], leaderID, null)
         holder.onClickEvent = {
-            userClickedEvents.onNext(data[position].id ?: "")
+            onUserClicked?.invoke(data[position].id ?: "")
         }
     }
-
-    fun getUserClickedEvents(): Flowable<String> {
-        return userClickedEvents.toFlowable(BackpressureStrategy.DROP)
-    }
 }
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 9e5a8dca9..d700317cb 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
@@ -8,7 +8,6 @@ import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.shared.habitica.models.tasks.TaskType
 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.BaseTaskViewHolder
@@ -17,9 +16,7 @@ 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.viewmodels.TasksViewModel
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.shared.habitica.models.tasks.TaskType
 
 class ChallengeTasksRecyclerViewAdapter(
     viewModel: TasksViewModel,
@@ -30,13 +27,11 @@ class ChallengeTasksRecyclerViewAdapter(
     private val taskActionsDisabled: Boolean
 ) : BaseTasksRecyclerViewAdapter<BindableViewHolder<Task>>(TaskType.HABIT, viewModel, layoutResource, newContext, userID) {
 
-    private val addItemSubject = PublishSubject.create<Task>()
-
     val taskList: MutableList<Task>
         get() = content?.map { t -> t }?.toMutableList() ?: mutableListOf()
 
-    private var taskOpenEventsSubject = PublishSubject.create<Task>()
-    val taskOpenEvents: Flowable<Task> = taskOpenEventsSubject.toFlowable(BackpressureStrategy.LATEST)
+    var onAddItem: ((Task) -> Unit)? = null
+    var onTaskOpen: ((Task) -> Unit)? = null
 
     override fun injectThis(component: UserComponent) {
         component.inject(this)
@@ -50,14 +45,10 @@ class ChallengeTasksRecyclerViewAdapter(
             TaskType.DAILY -> TYPE_DAILY
             TaskType.TODO -> TYPE_TODO
             TaskType.REWARD -> TYPE_REWARD
-            else -> if (addItemSubject.hasObservers() && task?.id == "addtask") TYPE_ADD_ITEM else TYPE_HEADER
+            else -> if (task?.id == "addtask") TYPE_ADD_ITEM else TYPE_HEADER
         }
     }
 
-    fun addItemObservable(): Flowable<Task> {
-        return addItemSubject.toFlowable(BackpressureStrategy.BUFFER)
-    }
-
     fun addTaskUnder(taskToAdd: Task, taskAbove: Task?): Int {
         val position = content?.indexOfFirst { t -> t.id == taskAbove?.id } ?: 0
 
@@ -69,19 +60,19 @@ class ChallengeTasksRecyclerViewAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BindableViewHolder<Task> {
         val viewHolder: BindableViewHolder<Task> = when (viewType) {
-            TYPE_HABIT -> HabitViewHolder(getContentView(parent, R.layout.habit_item_card), { _, _ -> }, { }) { task ->
-                taskOpenEventsSubject.onNext(task)
-            }
-            TYPE_DAILY -> DailyViewHolder(getContentView(parent, R.layout.daily_item_card), { _, _ -> }, { _, _ -> }, { }) { task ->
-                taskOpenEventsSubject.onNext(task)
-            }
-            TYPE_TODO -> TodoViewHolder(getContentView(parent, R.layout.todo_item_card), { _, _ -> }, { _, _ -> }, { }) { task ->
-                taskOpenEventsSubject.onNext(task)
-            }
-            TYPE_REWARD -> RewardViewHolder(getContentView(parent, R.layout.reward_item_card), { _, _ -> }, { }) { task ->
-                taskOpenEventsSubject.onNext(task)
-            }
-            TYPE_ADD_ITEM -> AddItemViewHolder(getContentView(parent, R.layout.challenge_add_task_item), addItemSubject)
+            TYPE_HABIT -> HabitViewHolder(getContentView(parent, R.layout.habit_item_card), { _, _ -> }, { }, { task ->
+                onTaskOpen?.invoke(task)
+            }, null)
+            TYPE_DAILY -> DailyViewHolder(getContentView(parent, R.layout.daily_item_card), { _, _ -> }, { _, _ -> }, { }, { task ->
+                onTaskOpen?.invoke(task)
+            }, null)
+            TYPE_TODO -> TodoViewHolder(getContentView(parent, R.layout.todo_item_card), { _, _ -> }, { _, _ -> }, { }, { task ->
+                onTaskOpen?.invoke(task)
+            }, null)
+            TYPE_REWARD -> RewardViewHolder(getContentView(parent, R.layout.reward_item_card), { _, _ -> }, { }, { task ->
+                onTaskOpen?.invoke(task)
+            }, null)
+            TYPE_ADD_ITEM -> AddItemViewHolder(getContentView(parent, R.layout.challenge_add_task_item), onAddItem)
             else -> DividerViewHolder(getContentView(parent, R.layout.challenge_task_divider))
         }
 
@@ -113,7 +104,7 @@ class ChallengeTasksRecyclerViewAdapter(
 
     inner class AddItemViewHolder internal constructor(
         itemView: View,
-        private val callback: PublishSubject<Task>
+        private val callback: ((Task) -> Unit)?
     ) : BindableViewHolder<Task>(itemView) {
 
         private val addBtn: Button = itemView.findViewById(R.id.btn_add_task)
@@ -121,10 +112,14 @@ class ChallengeTasksRecyclerViewAdapter(
 
         init {
             addBtn.isClickable = true
-            addBtn.setOnClickListener { newTask?.let { callback.onNext(it) } }
+            addBtn.setOnClickListener { newTask?.let { callback?.invoke(it) } }
         }
 
-        override fun bind(data: Task, position: Int, displayMode: String) {
+        override fun bind(
+            data: Task,
+            position: Int,
+            displayMode: String
+        ) {
             this.newTask = data
             addBtn.text = data.text
         }
@@ -134,7 +129,11 @@ class ChallengeTasksRecyclerViewAdapter(
 
         private val dividerName: TextView = itemView.findViewById(R.id.divider_name)
 
-        override fun bind(data: Task, position: Int, displayMode: String) {
+        override fun bind(
+            data: Task,
+            position: Int,
+            displayMode: String
+        ) {
             dividerName.text = data.text
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt
index b645979aa..ed6562879 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt
@@ -10,16 +10,15 @@ class DailiesRecyclerViewHolder(layoutResource: Int, viewModel: TasksViewModel)
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return if (viewType == 0) {
             DailyViewHolder(
-                getContentView(parent), { task, direction -> taskScoreEventsSubject.onNext(Pair(task, direction)) },
-                { task, item -> checklistItemScoreSubject.onNext(Pair(task, item)) },
+                getContentView(parent), { task, direction -> taskScoreEvents?.invoke(task, direction) },
+                { task, item -> checklistItemScoreEvents?.invoke(task, item) },
                 {
                         task ->
-                    taskOpenEventsSubject.onNext(task)
-                }
-            ) {
+                    taskOpenEvents?.invoke(task.first, task.second)
+                }, {
                     task ->
-                brokenTaskEventsSubject.onNext(task)
-            }
+                brokenTaskEvents?.invoke(task)
+            }, viewModel)
         } else {
             super.onCreateViewHolder(parent, viewType)
         }
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 f207c107e..61bbde0e2 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
@@ -10,15 +10,14 @@ class HabitsRecyclerViewAdapter(layoutResource: Int, viewModel: TasksViewModel)
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return if (viewType == 0) {
             HabitViewHolder(
-                getContentView(parent), { task, direction -> taskScoreEventsSubject.onNext(Pair(task, direction)) },
+                getContentView(parent), { task, direction -> taskScoreEvents?.invoke(task, direction) },
                 {
                         task ->
-                    taskOpenEventsSubject.onNext(task)
-                }
-            ) {
-                    task ->
-                brokenTaskEventsSubject.onNext(task)
-            }
+                    taskOpenEvents?.invoke(task.first, task.second)
+                }, {
+                        task ->
+                    brokenTaskEvents?.invoke(task)
+                }, viewModel)
         } else {
             super.onCreateViewHolder(parent, viewType)
         }
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 014c7ec48..eca730ce2 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
@@ -19,17 +19,12 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
-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(
     private val layoutResource: Int,
-    private val viewModel: TasksViewModel
+    val viewModel: TasksViewModel
 ) : BaseRecyclerViewAdapter<Task, RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
-    override var canScoreTasks = true
     private var unfilteredData: List<Task>? = null
     override var showAdventureGuide = false
         set(value) {
@@ -51,18 +46,12 @@ abstract class RealmBaseTasksRecyclerViewAdapter(
             }
         }
 
-    private var errorButtonEventsSubject: PublishSubject<String> = PublishSubject.create()
-    override val errorButtonEvents: Flowable<String> = errorButtonEventsSubject.toFlowable(BackpressureStrategy.DROP)
-    protected var taskScoreEventsSubject: PublishSubject<Pair<Task, TaskDirection>> = PublishSubject.create()
-    override val taskScoreEvents: Flowable<Pair<Task, TaskDirection>> = taskScoreEventsSubject.toFlowable(BackpressureStrategy.DROP)
-    protected var checklistItemScoreSubject: PublishSubject<Pair<Task, ChecklistItem>> = PublishSubject.create()
-    override val checklistItemScoreEvents: Flowable<Pair<Task, ChecklistItem>> = checklistItemScoreSubject.toFlowable(BackpressureStrategy.DROP)
-    protected var taskOpenEventsSubject: PublishSubject<Pair<Task, View>> = PublishSubject.create()
-    override val taskOpenEvents: Flowable<Pair<Task, View>> = taskOpenEventsSubject.toFlowable(BackpressureStrategy.DROP)
-    protected var brokenTaskEventsSubject: PublishSubject<Task> = PublishSubject.create()
-    override val brokenTaskEvents: Flowable<Task> = brokenTaskEventsSubject.toFlowable(BackpressureStrategy.DROP)
-    protected var adventureGuideOpenSubject: PublishSubject<Boolean> = PublishSubject.create()
-    override val adventureGuideOpenEvents: Flowable<Boolean> = adventureGuideOpenSubject.toFlowable(BackpressureStrategy.DROP)
+    override var errorButtonEvents: ((String) -> Unit)? = null
+    override var taskScoreEvents: ((Task, TaskDirection) -> Unit)? = null
+    override var checklistItemScoreEvents: ((Task, ChecklistItem) -> Unit)? = null
+    override var taskOpenEvents: ((Task, View) -> Unit)? = null
+    override var brokenTaskEvents: ((Task) -> Unit)? = null
+    override var adventureGuideOpenEvents: ((Boolean) -> Unit)? = null
 
     override fun getItemId(index: Int): Long = index.toLong()
 
@@ -80,13 +69,14 @@ abstract class RealmBaseTasksRecyclerViewAdapter(
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val item = getItem(position)
         if (item != null && holder is BaseTaskViewHolder) {
-            holder.isLocked = !canScoreTasks
-            holder.bind(item, position, taskDisplayMode)
-            holder.errorButtonClicked = Action {
-                errorButtonEventsSubject.onNext("")
+            holder.userID = user?.id
+            holder.isLocked = !viewModel.canScoreTask(item)
+            holder.bind(item, position, taskDisplayMode, viewModel.ownerID.value)
+            holder.errorButtonClicked = {
+                errorButtonEvents?.invoke("")
             }
         } else if (holder is AdventureGuideViewHolder) {
-            holder.itemView.setOnClickListener { adventureGuideOpenSubject.onNext(true) }
+            holder.itemView.setOnClickListener { adventureGuideOpenEvents?.invoke(true) }
             user?.let { holder.update(it) }
         }
     }
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 222d0a0a0..3eae1407f 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
@@ -5,7 +5,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -13,13 +12,13 @@ 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.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 
 class RewardsRecyclerViewAdapter(
     private var customRewards: List<Task>?,
-    private val layoutResource: Int
+    private val layoutResource: Int,
+    val viewModel: TasksViewModel
 ) : BaseRecyclerViewAdapter<Task, RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
     override var user: User? = null
         set(value) {
@@ -30,22 +29,15 @@ class RewardsRecyclerViewAdapter(
             notifyDataSetChanged()
         }
     override var showAdventureGuide: Boolean = false
-    override var canScoreTasks = true
     private var inAppRewards: List<ShopItem>? = null
 
-    private val errorButtonEventsSubject: PublishSubject<String> = PublishSubject.create()
-    override val errorButtonEvents: Flowable<String> = errorButtonEventsSubject.toFlowable(BackpressureStrategy.DROP)
-    private var taskScoreEventsSubject: PublishSubject<Pair<Task, TaskDirection>> = PublishSubject.create()
-    override val taskScoreEvents: Flowable<Pair<Task, TaskDirection>> = taskScoreEventsSubject.toFlowable(BackpressureStrategy.LATEST)
-    private var checklistItemScoreSubject: PublishSubject<Pair<Task, ChecklistItem>> = PublishSubject.create()
-    override val checklistItemScoreEvents: Flowable<Pair<Task, ChecklistItem>> = checklistItemScoreSubject.toFlowable(BackpressureStrategy.DROP)
-    private var taskOpenEventsSubject: PublishSubject<Pair<Task, View>> = PublishSubject.create()
-    override val taskOpenEvents: Flowable<Pair<Task, View>> = taskOpenEventsSubject.toFlowable(BackpressureStrategy.LATEST)
-    private var brokenTaskEventsSubject: PublishSubject<Task> = PublishSubject.create()
-    override val brokenTaskEvents: Flowable<Task> = brokenTaskEventsSubject.toFlowable(BackpressureStrategy.DROP)
-    override val adventureGuideOpenEvents: Flowable<Boolean>? = null
-    private var purchaseCardSubject: PublishSubject<ShopItem> = PublishSubject.create()
-    val purchaseCardEvents: Flowable<ShopItem> = purchaseCardSubject.toFlowable(BackpressureStrategy.LATEST)
+    override var errorButtonEvents: ((String) -> Unit)? = null
+    override var taskScoreEvents: ((Task, TaskDirection) -> Unit)? = null
+    override var checklistItemScoreEvents: ((Task, ChecklistItem) -> Unit)? = null
+    override var taskOpenEvents: ((Task, View) -> Unit)? = null
+    override var brokenTaskEvents: ((Task) -> Unit)? = null
+    override var adventureGuideOpenEvents: ((Boolean) -> Unit)? = null
+    var purchaseCardEvents: ((ShopItem) -> Unit)? = null
 
     override var taskDisplayMode: String = "standard"
         set(value) {
@@ -77,14 +69,16 @@ class RewardsRecyclerViewAdapter(
                 getContentView(parent),
                 { task, direction ->
                     if (task.value <= (user?.stats?.gp ?: 0.0)) {
-                        taskScoreEventsSubject.onNext(Pair(task, direction))
+                        taskScoreEvents?.invoke(task, direction)
                     }
                 },
-                { task -> taskOpenEventsSubject.onNext(task) }
-            ) { task -> brokenTaskEventsSubject.onNext(task) }
+                { task -> taskOpenEvents?.invoke(task.first, task.second) }, {
+                        task ->
+                    brokenTaskEvents?.invoke(task)
+                }, viewModel)
         } else {
             val viewHolder = ShopItemViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_shopitem, parent, false))
-            viewHolder.purchaseCardAction = { purchaseCardSubject.onNext(it) }
+            viewHolder.purchaseCardAction = { purchaseCardEvents?.invoke(it) }
             viewHolder
         }
     }
@@ -93,8 +87,8 @@ class RewardsRecyclerViewAdapter(
         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)
+            (holder as? RewardViewHolder)?.isLocked = !viewModel.canScoreTask(reward)
+            (holder as? RewardViewHolder)?.bind(reward, position, reward.value <= gold, taskDisplayMode, viewModel.ownerID.value)
         } else if (inAppRewards != null) {
             val item = inAppRewards?.get(position - customRewardCount) ?: return
             if (holder is ShopItemViewHolder) {
@@ -119,7 +113,9 @@ class RewardsRecyclerViewAdapter(
 
     override fun getItemCount(): Int {
         var rewardCount = customRewardCount
-        rewardCount += inAppRewardCount
+        if (viewModel.isPersonalBoard) {
+            rewardCount += inAppRewardCount
+        }
         return rewardCount
     }
 
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 2f38295b6..fd240c504 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
@@ -1,19 +1,17 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks
 
 import android.view.View
-import com.habitrpg.shared.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.models.user.User
-import io.reactivex.rxjava3.core.Flowable
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 
 interface TaskRecyclerViewAdapter {
     var user: User?
     var showAdventureGuide: Boolean
-    var canScoreTasks: Boolean
     var data: List<Task>
 
-    val errorButtonEvents: Flowable<String>
+    var errorButtonEvents: ((String) -> Unit)?
 
     var taskDisplayMode: String
 
@@ -25,9 +23,9 @@ interface TaskRecyclerViewAdapter {
 
     fun updateUnfilteredData(data: List<Task>?)
 
-    val taskScoreEvents: Flowable<Pair<Task, TaskDirection>>
-    val checklistItemScoreEvents: Flowable<Pair<Task, ChecklistItem>>
-    val taskOpenEvents: Flowable<Pair<Task, View>>
-    val brokenTaskEvents: Flowable<Task>
-    val adventureGuideOpenEvents: Flowable<Boolean>?
+    var taskScoreEvents: ((Task, TaskDirection) -> Unit)?
+    var checklistItemScoreEvents: ((Task, ChecklistItem) -> Unit)?
+    var taskOpenEvents: ((Task, View) -> Unit)?
+    var brokenTaskEvents: ((Task) -> Unit)?
+    var adventureGuideOpenEvents: ((Boolean) -> Unit)?
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.kt
index dbebdd259..da757abc4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.kt
@@ -10,16 +10,15 @@ class TodosRecyclerViewAdapter(layoutResource: Int, viewModel: TasksViewModel) :
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return if (viewType == 0) {
             TodoViewHolder(
-                getContentView(parent), { task, direction -> taskScoreEventsSubject.onNext(Pair(task, direction)) },
-                { task, item -> checklistItemScoreSubject.onNext(Pair(task, item)) },
+                getContentView(parent), { task, direction -> taskScoreEvents?.invoke(task, direction) },
+                { task, item -> checklistItemScoreEvents?.invoke(task, item) },
                 {
                         task ->
-                    taskOpenEventsSubject.onNext(task)
-                }
-            ) {
-                    task ->
-                brokenTaskEventsSubject.onNext(task)
-            }
+                    taskOpenEvents?.invoke(task.first, task.second)
+                }, {
+                        task ->
+                    brokenTaskEvents?.invoke(task)
+                }, viewModel)
         } else {
             super.onCreateViewHolder(parent, viewType)
         }
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 c74df6041..e4c8b93d6 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
@@ -16,7 +16,8 @@ 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.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.adapter.AchievementsAdapter
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import kotlinx.coroutines.flow.combine
@@ -93,7 +94,7 @@ class AchievementsFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding
 
         binding?.refreshLayout?.setOnRefreshListener(this)
 
-        lifecycleScope.launch {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             userRepository.getAchievements().combine(userRepository.getQuestAchievements()) { achievements, questAchievements ->
                 return@combine Pair(achievements, questAchievements)
             }.combine(userRepository.getQuestAchievements()
@@ -167,12 +168,8 @@ class AchievementsFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveAchievements().subscribe(
-                {
-                },
-                RxErrorHandler.handleEmptyError(), { binding?.refreshLayout?.isRefreshing = false }
-            )
-        )
+        lifecycleScope.launchCatching {
+            userRepository.retrieveAchievements()
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
index 451d9bc88..8b895d801 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
@@ -4,19 +4,20 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 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.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.functions.Consumer
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment() {
 
@@ -30,8 +31,6 @@ abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment(
     protected var tutorialCanBeDeferred = true
     var tutorialTexts: MutableList<String> = ArrayList()
 
-    protected var compositeSubscription: CompositeDisposable = CompositeDisposable()
-
     open val displayedClassName: String?
         get() = this.javaClass.simpleName
 
@@ -49,8 +48,6 @@ abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        compositeSubscription = CompositeDisposable()
-
         val additionalData = HashMap<String, Any>()
         additionalData["page"] = this.javaClass.simpleName
         AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData)
@@ -68,31 +65,25 @@ abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment(
 
     private fun showTutorialIfNeeded() {
         if (view != null) {
-            if (this.tutorialStepIdentifier != null) {
-                compositeSubscription.add(
-                    tutorialRepository.getTutorialStep(this.tutorialStepIdentifier ?: "").firstElement()
-                        .delay(1, TimeUnit.SECONDS)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(
-                            Consumer { step ->
-                                if (step.isValid && step.isManaged && step.shouldDisplay) {
-                                    val mainActivity = activity as? MainActivity ?: return@Consumer
-                                    mainActivity.displayTutorialStep(step, tutorialTexts, tutorialCanBeDeferred)
-                                }
-                            },
-                            RxErrorHandler.handleEmptyError()
+            tutorialStepIdentifier?.let { identifier ->
+                lifecycleScope.launchCatching {
+                    val step = tutorialRepository.getTutorialStep(identifier).firstOrNull()
+                    delay(1.toDuration(DurationUnit.SECONDS))
+                    if (step?.isValid == true && step.isManaged && step.shouldDisplay) {
+                        val mainActivity = activity as? MainActivity ?: return@launchCatching
+                        mainActivity.displayTutorialStep(
+                            step,
+                            tutorialTexts,
+                            tutorialCanBeDeferred
                         )
-                )
+                    }
+                }
             }
         }
     }
 
     override fun onDestroyView() {
         binding = null
-        if (!compositeSubscription.isDisposed) {
-            compositeSubscription.dispose()
-        }
-
         super.onDestroyView()
     }
 
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 cdf345a05..df1c81f81 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,17 +5,19 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 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.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 abstract class BaseFragment<VB : ViewBinding> : Fragment() {
 
@@ -31,8 +33,6 @@ abstract class BaseFragment<VB : ViewBinding> : Fragment() {
     protected var tutorialCanBeDeferred = true
     var tutorialTexts: List<String> = ArrayList()
 
-    protected var compositeSubscription: CompositeDisposable = CompositeDisposable()
-
     var shouldInitializeComponent = true
 
     open val displayedClassName: String?
@@ -57,8 +57,6 @@ abstract class BaseFragment<VB : ViewBinding> : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        compositeSubscription = CompositeDisposable()
-
         binding = createBinding(inflater, container)
         return binding?.root
     }
@@ -72,30 +70,23 @@ abstract class BaseFragment<VB : ViewBinding> : Fragment() {
 
     private fun showTutorialIfNeeded() {
         tutorialStepIdentifier?.let { identifier ->
-            compositeSubscription.add(
-                tutorialRepository.getTutorialStep(identifier)
-                    .firstElement()
-                    .delay(1, TimeUnit.SECONDS)
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(
-                        { step ->
-                            if (step.isValid && step.isManaged && step.shouldDisplay) {
-                                val mainActivity = activity as? MainActivity ?: return@subscribe
-                                mainActivity.displayTutorialStep(step, tutorialTexts, tutorialCanBeDeferred)
-                            }
-                        },
-                        RxErrorHandler.handleEmptyError()
+            lifecycleScope.launchCatching {
+                val step = tutorialRepository.getTutorialStep(identifier).firstOrNull()
+                delay(1.toDuration(DurationUnit.SECONDS))
+                if (step?.isValid == true && step.isManaged && step.shouldDisplay) {
+                    val mainActivity = activity as? MainActivity ?: return@launchCatching
+                    mainActivity.displayTutorialStep(
+                        step,
+                        tutorialTexts,
+                        tutorialCanBeDeferred
                     )
-            )
+                }
+            }
         }
     }
 
     override fun onDestroyView() {
         binding = null
-        if (!compositeSubscription.isDisposed) {
-            compositeSubscription.dispose()
-        }
-
         super.onDestroyView()
     }
 
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 18a67721d..9ee6475fb 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
@@ -118,11 +118,11 @@ abstract class BaseMainFragment<VB : ViewBinding> : BaseFragment<VB>() {
     }
 
     private fun hideToolbar() {
-        activity?.binding?.content?.avatarWithBars?.root?.visibility = View.GONE
+        activity?.binding?.content?.headerView?.visibility = View.GONE
     }
 
     private fun showToolbar() {
-        activity?.binding?.content?.avatarWithBars?.root?.visibility = View.VISIBLE
+        activity?.binding?.content?.headerView?.visibility = View.VISIBLE
     }
 
     private fun disableToolbarScrolling() {
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 1660fe34f..7d2141e62 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
@@ -29,10 +29,9 @@ import com.habitrpg.android.habitica.databinding.DrawerMainBinding
 import com.habitrpg.android.habitica.extensions.getMinuteOrSeconds
 import com.habitrpg.android.habitica.extensions.getRemainingString
 import com.habitrpg.android.habitica.extensions.getShortRemainingString
-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.helpers.launchCatching
 import com.habitrpg.android.habitica.models.WorldStateEvent
 import com.habitrpg.android.habitica.models.inventory.Item
 import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
@@ -47,12 +46,10 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.common.habitica.extensions.getThemeColor
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import java.util.Calendar
 import java.util.Date
@@ -69,16 +66,22 @@ class NavigationDrawerFragment : DialogFragment() {
 
     @Inject
     lateinit var socialRepository: SocialRepository
+
     @Inject
     lateinit var inventoryRepository: InventoryRepository
+
     @Inject
     lateinit var userRepository: UserRepository
+
     @Inject
     lateinit var configManager: AppConfigManager
+
     @Inject
     lateinit var contentRepository: ContentRepository
+
     @Inject
     lateinit var sharedPreferences: SharedPreferences
+
     @Inject
     lateinit var userViewModel: MainUserViewModel
 
@@ -92,8 +95,6 @@ class NavigationDrawerFragment : DialogFragment() {
 
     private lateinit var adapter: NavigationDrawerAdapter
 
-    private var subscriptions: CompositeDisposable? = null
-
     val isDrawerOpen: Boolean
         get() = drawerLayout?.isDrawerOpen(GravityCompat.START) ?: false
 
@@ -102,11 +103,13 @@ class NavigationDrawerFragment : DialogFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         val context = context
         adapter = if (context != null) {
-            NavigationDrawerAdapter(context.getThemeColor(R.attr.colorPrimary), context.getThemeColor(R.attr.colorPrimaryOffset))
+            NavigationDrawerAdapter(
+                context.getThemeColor(R.attr.colorPrimary),
+                context.getThemeColor(R.attr.colorPrimaryOffset)
+            )
         } else {
             NavigationDrawerAdapter(0, 0)
         }
-        subscriptions = CompositeDisposable()
         HabiticaBaseApplication.userComponent?.inject(this)
         super.onCreate(savedInstanceState)
 
@@ -131,62 +134,40 @@ class NavigationDrawerFragment : DialogFragment() {
         binding = DrawerMainBinding.bind(view)
 
         binding?.recyclerView?.adapter = adapter
-        binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
-        (binding?.recyclerView?.itemAnimator as? SimpleItemAnimator)?.supportsChangeAnimations = false
+        binding?.recyclerView?.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(context)
+        (binding?.recyclerView?.itemAnimator as? SimpleItemAnimator)?.supportsChangeAnimations =
+            false
         initializeMenuItems()
 
-        subscriptions?.add(
-            adapter.getItemSelectionEvents().subscribe(
-                {
+            adapter.itemSelectedEvents = {
                     setSelection(it.transitionId, it.bundle, true)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
-        subscriptions?.add(
-            adapter.getPromoCloseEvents().subscribe(
-                {
+                }
+            adapter.promoClosedSubject = {
                     sharedPreferences.edit {
                         putBoolean("hide$it", true)
                     }
                     updatePromo()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+                }
 
-        subscriptions?.add(
-            Flowable.combineLatest(
-                contentRepository.getWorldState(), inventoryRepository.getAvailableLimitedItems()
-            ) { state, items ->
-                return@combineLatest Pair(state, items)
-            }.subscribe(
-                { pair ->
+        lifecycleScope.launchCatching {
+            contentRepository.getWorldState()
+                .combine(
+                    inventoryRepository.getAvailableLimitedItems()
+                ) { state, items -> Pair(state, items) }
+                .collect { pair ->
                     val gearEvent = pair.first.events.firstOrNull { it.gear }
                     createUpdatingJob("seasonal", {
                         gearEvent?.isCurrentlyActive == true || pair.second.isNotEmpty()
                     }, {
                         val diff = (gearEvent?.end?.time ?: 0) - Date().time
-                        if (diff < (1.toDuration(DurationUnit.HOURS).inWholeMilliseconds)) 1.toDuration(DurationUnit.SECONDS) else 1.toDuration(DurationUnit.MINUTES)
+                        if (diff < (1.toDuration(DurationUnit.HOURS).inWholeMilliseconds)) 1.toDuration(
+                            DurationUnit.SECONDS
+                        ) else 1.toDuration(DurationUnit.MINUTES)
                     }) {
                         updateSeasonalMenuEntries(gearEvent, pair.second)
                     }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
-
-        if (configManager.enableTeamBoards()) {
-            lifecycleScope.launch {
-                userRepository.getTeamPlans()
-                    .distinctUntilChanged()
-                    .collect {
-                        getItemWithIdentifier(SIDEBAR_TEAMS)?.isVisible = it.isNotEmpty()
-                        adapter.setTeams(it)
-                    }
-            }
-        } else {
-            getItemWithIdentifier(SIDEBAR_TEAMS)?.isVisible = false
+                }
         }
 
         userViewModel.user.observe(viewLifecycleOwner) {
@@ -195,8 +176,22 @@ class NavigationDrawerFragment : DialogFragment() {
             }
         }
 
-        binding?.messagesButtonWrapper?.setOnClickListener { setSelection(R.id.inboxFragment, null, true, preventReselection = false) }
-        binding?.settingsButtonWrapper?.setOnClickListener { setSelection(R.id.prefsActivity, null, true, preventReselection = false) }
+        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() }
     }
 
@@ -233,7 +228,8 @@ class NavigationDrawerFragment : DialogFragment() {
         shop.pillText = context?.getString(R.string.open)
         if (gearEvent?.isCurrentlyActive == true) {
             shop.isVisible = true
-            shop.subtitle = context?.getString(R.string.open_for, gearEvent.end?.getShortRemainingString())
+            shop.subtitle =
+                context?.getString(R.string.open_for, gearEvent.end?.getShortRemainingString())
         } else {
             shop.isVisible = false
         }
@@ -242,7 +238,10 @@ class NavigationDrawerFragment : DialogFragment() {
 
     private fun updateUser(user: User) {
         binding?.avatarView?.setOnClickListener {
-            MainNavigationController.navigate(R.id.openProfileActivity, bundleOf(Pair("userID", user.id)))
+            MainNavigationController.navigate(
+                R.id.openProfileActivity,
+                bundleOf(Pair("userID", user.id))
+            )
         }
 
         setMessagesCount(user.inbox)
@@ -303,7 +302,8 @@ class NavigationDrawerFragment : DialogFragment() {
             val daysDiff = TimeUnit.MILLISECONDS.toDays(msDiff)
             if (daysDiff <= 30) {
                 context?.let {
-                    subscriptionItem?.subtitle = user.purchased?.plan?.dateTerminated?.getRemainingString(it.resources)
+                    subscriptionItem?.subtitle =
+                        user.purchased?.plan?.dateTerminated?.getRemainingString(it.resources)
                     subscriptionItem?.subtitleTextColor = when {
                         daysDiff <= 2 -> ContextCompat.getColor(it, R.color.red_100)
                         daysDiff <= 7 -> ContextCompat.getColor(it, R.color.brand_400)
@@ -339,7 +339,6 @@ class NavigationDrawerFragment : DialogFragment() {
     }
 
     override fun onDestroy() {
-        subscriptions?.dispose()
         socialRepository.close()
         inventoryRepository.close()
         userRepository.close()
@@ -351,39 +350,182 @@ class NavigationDrawerFragment : DialogFragment() {
     private fun initializeMenuItems() {
         val items = ArrayList<HabiticaDrawerItem>()
         context?.let { context ->
-            items.add(HabiticaDrawerItem(R.id.tasksFragment, SIDEBAR_TASKS, context.getString(R.string.sidebar_tasks)))
-            items.add(HabiticaDrawerItem(R.id.skillsFragment, SIDEBAR_SKILLS, context.getString(R.string.sidebar_skills)))
-            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(
+                    R.id.tasksFragment,
+                    SIDEBAR_TASKS,
+                    context.getString(R.string.sidebar_tasks)
+                )
+            )
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.skillsFragment,
+                    SIDEBAR_SKILLS,
+                    context.getString(R.string.sidebar_skills)
+                )
+            )
+            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)))
-            val seasonalShopEntry = HabiticaDrawerItem(R.id.seasonalShopFragment, SIDEBAR_SHOPS_SEASONAL, context.getString(R.string.seasonalShop))
+            items.add(
+                HabiticaDrawerItem(
+                    0,
+                    SIDEBAR_INVENTORY,
+                    context.getString(R.string.sidebar_shops),
+                    isHeader = 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)
+                )
+            )
+            val seasonalShopEntry = HabiticaDrawerItem(
+                R.id.seasonalShopFragment,
+                SIDEBAR_SHOPS_SEASONAL,
+                context.getString(R.string.seasonalShop)
+            )
             seasonalShopEntry.isVisible = false
             items.add(seasonalShopEntry)
-            items.add(HabiticaDrawerItem(R.id.timeTravelersShopFragment, SIDEBAR_SHOPS_TIMETRAVEL, context.getString(R.string.timeTravelers)))
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.timeTravelersShopFragment,
+                    SIDEBAR_SHOPS_TIMETRAVEL,
+                    context.getString(R.string.timeTravelers)
+                )
+            )
 
-            items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_section_inventory), true))
-            items.add(HabiticaDrawerItem(R.id.itemsFragment, SIDEBAR_ITEMS, context.getString(R.string.sidebar_items)))
-            items.add(HabiticaDrawerItem(R.id.equipmentOverviewFragment, SIDEBAR_EQUIPMENT, context.getString(R.string.sidebar_equipment)))
-            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)))
+            items.add(
+                HabiticaDrawerItem(
+                    0,
+                    SIDEBAR_INVENTORY,
+                    context.getString(R.string.sidebar_section_inventory),
+                    isHeader = true
+                )
+            )
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.avatarOverviewFragment,
+                    SIDEBAR_AVATAR,
+                    context.getString(R.string.sidebar_avatar_equipment)
+                )
+            )
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.itemsFragment,
+                    SIDEBAR_ITEMS,
+                    context.getString(R.string.sidebar_items)
+                )
+            )
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.stableFragment,
+                    SIDEBAR_STABLE,
+                    context.getString(R.string.sidebar_stable)
+                )
+            )
+            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)
+                )
+            )
 
-            items.add(HabiticaDrawerItem(0, SIDEBAR_SOCIAL, context.getString(R.string.sidebar_section_social), true))
-            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.guildOverviewFragment, SIDEBAR_GUILDS, context.getString(R.string.sidebar_guilds)))
-            items.add(HabiticaDrawerItem(R.id.challengesOverviewFragment, SIDEBAR_CHALLENGES, context.getString(R.string.sidebar_challenges)))
+            items.add(
+                HabiticaDrawerItem(
+                    0,
+                    SIDEBAR_SOCIAL,
+                    context.getString(R.string.sidebar_section_social),
+                    isHeader = true
+                )
+            )
+            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.guildOverviewFragment,
+                    SIDEBAR_GUILDS,
+                    context.getString(R.string.sidebar_guilds)
+                )
+            )
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.challengesOverviewFragment,
+                    SIDEBAR_CHALLENGES,
+                    context.getString(R.string.sidebar_challenges)
+                )
+            )
 
-            items.add(HabiticaDrawerItem(0, SIDEBAR_ABOUT_HEADER, context.getString(R.string.sidebar_about), true))
-            items.add(HabiticaDrawerItem(R.id.newsFragment, SIDEBAR_NEWS, context.getString(R.string.sidebar_news)))
-            items.add(HabiticaDrawerItem(R.id.supportMainFragment, SIDEBAR_HELP, context.getString(R.string.sidebar_help)))
-            items.add(HabiticaDrawerItem(R.id.aboutFragment, SIDEBAR_ABOUT, context.getString(R.string.sidebar_about)))
+            items.add(
+                HabiticaDrawerItem(
+                    0,
+                    SIDEBAR_ABOUT_HEADER,
+                    context.getString(R.string.sidebar_about),
+                    isHeader = true
+                )
+            )
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.newsFragment,
+                    SIDEBAR_NEWS,
+                    context.getString(R.string.sidebar_news)
+                )
+            )
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.supportMainFragment,
+                    SIDEBAR_HELP,
+                    context.getString(R.string.sidebar_help)
+                )
+            )
+            items.add(
+                HabiticaDrawerItem(
+                    R.id.aboutFragment,
+                    SIDEBAR_ABOUT,
+                    context.getString(R.string.sidebar_about)
+                )
+            )
         }
 
         val promoItem = HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_PROMO)
@@ -392,7 +534,8 @@ class NavigationDrawerFragment : DialogFragment() {
         items.add(promoItem)
 
         if (configManager.showSubscriptionBanner()) {
-            val item = HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION_PROMO)
+            val item =
+                HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION_PROMO)
             item.itemViewType = 2
             items.add(item)
         }
@@ -438,14 +581,15 @@ class NavigationDrawerFragment : DialogFragment() {
         }
     }
 
-    private val notificationClickResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            (activity as? MainActivity)?.notificationsViewModel?.click(
-                it.data?.getStringExtra("notificationId") ?: "",
-                MainNavigationController
-            )
+    private val notificationClickResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                (activity as? MainActivity)?.notificationsViewModel?.click(
+                    it.data?.getStringExtra("notificationId") ?: "",
+                    MainNavigationController
+                )
+            }
         }
-    }
 
     /**
      * Users of this fragment must call this method to set UP the navigation drawer interactions.
@@ -465,22 +609,22 @@ 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 {
+        lifecycleScope.launchCatching {
+            viewModel.getNotificationCount().collect {
                 setNotificationsCount(it)
             }
-        )
-        subscriptions?.add(
-            viewModel.allNotificationsSeen().subscribeWithErrorHandler {
+        }
+        lifecycleScope.launchCatching {
+            viewModel.allNotificationsSeen().collect {
                 setNotificationsSeen(it)
             }
-        )
-        subscriptions?.add(
-            viewModel.getHasPartyNotification().subscribeWithErrorHandler {
+        }
+        lifecycleScope.launchCatching {
+            viewModel.getHasPartyNotification().collect {
                 val partyMenuItem = getItemWithIdentifier(SIDEBAR_PARTY)
                 partyMenuItem?.showBubble = it
             }
-        )
+        }
     }
 
     fun openDrawer() {
@@ -607,15 +751,20 @@ class NavigationDrawerFragment : DialogFragment() {
             }
             if (promotedItem == null) return@let
             promotedItem.pillText = context?.getString(R.string.sale)
-            promotedItem.pillBackground = context?.let { activePromo.pillBackgroundDrawable(it) }
+            promotedItem.pillBackground =
+                context?.let { activePromo.pillBackgroundDrawable(it) }
             createUpdatingJob(activePromo.promoType.name, {
                 activePromo.isActive
             }, {
-                val diff = (activePromo.endDate.time - Date().time).toDuration(DurationUnit.SECONDS)
+                val diff =
+                    (activePromo.endDate.time - Date().time).toDuration(DurationUnit.SECONDS)
                 1.toDuration(diff.getMinuteOrSeconds())
             }) {
                 if (activePromo.isActive) {
-                    promotedItem.subtitle = context?.getString(R.string.sale_ends_in, activePromo.endDate.getShortRemainingString())
+                    promotedItem.subtitle = context?.getString(
+                        R.string.sale_ends_in,
+                        activePromo.endDate.getShortRemainingString()
+                    )
                     updateItem(promotedItem)
                 } else {
                     promotedItem.subtitle = null
@@ -635,7 +784,6 @@ class NavigationDrawerFragment : DialogFragment() {
         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 71d6db932..ff54e804f 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
@@ -6,11 +6,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebChromeClient
-import com.habitrpg.android.habitica.BuildConfig
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentNewsBinding
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import kotlinx.coroutines.launch
 
 class NewsFragment : BaseMainFragment<FragmentNewsBinding>() {
 
@@ -29,13 +34,38 @@ class NewsFragment : BaseMainFragment<FragmentNewsBinding>() {
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
+    private val webviewClient = object : WebViewClient() {
+
+        override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
+            if (url?.contains("/static/new-stuff") == true) {
+                view?.loadUrl(url)
+            } else if (url != null) {
+                    MainNavigationController.navigate(url)
+            }
+            return true
+        }
+
+        override fun shouldOverrideUrlLoading(
+            view: WebView?,
+            request: WebResourceRequest?
+        ): Boolean {
+            if (request?.url?.path == "/static/new-stuff") {
+                view?.loadUrl(request.url.toString())
+            } else {
+                request?.url?.let { MainNavigationController.navigate(it) }
+            }
+            return true
+        }
+    }
+
     @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 address = context?.getString(R.string.base_url)
         val webSettings = binding?.newsWebview?.settings
         webSettings?.javaScriptEnabled = true
         webSettings?.domStorageEnabled = true
+        binding?.newsWebview?.webViewClient = webviewClient
         binding?.newsWebview?.webChromeClient = object : WebChromeClient() {
         }
         binding?.newsWebview?.loadUrl("$address/static/new-stuff")
@@ -47,6 +77,8 @@ class NewsFragment : BaseMainFragment<FragmentNewsBinding>() {
 
     override fun onResume() {
         super.onResume()
-        compositeSubscription.add(userRepository.updateUser("flags.newStuff", false).subscribeWithErrorHandler({}))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.updateUser("flags.newStuff", false)
+        }
     }
 }
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 045c5218a..6476bd335 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
@@ -5,23 +5,25 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 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.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentStatsBinding
 import com.habitrpg.android.habitica.extensions.addOkButton
-import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.setScaledPadding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.UserStatComputer
-import com.habitrpg.shared.habitica.models.tasks.Attribute
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 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 com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.shared.habitica.models.tasks.Attribute
+import kotlinx.coroutines.flow.firstOrNull
 import javax.inject.Inject
 import kotlin.math.min
 
@@ -131,8 +133,9 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
         }
 
         binding?.automaticAllocationSwitch?.setOnCheckedChangeListener { _, isChecked ->
-            userRepository.updateUser("preferences.automaticAllocation", isChecked)
-                .subscribe({}, RxErrorHandler.handleEmptyError())
+            lifecycleScope.launchCatching {
+                userRepository.updateUser("preferences.automaticAllocation", isChecked)
+            }
         }
 
         binding?.strengthStatsView?.allocateAction = { allocatePoint(Attribute.STRENGTH) }
@@ -159,12 +162,12 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
     }
 
     private fun changeAutoAllocationMode(allocationMode: String) {
-        compositeSubscription.add(
+        lifecycleScope.launchCatching {
             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
@@ -178,9 +181,9 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
     }
 
     private fun allocatePoint(stat: Attribute) {
-        compositeSubscription.add(
-            userRepository.allocatePoint(stat).subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        lifecycleScope.launchCatching {
+            userRepository.allocatePoint(stat)
+        }
     }
 
     private fun updateAttributePoints(user: User) {
@@ -260,74 +263,68 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
             outfitList.add(thisOutfit.weapon)
         }
 
-        compositeSubscription.add(
-            inventoryRepository.getEquipment(outfitList).firstElement()
-                .retry(1)
-                .subscribe(
-                    {
-                        val levelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
+        lifecycleScope.launchCatching {
+            val equipment = inventoryRepository.getEquipment(outfitList).firstOrNull()
+            val levelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
 
-                        totalStrength = levelStat
-                        totalIntelligence = levelStat
-                        totalConstitution = levelStat
-                        totalPerception = levelStat
+            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 += 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 += 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 += 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 userStatComputer = UserStatComputer()
-                        val statsRows = userStatComputer.computeClassBonus(it, user)
+            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 userStatComputer = UserStatComputer()
+            val statsRows = userStatComputer.computeClassBonus(equipment, user)
 
-                        var strength = 0
-                        var intelligence = 0
-                        var constitution = 0
-                        var perception = 0
+            var strength = 0
+            var intelligence = 0
+            var constitution = 0
+            var perception = 0
 
-                        for (row in statsRows) {
-                            if (row.javaClass == UserStatComputer.AttributeRow::class.java) {
-                                val attributeRow = row as UserStatComputer.AttributeRow
-                                strength += attributeRow.strVal.toInt()
-                                intelligence += attributeRow.intVal.toInt()
-                                constitution += attributeRow.conVal.toInt()
-                                perception += attributeRow.perVal.toInt()
-                            }
-                        }
+            for (row in statsRows) {
+                if (row.javaClass == UserStatComputer.AttributeRow::class.java) {
+                    val attributeRow = row as UserStatComputer.AttributeRow
+                    strength += attributeRow.strVal.toInt()
+                    intelligence += attributeRow.intVal.toInt()
+                    constitution += attributeRow.conVal.toInt()
+                    perception += attributeRow.perVal.toInt()
+                }
+            }
 
-                        totalStrength += strength
-                        totalIntelligence += intelligence
-                        totalConstitution += constitution
-                        totalPerception += perception
-                        binding?.strengthStatsView?.equipmentValue = strength
-                        binding?.intelligenceStatsView?.equipmentValue = intelligence
-                        binding?.constitutionStatsView?.equipmentValue = constitution
-                        binding?.perceptionStatsView?.equipmentValue = perception
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+            totalStrength += strength
+            totalIntelligence += intelligence
+            totalConstitution += constitution
+            totalPerception += perception
+            binding?.strengthStatsView?.equipmentValue = strength
+            binding?.intelligenceStatsView?.equipmentValue = intelligence
+            binding?.constitutionStatsView?.equipmentValue = constitution
+            binding?.perceptionStatsView?.equipmentValue = perception
+        }
     }
 }
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 36f2569ce..919977db5 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
@@ -12,6 +12,7 @@ import android.view.ViewGroup
 import android.widget.CheckBox
 import androidx.core.content.ContextCompat
 import androidx.core.view.doOnLayout
+import androidx.lifecycle.lifecycleScope
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.flexbox.AlignItems
 import com.google.android.flexbox.FlexDirection.ROW
@@ -24,7 +25,8 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.BottomSheetBackgroundsFilterBinding
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.setTintWith
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.CustomizationFilter
 import com.habitrpg.android.habitica.models.inventory.Customization
 import com.habitrpg.android.habitica.models.user.OwnedCustomization
@@ -37,10 +39,10 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.getThemeColor
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.kotlin.combineLatest
-import io.reactivex.rxjava3.subjects.BehaviorSubject
-import io.reactivex.rxjava3.subjects.PublishSubject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class AvatarCustomizationFragment :
@@ -68,8 +70,8 @@ class AvatarCustomizationFragment :
     internal var adapter: CustomizationRecyclerViewAdapter = CustomizationRecyclerViewAdapter()
     internal var layoutManager: FlexboxLayoutManager = FlexboxLayoutManager(activity, ROW)
 
-    private val currentFilter = BehaviorSubject.create<CustomizationFilter>()
-    private val ownedCustomizations = PublishSubject.create<List<OwnedCustomization>>()
+    private val currentFilter = MutableStateFlow<CustomizationFilter>(CustomizationFilter(false, type != "background"))
+    private val ownedCustomizations = MutableStateFlow<List<OwnedCustomization>>(emptyList())
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -77,27 +79,26 @@ class AvatarCustomizationFragment :
         savedInstanceState: Bundle?
     ): View? {
         showsBackButton = true
-        compositeSubscription.add(
-            adapter.getSelectCustomizationEvents()
-                .flatMap { customization ->
+            adapter.onCustomizationSelected = { customization ->
+                lifecycleScope.launchCatching {
                     if (customization.type == "background") {
-                        val using = if (customization.identifier?.isBlank() != false) {
-                            customization.unlockPath + activeCustomization
-                        } else customization.unlockPath
-                        userRepository.unlockPath(using, 0)
-                            .flatMap { userRepository.retrieveUser(false, true, true) }
+                        userRepository.unlockPath(customization)
+                        userRepository.retrieveUser(false, true, true)
                     } else {
-                        userRepository.useCustomization(customization.type ?: "", customization.category, customization.identifier ?: "")
+                        userRepository.useCustomization(
+                            customization.type ?: "",
+                            customization.category,
+                            customization.identifier ?: ""
+                        )
                     }
                 }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+            }
 
-        compositeSubscription.add(
-            this.inventoryRepository.getInAppRewards()
+        lifecycleScope.launchCatching {
+            inventoryRepository.getInAppRewards()
                 .map { rewards -> rewards.map { it.key } }
-                .subscribe({ adapter.setPinnedItemKeys(it) }, RxErrorHandler.handleEmptyError())
-        )
+                .collect { adapter.setPinnedItemKeys(it) }
+        }
 
         return super.onCreateView(inflater, container, savedInstanceState)
     }
@@ -125,7 +126,6 @@ class AvatarCustomizationFragment :
         this.loadCustomizations()
 
         userViewModel.user.observe(viewLifecycleOwner) { updateUser(it) }
-        currentFilter.onNext(CustomizationFilter(false, type != "background"))
 
         binding?.recyclerView?.doOnLayout {
             adapter.columnCount = it.width / (80.dpToPx(context))
@@ -180,15 +180,13 @@ class AvatarCustomizationFragment :
 
     private fun loadCustomizations() {
         val type = this.type ?: return
-        compositeSubscription.add(
+        lifecycleScope.launchCatching {
             customizationRepository.getCustomizations(type, category, false)
-                .combineLatest(
-                    currentFilter.toFlowable(BackpressureStrategy.DROP),
-                    ownedCustomizations.toFlowable(BackpressureStrategy.DROP)
-                )
-                .subscribe(
-                    { (customizations, filter, ownedCustomizations) ->
-                        adapter.ownedCustomizations = ownedCustomizations.map { it.key + "_" + it.type + "_" + it.category }
+                .combine(currentFilter) { customizations, filter -> Pair(customizations, filter) }
+                .combine(ownedCustomizations) { pair, ownedCustomizations -> Triple(pair.first, pair.second, ownedCustomizations) }
+                .collect { (customizations, filter, ownedCustomizations) ->
+                        adapter.ownedCustomizations =
+                            ownedCustomizations.map { it.key + "_" + it.type + "_" + it.category }
                         if (filter.isFiltering) {
                             val displayedCustomizations = mutableListOf<Customization>()
                             for (customization in customizations) {
@@ -211,13 +209,15 @@ class AvatarCustomizationFragment :
                                 }
                             )
                         }
-                    },
-                    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({ adapter.additionalSetItems = it }, RxErrorHandler.handleEmptyError()))
+            lifecycleScope.launchCatching {
+                customizationRepository.getCustomizations(type, otherCategory, true).collect {
+                    adapter.additionalSetItems = it
+                }
+            }
         }
     }
 
@@ -228,13 +228,13 @@ class AvatarCustomizationFragment :
     ): Boolean {
         return if (filter.onlyPurchased && ownedCustomizations.find { it.key == customization.identifier } == null) {
             true
-        } else filter.months.isNotEmpty() && !filter.months.contains(customization.customizationSetName?.substringAfter('.'))
+        } else filter.months.isNotEmpty() && !filter.months.contains(customization.customizationSet?.substringAfter('.'))
     }
 
     fun updateUser(user: User?) {
         if (user == null) return
         this.updateActiveCustomization(user)
-        ownedCustomizations.onNext(user.purchased?.customizations?.filter { it.type == this.type && it.purchased })
+        ownedCustomizations.value = user.purchased?.customizations?.filter { it.type == this.type && it.purchased } ?: emptyList()
         this.adapter.userSize = user.preferences?.size
         this.adapter.hairColor = user.preferences?.hair?.color
         this.adapter.gemBalance = user.gemCount
@@ -270,14 +270,10 @@ class AvatarCustomizationFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(withTasks = false, forced = true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     fun showFilterDialog() {
@@ -288,17 +284,17 @@ class AvatarCustomizationFragment :
         binding.showMeWrapper.check(if (filter.onlyPurchased) R.id.show_purchased_button else R.id.show_all_button)
         binding.showMeWrapper.setOnCheckedChangeListener { _, checkedId ->
             filter.onlyPurchased = checkedId == R.id.show_purchased_button
-            currentFilter.onNext(filter)
+            currentFilter.value = filter
         }
         binding.clearButton.setOnClickListener {
-            currentFilter.onNext(CustomizationFilter(false, type != "background"))
+            currentFilter.value = CustomizationFilter(false, type != "background")
             dialog.dismiss()
         }
         if (type == "background") {
             binding.sortByWrapper.check(if (filter.ascending) R.id.oldest_button else R.id.newest_button)
             binding.sortByWrapper.setOnCheckedChangeListener { _, checkedId ->
                 filter.ascending = checkedId == R.id.oldest_button
-                currentFilter.onNext(filter)
+                currentFilter.value = filter
             }
             configureMonthFilterButton(binding.januaryButton, 1, filter)
             configureMonthFilterButton(binding.febuaryButton, 2, filter)
@@ -335,7 +331,7 @@ class AvatarCustomizationFragment :
                 button.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
                 filter.months.add(identifier)
             }
-            currentFilter.onNext(filter)
+            currentFilter.value = filter
         }
     }
 }
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
deleted file mode 100644
index b1ced47f0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.customization
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.GridLayoutManager
-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.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.responses.UnlockResponse
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.adapter.CustomizationEquipmentRecyclerViewAdapter
-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.viewmodels.MainUserViewModel
-import io.reactivex.rxjava3.core.Flowable
-import javax.inject.Inject
-
-class AvatarEquipmentFragment :
-    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
-    SwipeRefreshLayout.OnRefreshListener {
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    override var binding: FragmentRefreshRecyclerviewBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
-        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    var type: String? = null
-    var category: String? = null
-    private var activeEquipment: String? = null
-
-    internal var adapter: CustomizationEquipmentRecyclerViewAdapter = CustomizationEquipmentRecyclerViewAdapter()
-    internal var layoutManager: GridLayoutManager = GridLayoutManager(activity, 2)
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        showsBackButton = true
-        compositeSubscription.add(
-            adapter.getSelectCustomizationEvents()
-                .flatMap { equipment ->
-                    val key = (if (equipment.key?.isNotBlank() != true) activeEquipment else equipment.key) ?: ""
-                    inventoryRepository.equip(if (userViewModel.user.value?.preferences?.costume == true) "costume" else "equipped", key)
-                }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
-        compositeSubscription.add(
-            adapter.getUnlockCustomizationEvents()
-                .flatMap<UnlockResponse> {
-                    Flowable.empty()
-                }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        showsBackButton = true
-        super.onViewCreated(view, savedInstanceState)
-        arguments?.let {
-            val args = AvatarEquipmentFragmentArgs.fromBundle(it)
-            type = args.type
-            if (args.category.isNotEmpty()) {
-                category = args.category
-            }
-        }
-        binding?.refreshLayout?.setOnRefreshListener(this)
-        setGridSpanCount(view.width)
-        val layoutManager = GridLayoutManager(activity, 4)
-        layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
-            override fun getSpanSize(position: Int): Int {
-                return if (adapter.getItemViewType(position) == 0) {
-                    layoutManager.spanCount
-                } else {
-                    1
-                }
-            }
-        }
-        binding?.recyclerView?.layoutManager = layoutManager
-        binding?.recyclerView?.addItemDecoration(MarginDecoration(context))
-
-        binding?.recyclerView?.adapter = adapter
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-        this.loadEquipment()
-
-        userViewModel.user.observe(viewLifecycleOwner) { updateUser(it) }
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    private fun loadEquipment() {
-        val type = this.type ?: return
-        compositeSubscription.add(
-            inventoryRepository.getEquipmentType(type, category ?: "").subscribe(
-                {
-                    adapter.setEquipment(it)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
-    }
-
-    private fun setGridSpanCount(width: Int) {
-        val itemWidth = context?.resources?.getDimension(R.dimen.customization_width) ?: 0F
-        var spanCount = (width / itemWidth).toInt()
-        if (spanCount == 0) {
-            spanCount = 1
-        }
-        layoutManager.spanCount = spanCount
-    }
-
-    fun updateUser(user: User?) {
-        this.updateActiveCustomization(user)
-        this.adapter.gemBalance = user?.gemCount ?: 0
-        adapter.notifyDataSetChanged()
-    }
-
-    private fun updateActiveCustomization(user: User?) {
-        if (this.type == null || user?.preferences == null) {
-            return
-        }
-        val outfit = if (user.preferences?.costume == true) user.items?.gear?.costume else user.items?.gear?.equipped
-        val activeEquipment = when (this.type) {
-            "headAccessory" -> outfit?.headAccessory
-            "back" -> outfit?.back
-            "eyewear" -> outfit?.eyeWear
-            else -> ""
-        }
-        if (activeEquipment != null) {
-            this.activeEquipment = activeEquipment
-            this.adapter.activeEquipment = activeEquipment
-        }
-    }
-
-    override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index bd88ff5fe..11ae5b17d 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
@@ -5,46 +5,69 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Switch
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding
+import com.habitrpg.android.habitica.databinding.FragmentComposeScrollingBinding
 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.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.AvatarCustomizationOverviewView
+import com.habitrpg.android.habitica.ui.views.EquipmentOverviewView
+import com.habitrpg.android.habitica.ui.views.SegmentedControl
 import javax.inject.Inject
 
-class AvatarOverviewFragment : BaseMainFragment<FragmentAvatarOverviewBinding>(), AdapterView.OnItemSelectedListener {
+class AvatarOverviewFragment : BaseMainFragment<FragmentComposeScrollingBinding>(),
+    AdapterView.OnItemSelectedListener {
 
     @Inject
     lateinit var userViewModel: MainUserViewModel
 
-    override var binding: FragmentAvatarOverviewBinding? = null
+    override var binding: FragmentComposeScrollingBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentAvatarOverviewBinding {
-        return FragmentAvatarOverviewBinding.inflate(inflater, container, false)
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentComposeScrollingBinding {
+        return FragmentComposeScrollingBinding.inflate(inflater, container, false)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        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) }
-
-        userViewModel.user.observe(viewLifecycleOwner) { updateUser(it) }
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = super.onCreateView(inflater, container, savedInstanceState)
+        binding?.composeView?.apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                HabiticaTheme {
+                    AvatarOverviewView(userViewModel, { type, category ->
+                        displayCustomizationFragment(type, category)
+                    }, { type, equipped, isCostume ->
+                        displayEquipmentFragment(type, equipped, isCostume)
+                    })
+                }
+            }
+        }
+        return view
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -52,56 +75,94 @@ class AvatarOverviewFragment : BaseMainFragment<FragmentAvatarOverviewBinding>()
     }
 
     private fun displayCustomizationFragment(type: String, category: String?) {
-        MainNavigationController.navigate(AvatarOverviewFragmentDirections.openAvatarDetail(type, category ?: ""))
+        MainNavigationController.navigate(
+            AvatarOverviewFragmentDirections.openAvatarDetail(
+                type,
+                category ?: ""
+            )
+        )
     }
 
-    private fun displayEquipmentFragment(type: String, category: String?) {
-        MainNavigationController.navigate(AvatarOverviewFragmentDirections.openAvatarEquipment(type, category ?: ""))
-    }
-
-    fun updateUser(user: User?) {
-        this.setSize(user?.preferences?.size)
-        setCustomizations(user)
-    }
-
-    private fun setCustomizations(user: User?) {
-        if (user == null) return
-        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
-    }
-
-    private fun setSize(size: String?) {
-        if (size == null) {
-            return
-        }
-        if (size == "slim") {
-            binding?.avatarSizeSpinner?.setSelection(0, false)
-        } else {
-            binding?.avatarSizeSpinner?.setSelection(1, false)
-        }
+    private fun displayEquipmentFragment(type: String, equipped: String?, isCostume: Boolean = false) {
+        MainNavigationController.navigate(AvatarOverviewFragmentDirections.openEquipmentDetail(type, isCostume, equipped ?: ""))
     }
 
     override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
         val newSize: String = if (position == 0) "slim" else "broad"
 
-        compositeSubscription.add(
+        lifecycleScope.launchCatching {
             userRepository.updateUser("preferences.size", newSize)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 
-    override fun onNothingSelected(parent: AdapterView<*>) { /* no-on */ }
+    override fun onNothingSelected(parent: AdapterView<*>) { /* no-on */
+    }
 }
+
+@Composable
+fun AvatarOverviewView(userViewModel: MainUserViewModel,
+    onCustomizationTap: (String, String?) -> Unit,
+    onEquipmentTap: (String, String?, Boolean) -> Unit
+    ) {
+    val user by userViewModel.user.observeAsState()
+    Column(
+        Modifier
+            .padding(horizontal = 8.dp)
+            .padding(bottom = 16.dp)) {
+        Row(Modifier.padding(horizontal = 12.dp, vertical = 15.dp),
+            verticalAlignment = Alignment.CenterVertically) {
+            Text(
+                stringResource(R.string.avatar_size),
+                style = HabiticaTheme.typography.subtitle2
+            )
+            Spacer(modifier = Modifier.weight(1f))
+            SegmentedControl(items = listOf(stringResource(R.string.avatar_size_slim), stringResource(R.string.avatar_size_broad
+            )), defaultSelectedItemIndex = if (user?.preferences?.size == "slim") 0 else 1, onItemSelection = {
+                userViewModel.updateUser("preferences.size", if (it == 0) "slim" else "broad")
+            })
+        }
+        AvatarCustomizationOverviewView(user?.preferences, onCustomizationTap)
+        Row(
+            Modifier
+                .padding(horizontal = 12.dp)
+                .padding(top = 15.dp),
+            verticalAlignment = Alignment.CenterVertically) {
+            Text(stringResource(R.string.equipped), style = HabiticaTheme.typography.subtitle2)
+            Spacer(modifier = Modifier.weight(1f))
+            Text(
+                stringResource(R.string.equip_automatically),
+                style = HabiticaTheme.typography.body2
+            )
+            Switch(checked = user?.preferences?.autoEquip == true, onCheckedChange = {
+                userViewModel.updateUser("preferences.autoEquip", it)
+            })
+        }
+        EquipmentOverviewView(user?.items?.gear?.equipped, { type, equipped ->
+            onEquipmentTap(type, equipped, false)
+        })
+        Row(
+            Modifier
+                .padding(horizontal = 12.dp)
+                .padding(top = 15.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                stringResource(R.string.costume),
+                style = HabiticaTheme.typography.subtitle2
+            )
+            Spacer(modifier = Modifier.weight(1f))
+            Text(
+                stringResource(R.string.wear_costume),
+                style = HabiticaTheme.typography.body2
+            )
+            Switch(checked = user?.preferences?.costume == true, onCheckedChange = {
+                userViewModel.updateUser("preferences.costume", it)
+            })
+        }
+        AnimatedVisibility(visible = user?.preferences?.costume == true) {
+            EquipmentOverviewView(user?.items?.gear?.costume, { type, equipped ->
+                onEquipmentTap(type, equipped, true)
+            })
+        }
+    }
+}
\ No newline at end of file
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 68275bca6..0f6e84cfc 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
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -11,12 +12,14 @@ 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.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.common.habitica.helpers.EmptyItem
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class EquipmentDetailFragment :
@@ -43,10 +46,11 @@ class EquipmentDetailFragment :
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        compositeSubscription.add(
-            this.adapter.equipEvents.flatMapMaybe { key -> inventoryRepository.equipGear(key, isCostume ?: false).firstElement() }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        adapter.onEquip = {
+            lifecycleScope.launchCatching {
+                inventoryRepository.equipGear(it, isCostume ?: false)
+            }
+        }
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
@@ -80,7 +84,11 @@ class EquipmentDetailFragment :
         binding?.recyclerView?.addItemDecoration(DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL))
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
-        type?.let { type -> inventoryRepository.getOwnedEquipment(type).subscribe({ this.adapter.data = it }, RxErrorHandler.handleEmptyError()) }
+        type?.let { type ->
+            lifecycleScope.launchCatching {
+                inventoryRepository.getOwnedEquipment(type).collect { adapter.data = it }
+            }
+        }
     }
 
     override fun onDestroy() {
@@ -93,13 +101,9 @@ class EquipmentDetailFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 }
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
deleted file mode 100644
index 7925ca84e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.equipment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.viewModels
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.databinding.FragmentEquipmentOverviewBinding
-import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.user.Gear
-import com.habitrpg.android.habitica.models.user.Outfit
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.viewmodels.inventory.equipment.EquipmentOverviewViewModel
-import com.habitrpg.android.habitica.ui.views.equipment.EquipmentOverviewView
-
-class EquipmentOverviewFragment : BaseMainFragment<FragmentEquipmentOverviewBinding>() {
-
-    private val viewModel: EquipmentOverviewViewModel by viewModels()
-
-    override var binding: FragmentEquipmentOverviewBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentEquipmentOverviewBinding {
-        return FragmentEquipmentOverviewBinding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding?.battlegearView?.onNavigate = { type, equipped ->
-            displayEquipmentDetailList(type, equipped, false)
-        }
-        binding?.costumeView?.onNavigate = { type, equipped ->
-            displayEquipmentDetailList(type, equipped, true)
-        }
-
-        binding?.autoEquipSwitch?.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked == viewModel.user.value?.preferences?.autoEquip) return@setOnCheckedChangeListener
-            viewModel.updateUser("preferences.autoEquip", isChecked)
-        }
-        binding?.costumeSwitch?.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked == viewModel.user.value?.preferences?.costume) return@setOnCheckedChangeListener
-            viewModel.updateUser("preferences.costume", isChecked)
-        }
-
-        viewModel.user.observe(viewLifecycleOwner) {
-            it?.items?.gear?.let {
-                updateGearData(it)
-            }
-            binding?.autoEquipSwitch?.isChecked = viewModel.usesAutoEquip
-            binding?.costumeSwitch?.isChecked = viewModel.usesCostume
-
-            binding?.costumeView?.isEnabled = viewModel.usesCostume
-        }
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    private fun displayEquipmentDetailList(type: String, equipped: String?, isCostume: Boolean?) {
-        MainNavigationController.navigate(EquipmentOverviewFragmentDirections.openEquipmentDetail(type, isCostume ?: false, equipped ?: ""))
-    }
-
-    private fun updateGearData(gear: Gear) {
-        updateOutfit(binding?.battlegearView, gear.equipped)
-        updateOutfit(binding?.costumeView, gear.costume)
-    }
-
-    private fun updateOutfit(view: EquipmentOverviewView?, outfit: Outfit?) {
-        if (outfit?.weapon?.isNotEmpty() == true) {
-            viewModel.getGear(outfit.weapon) {
-                if (it.isValid) {
-                    view?.updateData(outfit, it.twoHanded)
-                }
-            }
-        } else {
-            view?.updateData(outfit)
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
index 60b908cfa..fafd3ead9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
@@ -14,9 +14,9 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentItemsDialogBinding
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.observeOnce
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.interactors.FeedPetUseCase
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Egg
@@ -31,12 +31,11 @@ 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.BaseDialogFragment
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
-import io.reactivex.rxjava3.disposables.CompositeDisposable
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.EmptyItem
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -45,8 +44,6 @@ import javax.inject.Inject
 
 class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
 
-    var parentSubscription: CompositeDisposable? = null
-
     @Inject
     lateinit var inventoryRepository: InventoryRepository
     @Inject
@@ -183,67 +180,53 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                 adapter?.feedingPet = this.feedingPet
             }
             binding?.recyclerView?.adapter = adapter
-
-            adapter?.let { adapter ->
-                compositeSubscription.add(
-                    adapter.getSellItemFlowable()
-                        .flatMap { item -> inventoryRepository.sellItem(item) }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
-                )
-
-                compositeSubscription.add(
-                    adapter.getQuestInvitationFlowable()
-                        .flatMap { quest -> inventoryRepository.inviteToQuest(quest) }
-                        .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) {
-                                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("equipped", it.key ?: "").subscribe({}, RxErrorHandler.handleEmptyError())
-                                }
-                                dialog.addCloseButton()
-                                dialog.enqueue()
+            adapter?.onSellItem = {
+                lifecycleScope.launchCatching {
+                    inventoryRepository.sellItem(it)
+                }
+            }
+            adapter?.onQuestInvitation = {
+                lifecycleScope.launchCatching {
+                    inventoryRepository.inviteToQuest(it)
+                    MainNavigationController.navigate(R.id.partyFragment)
+                }
+            }
+            adapter?.onOpenMysteryItem = {
+                lifecycleScope.launchCatching {
+                    val item = inventoryRepository.openMysteryItem(user) ?: return@launchCatching
+                    val activity = activity as? MainActivity
+                    if (activity != null) {
+                        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 = item.text
+                        dialog.binding.descriptionView.text = item.notes
+                        dialog.addButton(R.string.equip, true) { _, _ ->
+                            lifecycleScope.launchCatching {
+                                inventoryRepository.equip("equipped", it.key)
                             }
                         }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
-                )
-                compositeSubscription.add(adapter.hatchPetEvents.subscribeWithErrorHandler { hatchPet(it.first, it.second) })
-                compositeSubscription.add(adapter.feedPetEvents.subscribeWithErrorHandler { feedPet(it) })
+                        dialog.addCloseButton()
+                        dialog.enqueue()
+                    }
+                }
             }
+            adapter?.onHatchPet = { pet, egg -> hatchPet(pet, egg) }
         }
     }
 
     private fun feedPet(food: Food) {
         val pet = feedingPet ?: return
         val activity = activity ?: return
-        parentSubscription?.add(
-            feedPetUseCase.observable(
+        lifecycleScope.launchCatching {
+            feedPetUseCase.callInteractor(
                 FeedPetUseCase.RequestValues(
                     pet, food,
                     activity
                 )
-            ).subscribeWithErrorHandler {}
-        )
+            )
+        }
     }
 
     override fun onResume() {
@@ -265,14 +248,14 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
     private fun hatchPet(potion: HatchingPotion, egg: Egg) {
         dismiss()
         val activity = activity ?: return
-        parentSubscription?.add(
-            hatchPetUseCase.observable(
+        activity.lifecycleScope.launchCatching {
+            hatchPetUseCase.callInteractor(
                 HatchPetUseCase.RequestValues(
                     potion, egg,
                     activity
                 )
-            ).subscribeWithErrorHandler {}
-        )
+            )
+        }
     }
 
     private fun loadItems() {
@@ -285,7 +268,7 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
             else -> Egg::class.java
         }
         itemType?.let { type ->
-                lifecycleScope.launch {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     inventoryRepository.getOwnedItems(type)
                         .onEach { items ->
                             val filteredItems = if (isFeeding) {
@@ -296,7 +279,7 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                             adapter?.data = filteredItems
                         }
                         .map { items -> items.mapNotNull { it.key } }
-                        .map { inventoryRepository.getItemsFlowable(itemClass, it.toTypedArray()).firstOrNull() }
+                        .map { inventoryRepository.getItems(itemClass, it.toTypedArray()).firstOrNull() }
                         .collect {
                             val itemMap = mutableMapOf<String, Item>()
                             for (item in it ?: emptyList()) {
@@ -306,10 +289,10 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                         }
 
                 }
-                lifecycleScope.launch {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     inventoryRepository.getPets().collect { adapter?.setExistingPets(it) }
                 }
-                lifecycleScope.launch {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     inventoryRepository.getOwnedPets().map { ownedPets ->
                         val petMap = mutableMapOf<String, OwnedPet>()
                         ownedPets.forEach { petMap[it.key ?: ""] = it }
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 863bb60a1..b654c31c0 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
@@ -18,9 +18,9 @@ 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.observeOnce
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Food
@@ -28,7 +28,6 @@ import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.models.inventory.Item
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.SpecialItem
-import com.habitrpg.android.habitica.models.responses.SkillResponse
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
@@ -37,14 +36,13 @@ import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
 import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
-import io.reactivex.rxjava3.core.Flowable
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.EmptyItem
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -142,50 +140,42 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
                 adapter = ItemRecyclerAdapter(context)
             }
             binding?.recyclerView?.adapter = adapter
-            adapter?.useSpecialEvents?.subscribeWithErrorHandler { onSpecialItemSelected(it) }?.let { compositeSubscription.add(it) }
-            adapter?.let { adapter ->
-                compositeSubscription.add(
-                    adapter.getSellItemFlowable()
-                        .flatMap { item -> inventoryRepository.sellItem(item) }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
-                )
-
-                compositeSubscription.add(
-                    adapter.getQuestInvitationFlowable()
-                        .flatMap { quest -> inventoryRepository.inviteToQuest(quest) }
-                        .flatMap { socialRepository.retrieveGroup("party") }
-                        .subscribe(
-                            {
-                                MainNavigationController.navigate(R.id.partyFragment)
-                            },
-                            RxErrorHandler.handleEmptyError()
-                        )
-                )
-                compositeSubscription.add(
-                    adapter.getOpenMysteryItemFlowable()
-                        .flatMap { inventoryRepository.openMysteryItem(user) }
-                        .doOnNext {
-                            val activity = activity as? MainActivity
-                            if (activity != null) {
-                                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("equipped", it.key ?: "").subscribe({}, RxErrorHandler.handleEmptyError())
-                                }
-                                dialog.addCloseButton()
-                                dialog.enqueue()
+            adapter?.onUseSpecialItem = { onSpecialItemSelected(it) }
+            adapter?.onSellItem = {
+                lifecycleScope.launchCatching {
+                    inventoryRepository.sellItem(it)
+                }
+            }
+            adapter?.onQuestInvitation = {
+                lifecycleScope.launchCatching {
+                    inventoryRepository.inviteToQuest(it)
+                    MainNavigationController.navigate(R.id.partyFragment)
+                }
+            }
+            adapter?.onOpenMysteryItem = {
+                lifecycleScope.launchCatching {
+                    val item = inventoryRepository.openMysteryItem(user) ?: return@launchCatching
+                    val activity = activity as? MainActivity
+                    if (activity != null) {
+                        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 = item.text
+                        dialog.binding.descriptionView.text = item.notes
+                        dialog.addButton(R.string.equip, true) { _, _ ->
+                            lifecycleScope.launchCatching {
+                                inventoryRepository.equip("equipped", it.key)
                             }
                         }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
-                )
-                compositeSubscription.add(adapter.startHatchingEvents.subscribeWithErrorHandler { showHatchingDialog(it) })
-                compositeSubscription.add(adapter.hatchPetEvents.subscribeWithErrorHandler { hatchPet(it.first, it.second) })
-                compositeSubscription.addAll(adapter.startNewPartyEvents.subscribeWithErrorHandler { createNewParty() })
+                        dialog.addCloseButton()
+                        dialog.enqueue()
+                    }
+                }
             }
+            adapter?.onStartHatching = { showHatchingDialog(it) }
+            adapter?.onHatchPet = { pet, egg -> hatchPet(pet, egg) }
+            adapter?.onCreateNewParty = { createNewParty() }
         }
     }
 
@@ -200,7 +190,6 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
         }
         fragment.isHatching = true
         fragment.isFeeding = false
-        fragment.parentSubscription = compositeSubscription
         parentFragmentManager.let { fragment.show(it, "hatchingDialog") }
     }
 
@@ -211,24 +200,22 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
 
     override fun onRefresh() {
         binding?.refreshLayout?.isRefreshing = true
-        compositeSubscription.add(
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             userRepository.retrieveUser(true, true)
-                .doOnTerminate {
-                    binding?.refreshLayout?.isRefreshing = false
-                }.subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     private fun hatchPet(potion: HatchingPotion, egg: Egg) {
         (activity as? BaseActivity)?.let {
-            compositeSubscription.add(
-                hatchPetUseCase.observable(
+            lifecycleScope.launchCatching {
+                hatchPetUseCase.callInteractor(
                     HatchPetUseCase.RequestValues(
                         potion, egg,
                         it
                     )
-                ).subscribeWithErrorHandler {}
-            )
+                )
+            }
         }
     }
 
@@ -237,34 +224,25 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
         alert?.setTitle(R.string.quest_party_required_title)
         alert?.setMessage(R.string.quest_party_required_description)
         alert?.addButton(R.string.create_new_party, true, false) { _, _ ->
-            socialRepository.createGroup(
-                getString(R.string.usernames_party, user?.profile?.name),
-                "",
-                user?.id,
-                "party",
-                "",
-                false
-            )
-                .flatMap {
-                    userRepository.retrieveUser(false, true)
-                        .filter { it.hasParty }
-                        .flatMap { socialRepository.retrieveGroup("party") }
-                        .flatMap { group1 ->
-                            socialRepository.retrieveGroupMembers(
-                                group1.id,
-                                true
-                            )
-                        }
-                }
-                .subscribe(
-                    {
-                        MainNavigationController.navigate(
-                            R.id.partyFragment,
-                            bundleOf(Pair("partyID", user?.party?.id))
-                        )
-                    },
-                    RxErrorHandler.handleEmptyError()
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val group = socialRepository.createGroup(
+                    getString(R.string.usernames_party, user?.profile?.name),
+                    "",
+                    user?.id,
+                    "party",
+                    "",
+                    false
                 )
+                val user = userRepository.retrieveUser(false, true)
+                if (user?.hasParty == true) {
+                    val party = socialRepository.retrieveGroup("party")
+                    socialRepository.retrievePartyMembers(party?.id ?: "", true)
+                    MainNavigationController.navigate(
+                        R.id.partyFragment,
+                        bundleOf(Pair("partyID", user.party?.id))
+                    )
+                }
+            }
         }
         alert?.addButton(R.string.close, false) { _, _ ->
             alert.dismiss()
@@ -282,14 +260,14 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
             else -> Egg::class.java
         }
         itemType?.let { type ->
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getOwnedItems(type)
                     .onEach { items ->
                         adapter?.data = items
                     }
                     .map { items -> items.mapNotNull { it.key } }
                     .map {
-                        inventoryRepository.getItemsFlowable(itemClass, it.toTypedArray()).firstOrNull()
+                        inventoryRepository.getItems(itemClass, it.toTypedArray()).firstOrNull()
                     }
                     .collect {
                         val itemMap = mutableMapOf<String, Item>()
@@ -299,10 +277,10 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
                         adapter?.items = itemMap
                     }
             }
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getPets().collect { adapter?.setExistingPets(it) }
             }
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getOwnedPets().map { ownedPets ->
                     val petMap = mutableMapOf<String, OwnedPet>()
                     ownedPets.forEach { petMap[it.key ?: ""] = it }
@@ -333,16 +311,10 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
         if (specialItem == null || memberID == null) {
             return
         }
-
-        val observable: Flowable<SkillResponse> =
+        lifecycleScope.launchCatching {
             userRepository.useSkill(specialItem.key, specialItem.target, memberID)
-
-        compositeSubscription.add(
-            observable.subscribe(
-                { this.displaySpecialItemResult(specialItem) },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+            displaySpecialItemResult(specialItem)
+        }
     }
 
     private fun displaySpecialItemResult(specialItem: SpecialItem?) {
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 898acb9f9..3003204cd 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
@@ -12,9 +12,9 @@ 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.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopCategory
 import com.habitrpg.android.habitica.models.shops.ShopItem
@@ -28,6 +28,7 @@ import com.habitrpg.android.habitica.ui.views.CurrencyViews
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.RecyclerViewState
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -92,9 +93,9 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
             adapter?.context = context
             binding?.recyclerView?.adapter = adapter
             binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-            adapter?.changeClassEvents?.subscribe {
+            adapter?.changeClassEvents = {
                 showClassChangeDialog(it)
-            }?.let { compositeSubscription.add(it) }
+            }
         }
 
         if (binding?.recyclerView?.layoutManager == null) {
@@ -136,16 +137,11 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
             updateCurrencyView(it)
         }
 
-        lifecycleScope.launch {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             socialRepository.getGroup(Group.TAVERN_ID)
                 .filter { it?.hasActiveQuest == true }
-                .filter { group ->
-                    group?.quest?.rageStrikes?.any { it.key == shopIdentifier } ?: false
-                }
-                .filter { group ->
-                    group?.quest?.rageStrikes?.filter { it.key == shopIdentifier }
-                        ?.get(0)?.wasHit == true
-                }
+                .filter { group -> group?.quest?.rageStrikes?.any { it.key == shopIdentifier } ?: false }
+                .filter { group -> group?.quest?.rageStrikes?.filter { it.key == shopIdentifier }?.get(0)?.wasHit == true }
                 .collect {
                     adapter?.shopSpriteSuffix = "_" + it?.quest?.key
                 }
@@ -163,7 +159,8 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
             val alert = HabiticaAlertDialog(context)
             alert.setTitle(getString(R.string.class_confirmation_price, classIdentifier, 3))
             alert.addButton(R.string.choose_class, true) { _, _ ->
-                userRepository.changeClass(classIdentifier).subscribeWithErrorHandler {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    userRepository.changeClass(classIdentifier)
                 }
             }
             alert.addButton(R.string.dialog_go_back, false)
@@ -184,62 +181,48 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
             Shop.SEASONAL_SHOP -> "seasonal"
             else -> ""
         }
-        compositeSubscription.add(
-            this.inventoryRepository.retrieveShopInventory(shopUrl)
-                .map { shop1 ->
-                    if (shop1.identifier == Shop.MARKET) {
-                        val user = userViewModel.user.value
-                        val specialCategory = ShopCategory()
-                        specialCategory.text = getString(R.string.special)
-                        if (user?.isValid == true && user.purchased?.plan?.isActive == true) {
-                            val item = ShopItem.makeGemItem(context?.resources)
-                            item.limitedNumberLeft = user.purchased?.plan?.numberOfGemsLeft
-                            specialCategory.items.add(item)
-                        }
-                        specialCategory.items.add(ShopItem.makeFortifyItem(context?.resources))
-                        shop1.categories.add(specialCategory)
-                    }
-                    when (shop1.identifier) {
-                        Shop.TIME_TRAVELERS_SHOP -> {
-                            formatTimeTravelersShop(shop1)
-                        }
-                        Shop.SEASONAL_SHOP -> {
-                            shop1.categories.sortWith(
-                                compareBy<ShopCategory> { it.items.size != 1 }
-                                    .thenBy { it.items.firstOrNull()?.currency != "gold" }
-                                    .thenByDescending { it.items.firstOrNull()?.event?.end }
-                            )
-                            shop1
-                        }
-                        else -> {
-                            shop1
-                        }
-                    }
+        lifecycleScope.launchCatching({
+            binding?.recyclerView?.state = RecyclerViewState.FAILED
+        }) {
+            val shop1 = inventoryRepository.retrieveShopInventory(shopUrl) ?: return@launchCatching
+            if (shop1.identifier == Shop.MARKET) {
+                val user = userViewModel.user.value
+                val specialCategory = ShopCategory()
+                specialCategory.text = getString(R.string.special)
+                if (user?.isValid == true && user.purchased?.plan?.isActive == true) {
+                    val item = ShopItem.makeGemItem(context?.resources)
+                    item.limitedNumberLeft = user.purchased?.plan?.numberOfGemsLeft
+                    specialCategory.items.add(item)
                 }
-                .subscribe(
-                    {
-                        this.shop = it
-                        this.adapter?.setShop(it)
-                    },
-                    {
-                        binding?.recyclerView?.state = RecyclerViewState.FAILED
-                        RxErrorHandler.reportError(it)
-                    },
-                    {
-                        binding?.refreshLayout?.isRefreshing = false
-                    }
-                )
-        )
+                specialCategory.items.add(ShopItem.makeFortifyItem(context?.resources))
+                shop1.categories.add(specialCategory)
+            }
+            when (shop1.identifier) {
+                Shop.TIME_TRAVELERS_SHOP -> {
+                    formatTimeTravelersShop(shop1)
+                }
+                Shop.SEASONAL_SHOP -> {
+                    shop1.categories.sortWith(
+                        compareBy<ShopCategory> { it.items.size != 1 }
+                            .thenBy { it.items.firstOrNull()?.currency != "gold" }
+                            .thenByDescending { it.items.firstOrNull()?.event?.end }
+                    )
+                }
+            }
+            shop = shop1
+            adapter?.setShop(shop1)
+            binding?.refreshLayout?.isRefreshing = false
+        }
 
-        compositeSubscription.add(
-            this.inventoryRepository.getOwnedItems()
-                .subscribe({ adapter?.setOwnedItems(it) }, RxErrorHandler.handleEmptyError())
-        )
-        compositeSubscription.add(
-            this.inventoryRepository.getInAppRewards()
+        lifecycleScope.launchCatching {
+            inventoryRepository.getOwnedItems()
+                .collect { adapter?.setOwnedItems(it) }
+        }
+        lifecycleScope.launchCatching {
+            inventoryRepository.getInAppRewards()
                 .map { rewards -> rewards.map { it.key } }
-                .subscribe({ adapter?.setPinnedItemKeys(it) }, RxErrorHandler.handleEmptyError())
-        )
+                .collect { adapter?.setPinnedItemKeys(it) }
+        }
     }
 
     private fun formatTimeTravelersShop(shop: Shop): Shop {
@@ -268,29 +251,22 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
     }
 
     private fun loadMarketGear() {
-        compositeSubscription.add(
-            inventoryRepository.retrieveMarketGear()
-                .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)
-                            }.sortedBy { it.locked }.toList()
-                            category.items.clear()
-                            category.items.addAll(items)
-                        }
-                        shop
+        lifecycleScope.launchCatching {
+            val shop = inventoryRepository.retrieveMarketGear()
+            inventoryRepository.getOwnedEquipment()
+                        .map { equipment -> equipment.map { it.key } }
+                .collect { equipment ->
+                    for (category in shop?.categories ?: emptyList()) {
+                        val items = category.items.asSequence().filter {
+                            !equipment.contains(it.key)
+                        }.sortedBy { it.locked }.toList()
+                        category.items.clear()
+                        category.items.addAll(items)
                     }
-                )
-                .subscribe(
-                    {
-                        this.gearCategories = it.categories
-                        adapter?.gearCategories = it.categories
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+                    gearCategories = shop?.categories
+                    adapter?.gearCategories = shop?.categories ?: mutableListOf()
+                }
+        }
     }
 
     override fun injectFragment(component: UserComponent) {
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 8d5188882..3ad7102b4 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
@@ -11,7 +11,8 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.getTranslatedType
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.inventory.Mount
 import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.models.user.OwnedMount
@@ -97,13 +98,12 @@ class MountDetailRecyclerFragment :
             binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
             this.loadItems()
 
-            adapter?.getEquipFlowable()?.flatMap { key -> inventoryRepository.equip("mount", key) }
-                ?.subscribe(
-                    {
-                        adapter?.currentMount = it.currentMount
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )?.let { compositeSubscription.add(it) }
+            adapter?.onEquip = {
+                lifecycleScope.launchCatching {
+                    val items = inventoryRepository.equip("mount", it)
+                    adapter?.currentMount = items?.currentMount
+                }
+            }
         }
         userViewModel.user.observe(viewLifecycleOwner) { adapter?.currentMount = it?.currentMount }
 
@@ -136,7 +136,7 @@ class MountDetailRecyclerFragment :
 
     private fun loadItems() {
         if (animalType != null || animalGroup != null) {
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 val mounts = inventoryRepository.getMounts(animalType, animalGroup, animalColor).firstOrNull() ?: emptyList()
                 inventoryRepository.getOwnedMounts().map {  ownedMounts ->
                     val mountMap = mutableMapOf<String, OwnedMount>()
@@ -173,13 +173,9 @@ class MountDetailRecyclerFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(false, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 }
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 dd234a2e3..a085a2a91 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
@@ -11,8 +11,8 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.getTranslatedType
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.interactors.FeedPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Food
@@ -111,11 +111,11 @@ class PetDetailRecyclerFragment :
             }
         binding?.recyclerView?.layoutManager = layoutManager
         adapter.animalIngredientsRetriever = { animal, callback ->
-            lifecycleScope.launch {
-                val egg = inventoryRepository.getItemsFlowable(Egg::class.java, arrayOf(animal.animal))
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val egg = inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal))
                     .firstOrNull()?.firstOrNull() as? Egg
                 val potion =
-                    inventoryRepository.getItemsFlowable(HatchingPotion::class.java, arrayOf(animal.color))
+                    inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color))
                         .firstOrNull()?.firstOrNull() as? HatchingPotion
                 callback(Pair(egg, potion))
             }
@@ -124,23 +124,19 @@ class PetDetailRecyclerFragment :
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
         this.loadItems()
 
-        compositeSubscription.add(
-            adapter.getEquipFlowable()
-                .flatMap { key -> inventoryRepository.equip("pet", key) }
-                .subscribe(
-                    {
-                        adapter.currentPet = it.currentPet
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        adapter.onEquip = {
+            lifecycleScope.launchCatching {
+                val items = inventoryRepository.equip("pet", it)
+                adapter.currentPet = items?.currentPet
+            }
+        }
         userViewModel.user.observe(viewLifecycleOwner) { adapter.currentPet = it?.currentPet }
-        compositeSubscription.add(adapter.feedFlowable.subscribe({
+        adapter.onFeed = { pet, food ->
             showFeedingDialog(
-                it.first,
-                it.second
+                pet,
+                food
             )
-        }, RxErrorHandler.handleEmptyError()))
+        }
 
         view.post { setGridSpanCount(view.width) }
     }
@@ -171,7 +167,7 @@ class PetDetailRecyclerFragment :
 
     private fun loadItems() {
         if (animalType?.isNotEmpty() == true || animalGroup?.isNotEmpty() == true) {
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getOwnedMounts()
                     .map { ownedMounts ->
                         val mountMap = mutableMapOf<String, OwnedMount>()
@@ -179,11 +175,10 @@ class PetDetailRecyclerFragment :
                         return@map mountMap
                     }.collect { adapter.setOwnedMounts(it) }
             }
-            compositeSubscription.add(
-                inventoryRepository.getOwnedItems(true)
-                    .subscribe({ adapter.setOwnedItems(it) }, RxErrorHandler.handleEmptyError())
-            )
-            lifecycleScope.launch {
+            lifecycleScope.launchCatching {
+                inventoryRepository.getOwnedItems(true).collect { adapter.setOwnedItems(it) }
+            }
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 val mounts = inventoryRepository.getMounts(
                     animalType,
                     animalGroup,
@@ -231,14 +226,14 @@ class PetDetailRecyclerFragment :
     private fun showFeedingDialog(pet: Pet, food: Food?) {
         if (food != null) {
             val context = activity ?: context ?: return
-            compositeSubscription.add(
-                feedPetUseCase.observable(
+            lifecycleScope.launchCatching {
+                feedPetUseCase.callInteractor(
                     FeedPetUseCase.RequestValues(
                         pet, food,
                         context
                     )
-                ).subscribeWithErrorHandler {}
-            )
+                )
+            }
             return
         }
         val fragment = ItemDialogFragment()
@@ -247,7 +242,6 @@ class PetDetailRecyclerFragment :
         fragment.isHatching = false
         fragment.itemType = "food"
         fragment.itemTypeText = getString(R.string.food)
-        fragment.parentSubscription = compositeSubscription
         parentFragmentManager.let { fragment.show(it, "feedDialog") }
     }
 
@@ -256,13 +250,9 @@ class PetDetailRecyclerFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(false, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 }
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 34df1d531..615c21d74 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
@@ -14,7 +14,8 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter
@@ -106,9 +107,9 @@ class StableRecyclerFragment :
         if (adapter == null) {
             adapter = StableRecyclerAdapter()
             adapter?.animalIngredientsRetriever = { animal, callback ->
-                lifecycleScope.launch {
-                    val egg = inventoryRepository.getItemsFlowable(Egg::class.java, arrayOf(animal.animal)).firstOrNull()?.firstOrNull() as? Egg
-                    val potion = inventoryRepository.getItemsFlowable(HatchingPotion::class.java, arrayOf(animal.color)).firstOrNull()?.firstOrNull() as? HatchingPotion
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val egg = inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal)).firstOrNull()?.firstOrNull() as? Egg
+                    val potion = inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color)).firstOrNull()?.firstOrNull() as? HatchingPotion
                     callback(Pair(egg, potion))
                 }
             }
@@ -118,11 +119,11 @@ class StableRecyclerFragment :
             binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
             adapter?.let {
-                compositeSubscription.add(
-                    it.getEquipFlowable()
-                        .flatMap { key -> inventoryRepository.equip(if (itemType == "pets") "pet" else "mount", key) }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
-                )
+                it.onEquip = {
+                    lifecycleScope.launchCatching {
+                        inventoryRepository.equip(if (itemType == "pets") "pet" else "mount", it)
+                    }
+                }
             }
         }
         userViewModel.user.observe(viewLifecycleOwner) {
@@ -179,13 +180,9 @@ class StableRecyclerFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
index 0fb50d6ac..95453313e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
@@ -14,6 +14,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getSystemService
 import androidx.core.util.PatternsCompat
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
 import com.google.android.material.textfield.TextInputLayout
@@ -22,8 +23,11 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.addCloseButton
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity
 import com.habitrpg.android.habitica.ui.fragments.preferences.HabiticaAccountDialog.AccountUpdateConfirmed
@@ -36,8 +40,7 @@ import com.habitrpg.android.habitica.ui.views.ValidatingEditText
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import com.habitrpg.common.habitica.api.HostConfig
-import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.extensions.layoutInflater
+import kotlinx.coroutines.launch
 import retrofit2.HttpException
 import javax.inject.Inject
 
@@ -202,9 +205,11 @@ class AccountPreferenceFragment :
             val dialog = HabiticaAlertDialog(context)
             dialog.setTitle(R.string.are_you_sure)
             dialog.addButton(R.string.disconnect, true) { _, _ ->
-                apiClient.disconnectSocial(network)
-                    .flatMap { userRepository.retrieveUser(true, true) }
-                    .subscribe({ displayDisconnectSuccess(networkName) }, RxErrorHandler.handleEmptyError())
+                lifecycleScope.launch {
+                    apiClient.disconnectSocial(network)
+                    userRepository.retrieveUser(true, true)
+                    displayDisconnectSuccess(networkName)
+                }
             }
             dialog.addCancelButton()
             dialog.show()
@@ -251,8 +256,9 @@ class AccountPreferenceFragment :
     private fun updateUser(path: String, value: String?, title: String) {
         showSingleEntryDialog(value, title) {
             if (value != it) {
-                userRepository.updateUser(path, it ?: "")
-                    .subscribe({}, RxErrorHandler.handleEmptyError())
+                lifecycleScope.launchCatching {
+                    userRepository.updateUser(path, it ?: "")
+                }
             }
         }
     }
@@ -275,21 +281,17 @@ class AccountPreferenceFragment :
                 passwordEditText?.showErrorIfNecessary()
                 passwordRepeatEditText?.showErrorIfNecessary()
                 if (passwordEditText?.isValid != true || passwordRepeatEditText?.isValid != true) return@addButton
-                userRepository.updatePassword(
-                    oldPasswordEditText?.text ?: "",
-                    passwordEditText.text ?: "",
-                    passwordRepeatEditText.text ?: ""
-                )
-                    .flatMap { userRepository.retrieveUser(true, true) }
-                    .subscribe(
-                        {
-                            (activity as? SnackbarActivity)?.showSnackbar(
-                                content = context.getString(R.string.password_changed),
-                                displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
-                            )
-                        },
-                        RxErrorHandler.handleEmptyError()
+                lifecycleScope.launchCatching {
+                    userRepository.updatePassword(
+                        oldPasswordEditText?.text ?: "",
+                        passwordEditText.text ?: "",
+                        passwordRepeatEditText.text ?: ""
                     )
+                    (activity as? SnackbarActivity)?.showSnackbar(
+                        content = context.getString(R.string.password_changed),
+                        displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+                    )
+                }
                 dialog.dismiss()
             }
             dialog.addCancelButton()
@@ -326,17 +328,18 @@ class AccountPreferenceFragment :
                 passwordRepeatEditText?.showErrorIfNecessary()
                 if ((showEmail && emailEditText?.isValid != true) || passwordEditText?.isValid != true || passwordRepeatEditText?.isValid != true) return@addButton
                 val email = if (showEmail) emailEditText?.text else user?.authentication?.findFirstSocialEmail()
-                apiClient.registerUser(user?.username ?: "", email ?: "", passwordEditText.text ?: "", passwordRepeatEditText?.text ?: "")
-                    .flatMap { userRepository.retrieveUser(true, true) }
-                    .subscribe(
-                        {
-                            (activity as? SnackbarActivity)?.showSnackbar(
-                                content = context.getString(R.string.password_added),
-                                displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
-                            )
-                        },
-                        RxErrorHandler.handleEmptyError()
+                lifecycleScope.launchCatching {
+                    apiClient.registerUser(
+                        user?.username ?: "",
+                        email ?: "",
+                        passwordEditText.text ?: "",
+                        passwordRepeatEditText?.text ?: ""
                     )
+                    (activity as? SnackbarActivity)?.showSnackbar(
+                        content = context.getString(R.string.password_added),
+                        displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+                    )
+                }
                 dialog.dismiss()
             }
             dialog.addCancelButton()
@@ -365,14 +368,16 @@ class AccountPreferenceFragment :
                 KeyboardUtil.dismissKeyboard(activity)
                 emailEditText?.showErrorIfNecessary()
                 if (emailEditText?.isValid != true) return@addButton
-                userRepository.updateEmail(emailEditText.text.toString(), passwordEditText?.text.toString())
-                    .flatMap { userRepository.retrieveUser(true, true) }
-                    .subscribe(
-                        {
-                            configurePreference(findPreference("email"), emailEditText.text.toString())
-                        },
-                        RxErrorHandler.handleEmptyError()
+                lifecycleScope.launchCatching {
+                    userRepository.updateEmail(
+                        emailEditText.text.toString(),
+                        passwordEditText?.text.toString()
                     )
+                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                        userRepository.retrieveUser(true, true)
+                    }
+                    configurePreference(findPreference("email"), emailEditText.text.toString())
+                }
                 dialog.dismiss()
             }
             dialog.addCancelButton()
@@ -384,8 +389,9 @@ class AccountPreferenceFragment :
 
     private fun showLoginNameDialog() {
         showSingleEntryDialog(user?.username, getString(R.string.username)) {
-            userRepository.updateLoginName(it ?: "")
-                .subscribe({}, RxErrorHandler.handleEmptyError())
+            lifecycleScope.launchCatching {
+                userRepository.updateLoginName(it ?: "")
+            }
         }
     }
 
@@ -435,24 +441,23 @@ class AccountPreferenceFragment :
 
     private fun deleteAccount(password: String) {
         val dialog = HabiticaProgressDialog.show(context, R.string.deleting_account)
-        compositeSubscription.add(
-            userRepository.deleteAccount(password).subscribe({ _ ->
+        lifecycleScope.launchCatching({ throwable ->
+            dialog?.dismiss()
+            if (throwable is HttpException && throwable.code() == 401) {
+                val errorDialog = context?.let { HabiticaAlertDialog(it) }
+                errorDialog?.setTitle(R.string.authentication_error_title)
+                errorDialog?.setMessage(R.string.incorrect_password)
+                errorDialog?.addCloseButton()
+                errorDialog?.show()
+            }
+            ExceptionHandler.reportError(throwable)
+        }) {
+            userRepository.deleteAccount(password)
                 dialog?.dismiss()
                 accountDialog.dismiss()
                 context?.let { HabiticaBaseApplication.logout(it) }
                 activity?.finish()
-            }) { throwable ->
-                dialog?.dismiss()
-                if (throwable is HttpException && throwable.code() == 401) {
-                    val errorDialog = context?.let { HabiticaAlertDialog(it) }
-                    errorDialog?.setTitle(R.string.authentication_error_title)
-                    errorDialog?.setMessage(R.string.incorrect_password)
-                    errorDialog?.addCloseButton()
-                    errorDialog?.show()
-                }
-                RxErrorHandler.reportError(throwable)
-            }
-        )
+        }
     }
 
     private fun showAccountResetConfirmation(user: User?) {
@@ -474,8 +479,11 @@ class AccountPreferenceFragment :
         dialog.setTitle(R.string.confirm_username_title)
         dialog.setMessage(R.string.confirm_username_description)
         dialog.addButton(R.string.confirm, true) { _, _ ->
-            userRepository.updateLoginName(user?.authentication?.localAuthentication?.username ?: "")
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+            lifecycleScope.launchCatching {
+                userRepository.updateLoginName(
+                    user?.authentication?.localAuthentication?.username ?: ""
+                )
+            }
         }
         dialog.addCancelButton()
         dialog.show()
@@ -483,19 +491,10 @@ class AccountPreferenceFragment :
 
     private fun resetAccount() {
         val dialog = HabiticaProgressDialog.show(context, R.string.resetting_account)
-        compositeSubscription.add(
-            userRepository.resetAccount().subscribe({
-                dialog?.dismiss()
-                accountDialog.dismiss()
-                (activity as? SnackbarActivity)?.showSnackbar(
-                    content = context?.getString(R.string.account_reset),
-                    displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
-                )
-            }) { throwable ->
-                dialog?.dismiss()
-                RxErrorHandler.reportError(throwable)
-            }
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.resetAccount()
+            dialog?.dismiss()
+        }
     }
 
     private fun copyValue(name: String, value: CharSequence?) {
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 1a2d9c3d9..ee1baa742 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
@@ -9,7 +9,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 
 abstract class BasePreferencesFragment : PreferenceFragmentCompat() {
@@ -21,8 +20,6 @@ abstract class BasePreferencesFragment : PreferenceFragmentCompat() {
 
     internal open var user: User? = null
 
-    internal val compositeSubscription = CompositeDisposable()
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -34,7 +31,6 @@ abstract class BasePreferencesFragment : PreferenceFragmentCompat() {
 
     override fun onDestroy() {
         userRepository.close()
-        compositeSubscription.dispose()
         super.onDestroy()
     }
 
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 0e1910c6c..a1e6f0603 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
@@ -2,9 +2,10 @@ package com.habitrpg.android.habitica.ui.fragments.preferences
 
 import android.content.SharedPreferences
 import android.os.Bundle
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.CheckBoxPreference
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.User
 
 class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
@@ -73,7 +74,12 @@ class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedP
             else -> null
         }
         if (pathKey != null) {
-            compositeSubscription.add(userRepository.updateUser("preferences.emailNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, RxErrorHandler.handleEmptyError()))
+            lifecycleScope.launchCatching {
+                userRepository.updateUser(
+                    "preferences.emailNotifications.$pathKey",
+                    sharedPreferences.getBoolean(key, false)
+                )
+            }
         }
     }
 }
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 2ef49786e..5ff94f39d 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
@@ -20,9 +20,10 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.prefs.TimePreference
@@ -69,7 +70,9 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         super.onViewCreated(view, savedInstanceState)
         listView.itemAnimator = null
 
-        userRepository.retrieveTeamPlans().subscribe({}, RxErrorHandler.handleEmptyError())
+        lifecycleScope.launchCatching {
+            userRepository.retrieveTeamPlans()
+        }
     }
 
     override fun setupPreferences() {
@@ -152,20 +155,24 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 (activity as? SnackbarActivity)?.showSnackbar(
                     content = context?.getString(R.string.reloading_content)
                 )
-                contentRepository.retrieveContent(true).subscribe(
-                    {
-                        (activity as? SnackbarActivity)?.showSnackbar(
-                            content = context?.getString(R.string.reloaded_content),
-                            displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
-                        )
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+                reloadContent(true)
             }
         }
         return super.onPreferenceTreeClick(preference)
     }
 
+    private fun reloadContent(withConfirmation: Boolean) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            contentRepository.retrieveContent(true)
+            if (withConfirmation) {
+                (activity as? SnackbarActivity)?.showSnackbar(
+                    content = context?.getString(R.string.reloaded_content),
+                    displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+                )
+            }
+        }
+    }
+
     private fun logout() {
         context?.let { context ->
             val dialog = HabiticaAlertDialog(context)
@@ -180,7 +187,9 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
     }
 
     private val classSelectionResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        userRepository.retrieveUser(true, forced = true)
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+        }
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
@@ -199,24 +208,30 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 TaskAlarmManager.scheduleDailyReminder(context)
             }
             "usePushNotifications" -> {
-                val userPushNotifications = sharedPreferences.getBoolean(key, false)
-                pushNotificationsPreference?.isEnabled = userPushNotifications
-                userRepository.updateUser("preferences.pushNotifications.unsubscribeFromAll", userPushNotifications).subscribe()
-                if (userPushNotifications) {
+                val usePushNotifications = sharedPreferences.getBoolean(key, true)
+                pushNotificationsPreference?.isEnabled = usePushNotifications
+                lifecycleScope.launchCatching {
+                    userRepository.updateUser("preferences.pushNotifications.unsubscribeFromAll", !usePushNotifications)
+                }
+                if (usePushNotifications) {
                     pushNotificationManager.addPushDeviceUsingStoredToken()
                 } else {
                     pushNotificationManager.removePushDeviceUsingStoredToken()
                 }
             }
             "useEmails" -> {
-                val useEmailNotifications = sharedPreferences.getBoolean(key, false)
+                val useEmailNotifications = sharedPreferences.getBoolean(key, true)
                 emailNotificationsPreference?.isEnabled = useEmailNotifications
-                userRepository.updateUser("preferences.emailNotifications.unsubscribeFromAll", useEmailNotifications).subscribe()
+                lifecycleScope.launchCatching {
+                    userRepository.updateUser("preferences.emailNotifications.unsubscribeFromAll", !useEmailNotifications)
+                }
             }
             "cds_time" -> {
                 val timeval = sharedPreferences.getString("cds_time", "0") ?: "0"
                 val hour = Integer.parseInt(timeval)
-                userRepository.changeCustomDayStart(hour).subscribe({ }, RxErrorHandler.handleEmptyError())
+                lifecycleScope.launchCatching {
+                    userRepository.changeCustomDayStart(hour)
+                }
                 val preference = findPreference<ListPreference>(key)
                 preference?.summary = preference?.entry
             }
@@ -232,11 +247,10 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 if (user?.preferences?.language == languageHelper.languageCode) {
                     return
                 }
-
-                userRepository.updateLanguage(languageHelper.languageCode ?: "en")
-                    .flatMap { contentRepository.retrieveContent(true) }
-                    .subscribe({ }, RxErrorHandler.handleEmptyError())
-
+                lifecycleScope.launchCatching {
+                    userRepository.updateLanguage(languageHelper.languageCode ?: "en")
+                    reloadContent(false)
+                }
                 val intent = Intent(activity, MainActivity::class.java)
                 this.startActivity(intent)
                 activity?.finishAffinity()
@@ -244,10 +258,9 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
             "audioTheme" -> {
                 val newAudioTheme = sharedPreferences.getString(key, "off")
                 if (newAudioTheme != null) {
-                    compositeSubscription.add(
+                    lifecycleScope.launchCatching {
                         userRepository.updateUser("preferences.sound", newAudioTheme)
-                            .subscribe({ }, RxErrorHandler.handleEmptyError())
-                    )
+                    }
                     soundManager.soundTheme = newAudioTheme
                     soundManager.preloadAllFiles()
                 }
@@ -260,8 +273,12 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 val activity = activity as? PrefsActivity ?: return
                 activity.reload()
             }
-            "dailyDueDefaultView" -> userRepository.updateUser("preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+            "dailyDueDefaultView" -> lifecycleScope.launchCatching {
+                userRepository.updateUser(
+                    "preferences.dailyDueDefaultView",
+                    sharedPreferences.getBoolean(key, false)
+                )
+            }
             "server_url" -> {
                 apiClient.updateServerUrl(sharedPreferences.getString(key, ""))
                 findPreference<Preference>(key)?.summary = sharedPreferences.getString(key, "")
@@ -277,10 +294,9 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
             "disablePMs" -> {
                 val isDisabled = sharedPreferences.getBoolean("disablePMs", false)
                 if (user?.inbox?.optOut != isDisabled) {
-                    compositeSubscription.add(
+                    lifecycleScope.launchCatching {
                         userRepository.updateUser("inbox.optOut", isDisabled)
-                            .subscribe({ }, RxErrorHandler.handleEmptyError())
-                    )
+                    }
                 }
             }
             "launch_screen" -> {
@@ -351,13 +367,13 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
 
         val usePushPreference = findPreference("usePushNotifications") as? CheckBoxPreference
         pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
-        val usePushNotifications = user?.preferences?.pushNotifications?.unsubscribeFromAll ?: false
+        val usePushNotifications = !(user?.preferences?.pushNotifications?.unsubscribeFromAll ?: false)
         pushNotificationsPreference?.isEnabled = usePushNotifications
         usePushPreference?.isChecked = usePushNotifications
 
         val useEmailPreference = findPreference("useEmails") as? CheckBoxPreference
         emailNotificationsPreference = findPreference("emailNotifications") as? PreferenceScreen
-        val useEmailNotifications = user?.preferences?.emailNotifications?.unsubscribeFromAll ?: false
+        val useEmailNotifications = !(user?.preferences?.emailNotifications?.unsubscribeFromAll ?: false)
         emailNotificationsPreference?.isEnabled = useEmailNotifications
         useEmailPreference?.isChecked = useEmailNotifications
 
@@ -385,7 +401,12 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                         } else if (newValue == false && currentIds.contains(team.id)) {
                             currentIds.remove(team.id)
                         }
-                        userRepository.updateUser("preferences.tasks.mirrorGroupTasks", currentIds).subscribe({}, RxErrorHandler.handleEmptyError())
+                        lifecycleScope.launchCatching {
+                            userRepository.updateUser(
+                                "preferences.tasks.mirrorGroupTasks",
+                                currentIds
+                            )
+                        }
                         true
                     }
                     groupCategory?.addPreference(newPreference)
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 97a6eb276..702fc6270 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
@@ -2,9 +2,10 @@ package com.habitrpg.android.habitica.ui.fragments.preferences
 
 import android.content.SharedPreferences
 import android.os.Bundle
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.CheckBoxPreference
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.User
 
 class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
@@ -75,7 +76,9 @@ class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPr
             else -> null
         }
         if (pathKey != null) {
-            compositeSubscription.add(userRepository.updateUser("preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, RxErrorHandler.handleEmptyError()))
+            lifecycleScope.launchCatching {
+                userRepository.updateUser("preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false))
+            }
         }
     }
 }
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 b6734195e..7bb35bc92 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
@@ -13,9 +13,9 @@ 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.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
 import com.habitrpg.android.habitica.models.promotions.PromoType
@@ -25,11 +25,12 @@ 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.dialogs.HabiticaAlertDialog
-import javax.inject.Inject
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
 class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
 
@@ -50,6 +51,8 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
         component.inject(this)
     }
 
+    private var isGemSaleHappening = false
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -67,6 +70,7 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
         val promo = appConfigManager.activePromo()
         if (promo != null) {
             binding?.let {
+                isGemSaleHappening = true
                 promo.configurePurchaseBanner(it)
                 if (promo.promoType != PromoType.SUBSCRIPTION) {
                     promo.configureGemView(it.gems4View.binding, 4)
@@ -96,7 +100,7 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
     }
 
     private fun loadInventory() {
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val skus = purchaseHandler.getAllGemSKUs()
             withContext(Dispatchers.Main) {
                 for (sku in skus) {
@@ -122,7 +126,7 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
 
     private fun purchaseGems(view: GemPurchaseOptionsView?) {
         val identifier = view?.sku ?: return
-        activity?.let { purchaseHandler.purchase(it, identifier) }
+        activity?.let { purchaseHandler.purchase(it, identifier, null, isGemSaleHappening) }
     }
 
     private fun showGiftGemsDialog() {
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 2639c94b4..4dde1b73f 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
@@ -5,11 +5,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 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.FragmentGiftGemBalanceBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import javax.inject.Inject
@@ -62,18 +63,12 @@ class GiftBalanceGemsFragment : BaseFragment<FragmentGiftGemBalanceBinding>() {
         try {
             val amount = binding?.giftEditText?.text.toString().toInt()
             giftedMember?.id?.let {
-                compositeSubscription.add(
+                lifecycleScope.launchCatching({
+                    isGifting = false
+                }) {
                     socialRepository.transferGems(it, amount)
-                        .flatMap { userRepository.retrieveUser(false, true) }
-                        .doOnError {
-                            isGifting = false
-                        }
-                        .subscribe(
-                            {
-                                activity?.finish()
-                            }, RxErrorHandler.handleEmptyError()
-                        )
-                )
+                    userRepository.retrieveUser(false)
+                }
             }
         } catch (ignored: NumberFormatException) {}
     }
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 e62ba9fb8..2babff589 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
@@ -9,16 +9,17 @@ import com.android.billingclient.api.SkuDetails
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentGiftGemPurchaseBinding
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
 class GiftPurchaseGemsFragment : BaseFragment<FragmentGiftGemPurchaseBinding>() {
 
@@ -54,7 +55,7 @@ class GiftPurchaseGemsFragment : BaseFragment<FragmentGiftGemPurchaseBinding>()
     }
 
     fun setupCheckout() {
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val skus = purchaseHandler?.getAllGemSKUs()
             withContext(Dispatchers.Main) {
                 for (sku in skus ?: emptyList()) {
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 e330d57ce..022da9244 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
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import com.android.billingclient.api.SkuDetails
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -15,20 +16,21 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
-import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 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.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.User
 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.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.loadImage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -87,15 +89,19 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
 
         binding?.refreshLayout?.setOnRefreshListener { refresh() }
 
-        compositeSubscription.add(
-            inventoryRepository.getLatestMysteryItem().subscribe(
-                {
-                    binding?.subBenefitsMysteryItemIcon?.loadImage("shop_set_mystery_${it.key?.split("_")?.last()}")
-                    binding?.subBenefitsMysteryItemText?.text = context?.getString(R.string.subscribe_listitem3_description_new, it.text)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launchCatching {
+            inventoryRepository.getLatestMysteryItem().collect {
+                    binding?.subBenefitsMysteryItemIcon?.loadImage(
+                        "shop_set_mystery_${
+                            it.key?.split(
+                                "_"
+                            )?.last()
+                        }"
+                    )
+                    binding?.subBenefitsMysteryItemText?.text =
+                        context?.getString(R.string.subscribe_listitem3_description_new, it.text)
+                }
+        }
 
         AmplitudeManager.sendNavigationEvent("subscription screen")
     }
@@ -108,15 +114,11 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
     }
 
     private fun refresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(withTasks = false, forced = true).subscribe(
-                {
-                    this.setUser(it)
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.retrieveUser(true)
+            user?.let { setUser(it) }
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -124,7 +126,7 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
     }
 
     fun loadInventory() {
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val subscriptions = purchaseHandler.getAllSubscriptionProducts()
             skus = subscriptions
             withContext(Dispatchers.Main) {
@@ -227,17 +229,16 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
     }
 
     private fun checkIfNeedsCancellation() {
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val newestSubscription = purchaseHandler.checkForSubscription()
             if (user?.purchased?.plan?.paymentMethod == "Google" &&
                 user?.purchased?.plan?.isActive == true &&
                 user?.purchased?.plan?.dateTerminated == null &&
                 (newestSubscription?.isAutoRenewing != true)
             ) {
-                compositeSubscription.add(
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     purchaseHandler.cancelSubscription()
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
-                )
+                }
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
index b6c57d7e6..36cf20998 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
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.RelativeLayout
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.tabs.TabLayout
 import com.habitrpg.android.habitica.R
@@ -14,7 +15,7 @@ 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.databinding.FragmentSetupAvatarBinding
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.SetupCustomization
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.SetupActivity
@@ -56,8 +57,16 @@ class AvatarSetupFragment : BaseFragment<FragmentSetupAvatarBinding>() {
 
         this.adapter = CustomizationSetupAdapter()
         this.adapter?.userSize = this.user?.preferences?.size ?: "slim"
-        adapter?.updateUserEvents?.flatMap { userRepository.updateUser(it) }?.subscribeWithErrorHandler {}?.let { compositeSubscription.add(it) }
-        adapter?.equipGearEvents?.flatMap { inventoryRepository.equip("equipped", it) }?.subscribeWithErrorHandler {}?.let { compositeSubscription.add(it) }
+        adapter?.onUpdateUser = {
+            lifecycleScope.launchCatching {
+                userRepository.updateUser(it)
+            }
+        }
+        adapter?.onEquipGear = {
+            lifecycleScope.launchCatching {
+                inventoryRepository.equip("equipped", it)
+            }
+        }
 
         this.adapter?.user = this.user
         val layoutManager = LinearLayoutManager(activity)
@@ -185,7 +194,9 @@ class AvatarSetupFragment : BaseFragment<FragmentSetupAvatarBinding>() {
         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(updateData).subscribeWithErrorHandler({}))
+        lifecycleScope.launchCatching {
+            userRepository.updateUser(updateData)
+        }
     }
 
     @Suppress("ReturnCount")
@@ -215,4 +226,4 @@ class AvatarSetupFragment : BaseFragment<FragmentSetupAvatarBinding>() {
         params?.marginStart = location[0] + px
         binding?.customizationDrawer?.binding?.caretView?.layoutParams = params
     }
-}
+}
\ No newline at end of file
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 6d17af42a..a196ddb15 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
@@ -8,38 +8,52 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 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.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.subjects.PublishSubject
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
 
-    val nameValidEvents = PublishSubject.create<Boolean>()
+    var onNameValid: ((Boolean?) -> Unit)? = null
 
     @Inject
     lateinit var userRepository: UserRepository
 
     override var binding: FragmentWelcomeBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentWelcomeBinding {
+    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 displayNameVerificationEvents = MutableStateFlow<String?>(null)
+    private val usernameVerificationEvents = MutableStateFlow<String?>(null)
 
     private val checkmarkIcon: Drawable by lazy {
         context?.let {
-            BitmapDrawable(resources, HabiticaIconsHelper.imageOfCheckmark(ContextCompat.getColor(it, R.color.green_50), 1f))
+            BitmapDrawable(
+                resources,
+                HabiticaIconsHelper.imageOfCheckmark(
+                    ContextCompat.getColor(it, R.color.green_50),
+                    1f
+                )
+            )
         } ?: VectorDrawable()
     }
     private val alertIcon: Drawable by lazy {
@@ -59,55 +73,75 @@ class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
 
         binding?.displayNameEditText?.addTextChangedListener(
             OnChangeTextWatcher { p0, _, _, _ ->
-                displayNameVerificationEvents.onNext(p0.toString())
+                displayNameVerificationEvents.value = p0.toString()
             }
         )
         binding?.usernameEditText?.addTextChangedListener(
             OnChangeTextWatcher { p0, _, _, _ ->
-                usernameVerificationEvents.onNext(p0.toString())
+                usernameVerificationEvents.value = p0.toString()
             }
         )
 
-        compositeSubscription.add(
-            displayNameVerificationEvents.toFlowable(BackpressureStrategy.DROP)
-                .map { it.length in 1..30 }
-                .subscribeWithErrorHandler {
+        lifecycleScope.launchCatching {
+            displayNameVerificationEvents
+                .map { it?.length in 1..30 }
+                .collect {
                     if (it) {
-                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
+                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            null,
+                            checkmarkIcon,
+                            null
+                        )
                         binding?.issuesTextView?.visibility = View.GONE
                     } else {
-                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
+                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            null,
+                            alertIcon,
+                            null
+                        )
                         binding?.issuesTextView?.visibility = View.VISIBLE
-                        binding?.issuesTextView?.text = context?.getString(R.string.display_name_length_error)
+                        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 {
-                    if (it.isUsable) {
-                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(null, null, checkmarkIcon, null)
+        }
+        lifecycleScope.launchCatching {
+            usernameVerificationEvents
+                .filter { it?.length in 1..30 }
+                .filterNotNull()
+                .map { userRepository.verifyUsername(it) }
+                .collect {
+                    if (it?.isUsable == true) {
+                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            null,
+                            checkmarkIcon,
+                            null
+                        )
                         binding?.issuesTextView?.visibility = View.GONE
                     } else {
-                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(null, null, alertIcon, null)
+                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            null,
+                            alertIcon,
+                            null
+                        )
                         binding?.issuesTextView?.visibility = View.VISIBLE
-                        binding?.issuesTextView?.text = it.issues.joinToString("\n")
+                        binding?.issuesTextView?.text = it?.issues?.joinToString("\n")
                     }
-                    nameValidEvents.onNext(it.isUsable)
+                    onNameValid?.invoke(it?.isUsable)
                 }
-        )
+        }
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable().firstElement().subscribe {
-                binding?.displayNameEditText?.setText(it.profile?.name)
-                displayNameVerificationEvents.onNext(it.profile?.name ?: "")
-                binding?.usernameEditText?.setText(it.username)
-                usernameVerificationEvents.onNext(it.username ?: "")
-            }
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.getUser().firstOrNull()
+            binding?.displayNameEditText?.setText(user?.profile?.name)
+            displayNameVerificationEvents.value = user?.profile?.name ?: ""
+            binding?.usernameEditText?.setText(user?.authentication?.localAuthentication?.username)
+            usernameVerificationEvents.value = user?.username ?: ""
+        }
     }
 
     override fun injectFragment(component: UserComponent) {
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 70be854dd..116dd322c 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
@@ -9,15 +9,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
 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.ui.adapter.SkillTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
@@ -37,11 +33,7 @@ class SkillTasksRecyclerViewFragment : BaseFragment<FragmentRecyclerviewBinding>
     var adapter: SkillTasksRecyclerViewAdapter = SkillTasksRecyclerViewAdapter()
     internal var layoutManager: LinearLayoutManager? = null
 
-    private val taskSelectionEvents = PublishSubject.create<Task>()
-
-    fun getTaskSelectionEvents(): Flowable<Task> {
-        return taskSelectionEvents.toFlowable(BackpressureStrategy.DROP)
-    }
+    var onTaskSelection: ((Task) -> Unit)? = null
 
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
@@ -54,14 +46,7 @@ class SkillTasksRecyclerViewFragment : BaseFragment<FragmentRecyclerviewBinding>
         binding?.recyclerView?.layoutManager = layoutManager
 
         adapter = SkillTasksRecyclerViewAdapter()
-        compositeSubscription.add(
-            adapter.getTaskSelectionEvents().subscribe(
-                {
-                    taskSelectionEvents.onNext(it)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        adapter.onTaskSelection = { onTaskSelection?.invoke(it) }
         binding?.recyclerView?.adapter = adapter
 
         val additionalGroupIDs = userViewModel.mirrorGroupTasks.toTypedArray()
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 c5d47dd86..1166cb6c3 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
@@ -13,8 +13,8 @@ import androidx.lifecycle.lifecycleScope
 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.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.responses.SkillResponse
 import com.habitrpg.android.habitica.models.user.User
@@ -27,8 +27,8 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 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.rxjava3.core.Flowable
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -51,7 +51,7 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
         savedInstanceState: Bundle?
     ): View? {
         adapter = SkillsRecyclerViewAdapter()
-        adapter?.useSkillEvents?.subscribeWithErrorHandler { onSkillSelected(it) }?.let { compositeSubscription.add(it) }
+        adapter?.onUseSkill = { onSkillSelected(it) }
 
         this.tutorialStepIdentifier = "skills"
         this.tutorialTexts = listOf(getString(R.string.tutorial_skills))
@@ -79,19 +79,19 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
         adapter?.mana = user.stats?.mp ?: 0.0
         adapter?.level = user.stats?.lvl ?: 0
         adapter?.specialItems = user.items?.special
-        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())
+        lifecycleScope.launchCatching {
+            userRepository.getSkills(user)
+                .combine(userRepository.getSpecialItems(user)) { skills, items ->
+                    val allEntries = mutableListOf<Skill>()
+                    for (skill in skills) {
+                        allEntries.add(skill)
+                    }
+                    for (item in items) {
+                        allEntries.add(item)
+                    }
+                    return@combine allEntries
+                }.collect { skills -> adapter?.setSkillList(skills) }
+        }
     }
 
     private fun onSkillSelected(skill: Skill) {
@@ -128,7 +128,7 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
             }
         }
         if (response.damage > 0) {
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 delay(2000L)
                 if (!isAdded) return@launch
                 showSnackbar(
@@ -140,7 +140,9 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
                 )
             }
         }
-        compositeSubscription.add(userRepository.retrieveUser(false).subscribe({ }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true)
+        }
     }
 
     private val taskSelectionResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -159,16 +161,15 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
         if (skill == null) {
             return
         }
-        val observable: Flowable<SkillResponse> = if (taskId != null) {
-            userRepository.useSkill(skill.key, skill.target, taskId)
-        } else {
-            userRepository.useSkill(skill.key, skill.target)
+        lifecycleScope.launchCatching {
+            val skillResponse = if (taskId != null) {
+                userRepository.useSkill(skill.key, skill.target, taskId)
+            } else {
+                userRepository.useSkill(skill.key, skill.target)
+            }
+            if (skillResponse != null) {
+                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 174f229ee..9f783fa7d 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,6 +7,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
@@ -14,7 +15,6 @@ 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
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
@@ -25,11 +25,10 @@ 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 com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.disposables.Disposable
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.delay
 import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class ChatFragment() : BaseFragment<FragmentChatBinding>() {
 
@@ -52,7 +51,6 @@ class ChatFragment() : BaseFragment<FragmentChatBinding>() {
     private var navigatedOnceToFragment = false
     private var isScrolledToBottom = true
     private var isFirstRefresh = true
-    private var refreshDisposable: Disposable? = null
     var autocompleteContext: String = ""
 
     override fun injectFragment(component: UserComponent) {
@@ -69,16 +67,11 @@ class ChatFragment() : BaseFragment<FragmentChatBinding>() {
 
         chatAdapter = ChatRecyclerViewAdapter(null, true)
         chatAdapter?.let { adapter ->
-            compositeSubscription.add(
-                adapter.getUserLabelClickFlowable().subscribe(
-                    { userId -> FullProfileActivity.open(userId) },
-                    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()))
+            adapter.onOpenProfile = { userId -> FullProfileActivity.open(userId) }
+            adapter.onDeleteMessage = { this.showDeleteConfirmationDialog(it) }
+            adapter.onFlagMessage = { this.showFlagConfirmationDialog(it) }
+            adapter.onReply = { setReplyTo(it) }
+            adapter.onCopyMessage = { this.copyMessageToClipboard(it) }
             adapter.onMessageLike = { viewModel?.likeMessage(it) }
         }
 
@@ -108,48 +101,18 @@ class ChatFragment() : BaseFragment<FragmentChatBinding>() {
         }
 
         viewModel?.user?.observe(
-            viewLifecycleOwner,
-            {
-                chatAdapter?.user = it
-                binding?.chatBarView?.hasAcceptedGuidelines = it?.flags?.communityGuidelinesAccepted == true
-            }
-        )
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        stopAutoRefreshing()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        startAutoRefreshing()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        stopAutoRefreshing()
-    }
-
-    private fun startAutoRefreshing() {
-        if (refreshDisposable?.isDisposed != true) {
-            refreshDisposable?.dispose()
+            viewLifecycleOwner
+        ) {
+            chatAdapter?.user = it
+            binding?.chatBarView?.hasAcceptedGuidelines =
+                it?.flags?.communityGuidelinesAccepted == true
         }
-        refreshDisposable = Observable.interval(30, TimeUnit.SECONDS)
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(
-                {
-                    refresh()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        refresh()
-    }
 
-    private fun stopAutoRefreshing() {
-        if (refreshDisposable?.isDisposed != true) {
-            refreshDisposable?.dispose()
-            refreshDisposable = null
+        lifecycleScope.launchWhenResumed {
+            while (true) {
+                refresh()
+                delay(30.toDuration(DurationUnit.SECONDS))
+            }
         }
     }
 
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 ffc46f7de..76baff135 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
@@ -12,6 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
@@ -20,25 +21,25 @@ import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentInboxMessageListBinding
 import com.habitrpg.android.habitica.extensions.addOkButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.adapter.social.InboxAdapter
 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.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 com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.disposables.Disposable
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBinding>() {
 
@@ -60,7 +61,6 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
     private val viewModel: InboxViewModel by viewModels(factoryProducer = {
         InboxViewModelFactory(replyToUserUUID, chatRoomUser)
     })
-    private var refreshDisposable: Disposable? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -84,60 +84,57 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
         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(viewModel.user.value, member)
-                    chatAdapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-                        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-                            if (positionStart == 0) {
-                                binding?.recyclerView?.scrollToPosition(0)
-                            }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = if (replyToUserUUID?.isNotBlank() == true) {
+                apiClient.getMember(replyToUserUUID!!)
+            } else {
+                apiClient.getMemberWithUsername(chatRoomUser ?: "")
+            }
+            setReceivingUser(member?.username, member?.id)
+            activity?.title = member?.displayName
+            chatAdapter = InboxAdapter(viewModel.user.value, member)
+            chatAdapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+                override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+                    if (positionStart == 0) {
+                        binding?.recyclerView?.scrollToPosition(0)
+                    }
+                }
+            })
+            binding?.recyclerView?.adapter = chatAdapter
+            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+            chatAdapter?.let { adapter ->
+                    adapter.onOpenProfile = {
+                            FullProfileActivity.open(it)
                         }
-                    })
-                    viewModel.messages.observe(this.viewLifecycleOwner) {
-                        markMessagesAsRead(it)
-                        chatAdapter?.submitList(it)
-                    }
+                adapter.onDeleteMessage = { showDeleteConfirmationDialog(it) }
+                adapter.onFlagMessage = { showFlagConfirmationDialog(it) }
+                adapter.onCopyMessage = { copyMessageToClipboard(it) }
+            }
+        }
+
+        viewModel.messages.observe(viewLifecycleOwner) {
+            markMessagesAsRead(it)
+            chatAdapter?.submitList(it)
+        }
 
-                    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()
-            )
-        )
 
         binding?.chatBarView?.sendAction = { sendMessage(it) }
         binding?.chatBarView?.maxChatLength = configManager.maxChatLength()
 
         binding?.chatBarView?.hasAcceptedGuidelines = true
+
+        lifecycleScope.launchWhenResumed {
+            while (true) {
+                refreshConversation()
+                delay(30.toDuration(DurationUnit.SECONDS))
+            }
+        }
     }
 
     override fun onResume() {
         if (replyToUserUUID?.isNotBlank() != true && chatRoomUser?.isNotBlank() != true) {
             parentFragmentManager.popBackStack()
         }
-        startAutoRefreshing()
         super.onResume()
     }
 
@@ -148,16 +145,6 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
         super.onAttach(context)
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        stopAutoRefreshing()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        stopAutoRefreshing()
-    }
-
     override fun onDestroy() {
         socialRepository.close()
         super.onDestroy()
@@ -186,63 +173,31 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
         socialRepository.markSomePrivateMessagesAsRead(viewModel.user.value, messages)
     }
 
-    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(
-                    {}, RxErrorHandler.handleEmptyError(),
-                    {
-                        viewModel.invalidateDataSource()
-                    }
-                )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.retrieveInboxMessages(replyToUserUUID ?: "", 0)
+            viewModel.invalidateDataSource()
+        }
     }
 
     private fun sendMessage(chatText: String) {
         viewModel.memberID?.let { userID ->
-            socialRepository.postPrivateMessage(userID, chatText)
-                .delay(200, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        viewModel.invalidateDataSource()
-                    },
-                    { error ->
-                        RxErrorHandler.reportError(error)
-                        binding?.let {
-                            val alert = HabiticaAlertDialog(it.chatBarView.context)
-                            alert.setTitle("You cannot reply to this conversation")
-                            alert.setMessage("This user is unable to receive your private message")
-                            alert.addOkButton()
-                            alert.show()
-                        }
-                        binding?.chatBarView?.message = chatText
-                    }
-                )
-            KeyboardUtil.dismissKeyboard(getActivity())
+            lifecycleScope.launch(ExceptionHandler.coroutine { error ->
+                ExceptionHandler.reportError(error)
+                binding?.let {
+                    val alert = HabiticaAlertDialog(it.chatBarView.context)
+                    alert.setTitle("You cannot reply to this conversation")
+                    alert.setMessage("This user is unable to receive your private message")
+                    alert.addOkButton()
+                    alert.show()
+                }
+                binding?.chatBarView?.message = chatText
+            }) {
+                socialRepository.postPrivateMessage(userID, chatText)
+                delay(200.toDuration(DurationUnit.MILLISECONDS))
+                viewModel.invalidateDataSource()
+            }
         }
     }
 
@@ -274,7 +229,11 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
                 .setTitle(R.string.confirm_delete_tag_title)
                 .setMessage(R.string.confirm_delete_tag_message)
                 .setIcon(android.R.drawable.ic_dialog_alert)
-                .setPositiveButton(R.string.yes) { _, _ -> socialRepository.deleteMessage(chatMessage).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+                .setPositiveButton(R.string.yes) { _, _ ->
+                    lifecycleScope.launchCatching {
+                        socialRepository.deleteMessage(chatMessage)
+                    }
+                }
                 .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 e86c4aeef..be5499b91 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
@@ -9,6 +9,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -17,15 +18,17 @@ import com.habitrpg.android.habitica.databinding.DialogChooseMessageRecipientBin
 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.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.social.InboxConversation
-import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.views.AvatarView
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
@@ -49,7 +52,9 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
         savedInstanceState: Bundle?
     ): View? {
         this.hidesToolbar = true
-        compositeSubscription.add(this.socialRepository.markPrivateMessagesRead(null).subscribe({ }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launchCatching {
+            socialRepository.markPrivateMessagesRead(null)
+        }
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
@@ -67,14 +72,11 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
     }
 
     private fun loadMessages() {
-        compositeSubscription.add(
-            socialRepository.getInboxConversations().subscribe(
-                {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getInboxConversations().collect {
                     setInboxMessages(it)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+                }
+        }
     }
 
     override fun onDestroy() {
@@ -116,18 +118,17 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
                 binding.errorTextView.visibility = View.GONE
                 binding.progressCircular.visibility = View.VISIBLE
                 val username = binding.uuidEditText.text?.toString() ?: ""
-                socialRepository.getMemberWithUsername(username)
-                    .subscribe(
-                        {
-                            alert.dismiss()
-                            openInboxMessages("", username)
-                            binding.progressCircular.visibility = View.GONE
-                        },
-                        {
-                            binding.errorTextView.visibility = View.VISIBLE
-                            binding.progressCircular.visibility = View.GONE
-                        }
-                    )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val member = socialRepository.retrieveMemberWithUsername(username)
+                    if (member != null) {
+                        alert.dismiss()
+                        openInboxMessages("", username)
+                        binding.progressCircular.visibility = View.GONE
+                    } else {
+                        binding.errorTextView.visibility = View.VISIBLE
+                        binding.progressCircular.visibility = View.GONE
+                    }
+                }
             }
             alert.addButton(getString(R.string.action_cancel), false) { _, _ ->
                 thisActivity.dismissKeyboard()
@@ -143,15 +144,10 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
     }
 
     private fun retrieveMessages() {
-        compositeSubscription.add(
-            this.socialRepository.retrieveInboxConversations()
-                .subscribe(
-                    {
-                        binding?.inboxRefreshLayout?.isRefreshing = false
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        lifecycleScope.launchCatching {
+            socialRepository.retrieveInboxConversations()
+            binding?.inboxRefreshLayout?.isRefreshing = false
+        }
     }
 
     override fun onRefresh() {
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 3043f06e3..403c3fee5 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
@@ -10,14 +10,16 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.text.toHtml
+import androidx.lifecycle.lifecycleScope
 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.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.members.Member
@@ -28,6 +30,12 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.MarkdownParser
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -35,16 +43,22 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
 
     @Inject
     lateinit var socialRepository: SocialRepository
+
     @Inject
     lateinit var inventoryRepository: InventoryRepository
+
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
+
     @Inject
     lateinit var userViewModel: MainUserViewModel
 
     override var binding: FragmentQuestDetailBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQuestDetailBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentQuestDetailBinding {
         return FragmentQuestDetailBinding.inflate(inflater, container, false)
     }
 
@@ -72,30 +86,22 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
         binding?.questCancelButton?.setOnClickListener { onQuestCancel() }
         binding?.questLeaveButton?.setOnClickListener { onQuestLeave() }
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable()
-                .map {
-                    it.party?.id ?: ""
-                }
-                .skipWhile { it.isBlank() }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .map { it?.party?.id }
+                .filterNotNull()
                 .distinctUntilChanged()
-                .flatMap { socialRepository.getGroupFlowable(it) }
-                .doOnNext { updateParty(it) }
-                .map {
-                    it.quest?.key ?: ""
-                }
-                .skipWhile {
-                    it.isBlank()
-                }
+                .flatMapLatest { socialRepository.getGroup(it) }
+                .onEach { updateParty(it) }
+                .map { it?.quest?.key }
+                .filterNotNull()
                 .distinctUntilChanged()
-                .flatMap { inventoryRepository.getQuestContent(it) }
-                .subscribe(
-                    {
-                        updateQuestContent(it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+                .flatMapLatest { inventoryRepository.getQuestContent(it) }
+                .filterNotNull()
+                .collect {
+                    updateQuestContent(it)
+                }
+        }
     }
 
     private fun updateParty(group: Group?) {
@@ -105,16 +111,13 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
         party = group
         quest = group.quest
         setQuestParticipants(group.quest?.participants)
-        compositeSubscription.add(
-            socialRepository.getMember(quest?.leader).subscribe(
-                { member ->
-                    if (context != null && binding?.questLeaderView != null) {
-                        binding?.questLeaderView?.text = context?.getString(R.string.quest_leader_header, member.displayName)
-                    }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = socialRepository.retrieveMember(quest?.leader)
+            if (context != null && binding?.questLeaderView != null) {
+                binding?.questLeaderView?.text =
+                    context?.getString(R.string.quest_leader_header, member?.displayName)
+            }
+        }
 
         val user = userViewModel.user.value
         if (binding?.questResponseWrapper != null) {
@@ -147,7 +150,10 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
         }
         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)
+        binding?.descriptionView?.setText(
+            MarkdownParser.parseMarkdown(questContent.notes).toHtml().fromHtml(),
+            TextView.BufferType.SPANNABLE
+        )
 
         binding?.questScrollImageView?.loadImage("inventory_quest_scroll_" + questContent.key)
     }
@@ -163,7 +169,8 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
             if (quest?.active == true && participant.participatesInQuest == false) {
                 continue
             }
-            val participantView = inflater?.inflate(R.layout.quest_participant, binding?.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
@@ -172,15 +179,30 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
                     when (participant.participatesInQuest) {
                         null -> {
                             statusTextView?.setText(R.string.pending)
-                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.text_ternary))
+                            statusTextView?.setTextColor(
+                                ContextCompat.getColor(
+                                    it,
+                                    R.color.text_ternary
+                                )
+                            )
                         }
                         true -> {
                             statusTextView?.setText(R.string.accepted)
-                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.text_green))
+                            statusTextView?.setTextColor(
+                                ContextCompat.getColor(
+                                    it,
+                                    R.color.text_green
+                                )
+                            )
                         }
                         else -> {
                             statusTextView?.setText(R.string.declined)
-                            statusTextView?.setTextColor(ContextCompat.getColor(it, R.color.text_red))
+                            statusTextView?.setTextColor(
+                                ContextCompat.getColor(
+                                    it,
+                                    R.color.text_red
+                                )
+                            )
                         }
                     }
                 }
@@ -201,8 +223,10 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
         } else {
             binding?.participantsHeader?.setText(R.string.invitations)
             @SuppressLint("SetTextI18n")
-            binding?.participantsHeaderCount?.text = participantCount.toString() + "/" + participants?.size
-            beginQuestMessage = getString(R.string.quest_begin_message, participantCount, participants?.size)
+            binding?.participantsHeaderCount?.text =
+                participantCount.toString() + "/" + participants?.size
+            beginQuestMessage =
+                getString(R.string.quest_begin_message, participantCount, participants?.size)
         }
     }
 
@@ -222,8 +246,9 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
             alert.addButton(R.string.yes, true) { _, _ ->
                 val party = party
                 if (party != null) {
-                    socialRepository.forceStartQuest(party)
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                    lifecycleScope.launchCatching {
+                        socialRepository.forceStartQuest(party)
+                    }
                 }
             }
             alert.addButton(R.string.no, false)
@@ -239,10 +264,11 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
                     .setMessage(R.string.quest_abort_message)
                     .setPositiveButton(R.string.yes) { _, _ ->
                         party?.id?.let { partyID ->
-                            @Suppress("DEPRECATION")
-                            socialRepository.abortQuest(partyID)
-                                .flatMap { userRepository.retrieveUser() }
-                                .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                            lifecycleScope.launchCatching {
+                                socialRepository.abortQuest(partyID)
+                                userRepository.retrieveUser(true)
+                                getActivity()?.supportFragmentManager?.popBackStack()
+                            }
                         }
                     }.setNegativeButton(R.string.no) { _, _ -> }
                 builder.show()
@@ -251,10 +277,11 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
                 alert.setMessage(R.string.quest_cancel_message)
                 alert.addButton(R.string.yes, true) { _, _ ->
                     party?.id?.let { partyID ->
-                        @Suppress("DEPRECATION")
-                        socialRepository.cancelQuest(partyID)
-                            .flatMap { userRepository.retrieveUser() }
-                            .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                        lifecycleScope.launchCatching {
+                            socialRepository.cancelQuest(partyID)
+                            userRepository.retrieveUser(true)
+                            getActivity()?.supportFragmentManager?.popBackStack()
+                        }
                     }
                 }
                 alert.addButton(R.string.no, false)
@@ -269,11 +296,12 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
             .setMessage(if (quest?.active == true) R.string.quest_leave_message else R.string.quest_leave_message_nostart)
             .setPositiveButton(R.string.yes) { _, _ ->
                 party?.id?.let { partyID ->
-                    @Suppress("DEPRECATION")
-                    socialRepository.leaveQuest(partyID)
-                        .flatMap { userRepository.retrieveUser() }
-                        .flatMap { socialRepository.retrieveGroup(partyID) }
-                        .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                    lifecycleScope.launchCatching {
+                        socialRepository.leaveQuest(partyID)
+                        socialRepository.retrieveGroup(partyID)
+                        userRepository.retrieveUser(true)
+                        getActivity()?.supportFragmentManager?.popBackStack()
+                    }
                 }
             }.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 76697e5fe..a1788d525 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
@@ -11,6 +11,7 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
@@ -19,8 +20,8 @@ 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.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
@@ -29,6 +30,11 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.UsernameLabel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.models.PlayerTier
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {
@@ -73,33 +79,30 @@ class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {
         addPlayerTiers()
         bindButtons()
 
-        compositeSubscription.add(
-            socialRepository.getGroupFlowable(Group.TAVERN_ID)
-                .doOnNext { if (!it.hasActiveQuest) binding?.worldBossSection?.visibility = View.GONE }
-                .filter { it.hasActiveQuest }
-                .doOnNext {
-                    binding?.questProgressView?.progress = it.quest
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getGroup(Group.TAVERN_ID)
+                .onEach { if (it?.hasActiveQuest == false) binding?.worldBossSection?.visibility = View.GONE }
+                .filter { it != null && it.hasActiveQuest }
+                .onEach {
+                    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 filtered = it?.quest?.rageStrikes?.filter { strike -> strike.key == "tavern" }
+                    if ((filtered?.size ?: 0) > 0 && filtered?.get(0)?.wasHit == true) {
                         val key = it.quest?.key
                         if (key != null) {
                             shopSpriteSuffix = key
                         }
                     }
                 }
-                .flatMapMaybe { inventoryRepository.getQuestContent(it.quest?.key ?: "").firstElement() }
-                .subscribe(
-                    {
-                        binding?.questProgressView?.quest = it
-                        binding?.worldBossSection?.visibility = View.VISIBLE
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
-
-        compositeSubscription.add(socialRepository.retrieveGroup(Group.TAVERN_ID).subscribe({ }, RxErrorHandler.handleEmptyError()))
+                .map { inventoryRepository.getQuestContent(it?.quest?.key ?: "").firstOrNull() }
+                .collect {
+                    binding?.questProgressView?.quest = it
+                    binding?.worldBossSection?.visibility = View.VISIBLE
+                }
+        }
 
+        lifecycleScope.launch(ExceptionHandler.coroutine()) { socialRepository.retrieveGroup(Group.TAVERN_ID) }
+        
         user?.let { binding?.questProgressView?.configure(it) }
     }
 
@@ -112,7 +115,9 @@ class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {
 
     private fun bindButtons() {
         binding?.innButton?.setOnClickListener {
-            user?.let { user -> userRepository.sleep(user).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                user?.let { user -> userRepository.sleep(user) }
+            }
         }
         binding?.guidelinesButton?.setOnClickListener {
             MainNavigationController.navigate(R.id.guidelinesActivity)
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 d42a2462c..16780f1b6 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
@@ -11,6 +11,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.net.toUri
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
@@ -19,8 +20,9 @@ import com.habitrpg.android.habitica.databinding.DialogChallengeDetailTaskGroupB
 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.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -32,11 +34,13 @@ 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.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.EmojiParser
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 import retrofit2.HttpException
 import javax.inject.Inject
 
@@ -92,23 +96,19 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         }
 
         challengeID?.let { id ->
-            compositeSubscription.add(
+            lifecycleScope.launchCatching {
                 challengeRepository.getChallenge(id)
-                    .doOnNext {
-                        set(it)
-                    }
                     .map {
-                        return@map (it.leaderId ?: "")
+                        set(it)
+                        (it.leaderId ?: "")
                     }
-                    .filter { it.isNotEmpty() }
-                    .flatMap { creatorID ->
-                        return@flatMap socialRepository.getMember(creatorID)
+                    .distinctUntilChanged()
+                    .collect {
+                        set(socialRepository.retrieveMember(it))
                     }
-                    .subscribe({ set(it) }, RxErrorHandler.handleEmptyError())
-            )
-            compositeSubscription.add(
-                challengeRepository.getChallengeTasks(id).subscribe(
-                    { taskList ->
+            }
+            lifecycleScope.launchCatching {
+                challengeRepository.getChallengeTasks(id).collect { taskList ->
                         binding?.taskGroupLayout?.removeAllViewsInLayout()
 
                         val todos = ArrayList<Task>()
@@ -141,26 +141,22 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
                         if (rewards.size > 0) {
                             addRewards(rewards)
                         }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-            )
+                    }
+            }
 
-            compositeSubscription.add(
-                challengeRepository.isChallengeMember(id).subscribe(
-                    { isMember ->
-                        setJoined(isMember)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-            )
+            lifecycleScope.launchCatching {
+                challengeRepository.isChallengeMember(id).collect { isMember ->
+                    setJoined(isMember)
+                }
+            }
         }
 
         binding?.joinButton?.setOnClickListener {
             challenge?.let { challenge ->
-                challengeRepository.joinChallenge(challenge)
-                    .flatMap { userRepository.retrieveUser(true) }
-                    .subscribe({}, RxErrorHandler.handleEmptyError())
+                lifecycleScope.launchCatching {
+                    challengeRepository.joinChallenge(challenge)
+                    userRepository.retrieveUser(true)
+                }
             }
         }
         binding?.leaveButton?.setOnClickListener { showChallengeLeaveDialog() }
@@ -224,14 +220,15 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
 
     private fun refresh() {
         challengeID?.let { id ->
-            challengeRepository.retrieveChallenge(id)
-                .flatMap { challengeRepository.retrieveChallengeTasks(id) }
-                .subscribe({ }, {
-                    if (it is HttpException && it.code() == 404) {
-                        MainNavigationController.navigateBack()
-                    }
-                    RxErrorHandler.reportError(it)
-                })
+            lifecycleScope.launchCatching({
+                if (it is HttpException && it.code() == 404) {
+                    MainNavigationController.navigateBack()
+                }
+                ExceptionHandler.reportError(it)
+            }) {
+                challengeRepository.retrieveChallenge(id)
+                challengeRepository.retrieveChallengeTasks(id)
+            }
         }
     }
 
@@ -245,7 +242,8 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         binding?.participantCount?.text = challenge.memberCount.toString()
     }
 
-    private fun set(creator: Member) {
+    private fun set(creator: Member?) {
+        if (creator == null) return
         binding?.creatorAvatarview?.setAvatar(creator)
         binding?.creatorLabel?.tier = creator.contributor?.level ?: 0
         binding?.creatorLabel?.username = creator.displayName
@@ -267,7 +265,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         for (i in 0 until habits.size) {
             val task = habits[i]
             val entry = groupBinding.tasksLayout.inflate(R.layout.habit_item_card)
-            val viewHolder = HabitViewHolder(entry, { _, _ -> }, {}, {})
+            val viewHolder = HabitViewHolder(entry, { _, _ -> }, {}, {}, null)
             viewHolder.isLocked = true
             viewHolder.bind(task, i, "normal")
             groupBinding.tasksLayout.addView(entry)
@@ -282,7 +280,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         for (i in 0 until dailies.size) {
             val task = dailies[i]
             val entry = groupBinding.tasksLayout.inflate(R.layout.daily_item_card)
-            val viewHolder = DailyViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {})
+            val viewHolder = DailyViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {}, null)
             viewHolder.isLocked = true
             viewHolder.bind(task, i, "normal")
             groupBinding.tasksLayout.addView(entry)
@@ -297,7 +295,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         for (i in 0 until todos.size) {
             val task = todos[i]
             val entry = groupBinding.tasksLayout.inflate(R.layout.todo_item_card)
-            val viewHolder = TodoViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {})
+            val viewHolder = TodoViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {}, null)
             viewHolder.isLocked = true
             viewHolder.bind(task, i, "normal")
             groupBinding.tasksLayout.addView(entry)
@@ -312,9 +310,9 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         for (i in 0 until rewards.size) {
             val task = rewards[i]
             val entry = groupBinding.tasksLayout.inflate(R.layout.reward_item_card)
-            val viewHolder = RewardViewHolder(entry, { _, _ -> }, {}, {})
+            val viewHolder = RewardViewHolder(entry, { _, _ -> }, {}, {}, null)
             viewHolder.isLocked = true
-            viewHolder.bind(task, i, true, "normal")
+            viewHolder.bind(task, i, true, "normal", null)
             groupBinding.tasksLayout.addView(entry)
         }
     }
@@ -335,11 +333,15 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         alert.setMessage(this.getString(R.string.challenge_leave_description))
         alert.addButton(R.string.leave_keep_tasks, true) { _, _ ->
             val challenge = challenge ?: return@addButton
-            challengeRepository.leaveChallenge(challenge, "keep-all").subscribe({}, RxErrorHandler.handleEmptyError())
+            lifecycleScope.launchCatching {
+                challengeRepository.leaveChallenge(challenge, "keep-all")
+            }
         }
         alert.addButton(R.string.leave_delete_tasks, isPrimary = false, isDestructive = true) { _, _ ->
             val challenge = challenge ?: return@addButton
-            challengeRepository.leaveChallenge(challenge, "remove-all").subscribe({}, RxErrorHandler.handleEmptyError())
+            lifecycleScope.launchCatching {
+                challengeRepository.leaveChallenge(challenge, "remove-all")
+            }
         }
         alert.setExtraCloseButtonVisibility(View.VISIBLE)
         alert.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 7816db106..fc750e4c1 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
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -11,8 +12,9 @@ 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.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.modules.AppModule
@@ -20,25 +22,32 @@ import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.common.habitica.helpers.EmptyItem
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.kotlin.Flowables
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
 
-class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(),
+    androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var challengeRepository: ChallengeRepository
+
     @Inject
     lateinit var socialRepository: SocialRepository
+
     @Inject
     lateinit var userRepository: UserRepository
+
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
 
     override var binding: FragmentRefreshRecyclerviewBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentRefreshRecyclerviewBinding {
         return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
     }
 
@@ -66,9 +75,7 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
         super.onViewCreated(view, savedInstanceState)
 
         challengeAdapter = ChallengesListViewAdapter(viewUserChallengesOnly, userId)
-        challengeAdapter?.getOpenDetailFragmentFlowable()?.subscribe({ openDetailFragment(it) }, RxErrorHandler.handleEmptyError())
-            ?.let { compositeSubscription.add(it) }
-
+        challengeAdapter?.onOpenChallengeFragment = { openDetailFragment(it) }
         binding?.refreshLayout?.setOnRefreshListener(this)
 
         if (viewUserChallengesOnly) {
@@ -77,22 +84,23 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
                 getString(R.string.empty_discover_description)
             )
         }
-        binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this.activity)
+        binding?.recyclerView?.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(this.activity)
         binding?.recyclerView?.adapter = challengeAdapter
         if (!viewUserChallengesOnly) {
             binding?.recyclerView?.setBackgroundResource(R.color.content_background)
         }
 
-        compositeSubscription.add(
-            Flowables.combineLatest(socialRepository.getGroupFlowable(Group.TAVERN_ID), socialRepository.getUserGroups("guild")).subscribe(
-                {
-                    this.filterGroups = mutableListOf()
-                    filterGroups?.add(it.first)
-                    filterGroups?.addAll(it.second)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getGroup(Group.TAVERN_ID)
+                .combine(socialRepository.getUserGroups("guild")) { tavern, guilds ->
+                    return@combine Pair(tavern, guilds)
+                }.collect {
+                this@ChallengeListFragment.filterGroups = mutableListOf()
+                it.first?.let { tavern -> filterGroups?.add(tavern) }
+                filterGroups?.addAll(it.second)
+            }
+        }
 
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
@@ -111,7 +119,11 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
     }
 
     private fun openDetailFragment(challengeID: String) {
-        MainNavigationController.navigate(ChallengesOverviewFragmentDirections.openChallengeDetail(challengeID))
+        MainNavigationController.navigate(
+            ChallengesOverviewFragmentDirections.openChallengeDetail(
+                challengeID
+            )
+        )
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -129,24 +141,20 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
     }
 
     private fun loadLocalChallenges() {
-        val observable: Flowable<out List<Challenge>> = if (viewUserChallengesOnly) {
-            challengeRepository.getUserChallenges()
-        } else {
-            challengeRepository.getChallenges()
+        lifecycleScope.launchCatching {
+            val flow = if (viewUserChallengesOnly) {
+                challengeRepository.getUserChallenges()
+            } else {
+                challengeRepository.getChallenges()
+            }
+            flow.collect { challenges ->
+                if (challenges.isEmpty()) {
+                    retrieveChallengesPage()
+                }
+                this@ChallengeListFragment.challenges = challenges
+                challengeAdapter?.updateUnfilteredData(challenges)
+            }
         }
-
-        compositeSubscription.add(
-            observable.subscribe(
-                { challenges ->
-                    if (challenges.isEmpty()) {
-                        retrieveChallengesPage()
-                    }
-                    this.challenges = challenges
-                    challengeAdapter?.updateUnfilteredData(challenges)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
     }
 
     internal fun retrieveChallengesPage(forced: Boolean = false) {
@@ -154,19 +162,15 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
             return
         }
         setRefreshing(true)
-        compositeSubscription.add(
-            challengeRepository.retrieveChallenges(nextPageToLoad, viewUserChallengesOnly).doOnComplete {
-                setRefreshing(false)
-            }.subscribe(
-                {
-                    if (it.size < 10) {
-                        loadedAllData = true
-                    }
-                    nextPageToLoad += 1
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launchCatching {
+            val challenges =
+                challengeRepository.retrieveChallenges(nextPageToLoad, viewUserChallengesOnly)
+            setRefreshing(false)
+            if ((challenges?.size ?: 0) < 10) {
+                loadedAllData = true
+            }
+            nextPageToLoad += 1
+        }
     }
 
     internal fun showFilterDialog() {
@@ -174,7 +178,8 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
             ChallengeFilterDialogHolder.showDialog(
                 it,
                 filterGroups ?: emptyList(),
-                filterOptions) {
+                filterOptions
+            ) {
                 changeFilter(it)
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
index 0439cf78e..3645a9ec5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
@@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.data.UserRepository
 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.helpers.launchCatching
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
@@ -31,6 +32,7 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -133,11 +135,12 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
 
     private fun getGroupChallenges(): List<Challenge> {
         val groupChallenges = mutableListOf<Challenge>()
-        userRepository.getUserFlowable().forEach {
-            it.challenges?.forEach {
-                challengeRepository.getChallenge(it.challengeID).forEach {
-                    if (it.groupId.equals(viewModel?.groupID)) {
-                        groupChallenges.add(it)
+        lifecycleScope.launchCatching {
+            userRepository.getUser().collect {
+                it?.challenges?.forEach { membership ->
+                    val challenge = challengeRepository.getChallenge(membership.challengeID).firstOrNull()
+                    if (challenge != null && challenge.groupId == viewModel?.groupID) {
+                        groupChallenges.add(challenge)
                     }
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
index 7b090ab0a..72e4d972a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
@@ -5,20 +5,25 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
+import androidx.lifecycle.lifecycleScope
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 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.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.adapter.social.GuildListAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.common.habitica.helpers.EmptyItem
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), SearchView.OnQueryTextListener, SearchView.OnCloseListener, SwipeRefreshLayout.OnRefreshListener {
+class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(),
+    SearchView.OnQueryTextListener, SearchView.OnCloseListener,
+    SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var socialRepository: SocialRepository
@@ -26,7 +31,10 @@ class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), Se
     override var binding: FragmentRefreshRecyclerviewBinding? = null
     var onlyShowUsersGuilds: Boolean = false
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentRefreshRecyclerviewBinding {
         return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
     }
 
@@ -39,7 +47,8 @@ class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), Se
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
+        binding?.recyclerView?.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(activity)
         viewAdapter.socialRepository = socialRepository
         binding?.recyclerView?.adapter = viewAdapter
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
@@ -52,17 +61,18 @@ class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), Se
 
         viewAdapter.onlyShowUsersGuilds = onlyShowUsersGuilds
         if (onlyShowUsersGuilds) {
-            compositeSubscription.add(socialRepository.getUserGroups("guild").subscribe({ viewAdapter.setUnfilteredData(it) }, RxErrorHandler.handleEmptyError()))
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.getUserGroups("guild")
+                    .collect {
+                        viewAdapter.setUnfilteredData(it)
+                    }
+            }
         } else {
-            compositeSubscription.add(
-                this.socialRepository.getPublicGuilds()
-                    .subscribe(
-                        { groups ->
-                            this@GuildListFragment.viewAdapter.setUnfilteredData(groups)
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+            lifecycleScope.launchCatching {
+                socialRepository.getPublicGuilds().collect { groups ->
+                    this@GuildListFragment.viewAdapter.setUnfilteredData(groups)
+                }
+            }
         }
         this.fetchGuilds()
     }
@@ -73,15 +83,10 @@ class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), Se
     }
 
     internal fun fetchGuilds() {
-        compositeSubscription.add(
-            this.socialRepository.retrieveGroups(if (onlyShowUsersGuilds) "guilds" else "publicGuilds")
-                .subscribe(
-                    {
-                        binding?.refreshLayout?.isRefreshing = false
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        lifecycleScope.launchCatching {
+            socialRepository.retrieveGroups(if (onlyShowUsersGuilds) "guilds" else "publicGuilds")
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     override fun onQueryTextSubmit(s: String?): Boolean {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
index eeb1199d5..f4f29c64a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
@@ -16,21 +16,24 @@ import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
 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.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.common.habitica.views.AvatarView
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.common.habitica.extensions.DataBindingUtils
-import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import com.habitrpg.common.habitica.views.AvatarView
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
@@ -64,36 +67,36 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
         binding?.refreshLayout?.setOnRefreshListener { this.refresh() }
 
         binding?.invitationsView?.acceptCall = {
-            socialRepository.joinGroup(it)
-                .flatMap { userRepository.retrieveUser(false) }
-                .subscribe(
-                    {
-                        parentFragmentManager.popBackStack()
-                        MainNavigationController.navigate(
-                            R.id.partyFragment,
-                            bundleOf(Pair("partyID", userViewModel.partyID))
-                        )
-                    },
-                    RxErrorHandler.handleEmptyError()
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.joinGroup(it)
+                userRepository.retrieveUser(false)
+                parentFragmentManager.popBackStack()
+                MainNavigationController.navigate(
+                    R.id.partyFragment,
+                    bundleOf(Pair("partyID", userViewModel.partyID))
                 )
+            }
         }
 
         binding?.invitationsView?.rejectCall = {
-            socialRepository.rejectGroupInvite(it).subscribe({ }, RxErrorHandler.handleEmptyError())
+            lifecycleScope.launchCatching {
+                socialRepository.rejectGroupInvite(it)
+            }
             binding?.invitationWrapper?.visibility = View.GONE
         }
 
-        binding?.invitationsView?.setLeader = { leader ->
-            compositeSubscription.add(
-                socialRepository.getMember(leader)
-                    .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()
-                    )
-            )
+        binding?.invitationsView?.setLeader = { leaderID ->
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val leader = socialRepository.retrieveMember(leaderID) ?: return@launch
+                binding?.root?.findViewById<AvatarView>(R.id.groupleader_avatar_view)
+                                ?.setAvatar(leader)
+                binding?.root?.findViewById<TextView>(R.id.groupleader_text_view)?.text =
+                                getString(
+                                    R.string.invitation_title,
+                                    leader.displayName,
+                                    binding?.invitationsView?.groupName
+                                )
+            }
         }
 
         binding?.usernameTextview?.setOnClickListener {
@@ -153,42 +156,38 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
         if (it.resultCode == Activity.RESULT_OK) {
             val bundle = it.data?.extras
             if (bundle?.getString("groupType") == "party") {
-                socialRepository.createGroup(
-                    bundle.getString("name"),
-                    bundle.getString("description"),
-                    bundle.getString("leader"),
-                    "party",
-                    bundle.getString("privacy"),
-                    bundle.getBoolean("leaderCreateChallenge")
-                )
-                    .flatMap {
+                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                        val group = socialRepository.createGroup(
+                            bundle.getString("name"),
+                            bundle.getString("description"),
+                            bundle.getString("leader"),
+                            "party",
+                            bundle.getString("privacy"),
+                            bundle.getBoolean("leaderCreateChallenge")
+                        )
                         userRepository.retrieveUser(false)
+                        if (isAdded) {
+                            parentFragmentManager.popBackStack()
+                        }
+                        MainNavigationController.navigate(
+                            R.id.partyFragment,
+                            bundleOf(Pair("partyID", userViewModel.partyID))
+                        )
                     }
-                    .subscribe(
-                        {
-                            if (isAdded) {
-                                parentFragmentManager.popBackStack()
-                            }
-                            MainNavigationController.navigate(
-                                R.id.partyFragment,
-                                bundleOf(Pair("partyID", userViewModel.partyID))
-                            )
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
             }
         }
     }
 
     private fun refresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, forced = true)
-                .filter { it.hasParty }
-                .flatMap { socialRepository.retrieveGroup("party") }
-                .flatMap { group1 -> socialRepository.retrieveGroupMembers(group1.id, true) }
-                .doOnComplete { binding?.refreshLayout?.isRefreshing = false }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.retrieveUser(false, true)
+            if (user?.hasParty == true) {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val group = socialRepository.retrieveGroup("party")
+                    socialRepository.retrievePartyMembers(group?.id ?: "", true)
+                }
+            }
+        }
     }
 
     override fun onDestroy() {
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 134d560ca..281b1df0c 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
@@ -17,32 +17,34 @@ 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.common.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.common.habitica.views.AvatarView
 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.ItemDialogFragment
-import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.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.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import com.habitrpg.common.habitica.views.AvatarView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
@@ -95,28 +97,27 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
 
         binding?.invitationsView?.acceptCall = {
             viewModel?.joinGroup(it) {
-                compositeSubscription.add(
-                    userRepository.retrieveUser(false)
-                        .subscribe { user ->
-                            parentFragmentManager.popBackStack()
-                            MainNavigationController.navigate(
-                                R.id.partyFragment,
-                                bundleOf(Pair("partyID", user.party?.id))
-                            )
-                        }
-                )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val user = userRepository.retrieveUser(false)
+                    parentFragmentManager.popBackStack()
+                    MainNavigationController.navigate(
+                        R.id.partyFragment,
+                        bundleOf(Pair("partyID", user?.party?.id))
+                    )
+                }
             }
         }
 
         binding?.invitationsView?.rejectCall = {
-            socialRepository.rejectGroupInvite(it)
-                .flatMap { userRepository.retrieveUser(false, true) }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+            lifecycleScope.launchCatching {
+                socialRepository.rejectGroupInvite(it)
+                userRepository.retrieveUser(false, true)
+            }
         }
 
-        viewModel?.getGroupData()?.observe(viewLifecycleOwner, { updateParty(it) })
-        viewModel?.user?.observe(viewLifecycleOwner, { updateUser(it) })
-        viewModel?.getMembersData()?.observe(viewLifecycleOwner, { updateMembersList(it) })
+        viewModel?.getGroupData()?.observe(viewLifecycleOwner) { updateParty(it) }
+        viewModel?.user?.observe(viewLifecycleOwner) { updateUser(it) }
+        viewModel?.getMembersData()?.observe(viewLifecycleOwner) { updateMembersList(it) }
     }
 
     private fun refreshParty() {
@@ -141,8 +142,10 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             binding?.questImageWrapper?.visibility = View.VISIBLE
             lifecycleScope.launch(Dispatchers.Main) {
                 delay(500)
-                inventoryRepository.getQuestContent(party.quest?.key ?: "")
-                    .subscribe({ this@PartyDetailFragment.updateQuestContent(it) }, RxErrorHandler.handleEmptyError())
+                val content = inventoryRepository.getQuestContent(party.quest?.key ?: "").firstOrNull()
+                if (content != null) {
+                    updateQuestContent(content)
+                }
             }
         } else {
             binding?.newQuestButton?.visibility = View.VISIBLE
@@ -184,16 +187,17 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     val groupName = invitation.name
 
                     leaderID.let { id ->
-                        compositeSubscription.add(
-                            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()
+                        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                            val member = socialRepository.retrieveMember(id) ?: return@launch
+                            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
                                 )
-                        )
+                        }
                     }
 
                     view?.findViewById<Button>(R.id.accept_button)?.setOnClickListener {
@@ -263,7 +267,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
         val leaderID = viewModel?.leaderID
         members?.forEachIndexed { index, member ->
             val memberView = (
-                if (binding?.membersWrapper?.childCount ?: 0 > index) {
+                if ((binding?.membersWrapper?.childCount ?: 0) > index) {
                     binding?.membersWrapper?.getChildAt(index)
                 } else {
                     val view = binding?.membersWrapper?.inflate(R.layout.party_member, false)
@@ -299,18 +303,15 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
 
         val addMessageDialog = context?.let { HabiticaAlertDialog(it) }
         addMessageDialog?.addButton(android.R.string.ok, true) { _, _ ->
-            socialRepository.postPrivateMessage(userID, emojiEditText.text.toString())
-                .subscribe(
-                    {
-                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
-                            HabiticaSnackbar.showSnackbar(
-                                it1,
-                                String.format(getString(R.string.profile_message_sent_to), username), HabiticaSnackbar.SnackbarDisplayType.NORMAL
-                            )
-                        }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.postPrivateMessage(userID, emojiEditText.text.toString())
+                (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                    HabiticaSnackbar.showSnackbar(
+                        it1,
+                        String.format(getString(R.string.profile_message_sent_to), username), HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                    )
+                }
+            }
             activity?.dismissKeyboard()
         }
         addMessageDialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
@@ -321,18 +322,15 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     private fun showTransferOwnerShipDialog(userID: String, displayName: String) {
         val dialog = context?.let { HabiticaAlertDialog(it) }
         dialog?.addButton(R.string.transfer, true) { _, _ ->
-            socialRepository.transferGroupOwnership(viewModel?.groupID ?: "", userID)
-                .subscribe(
-                    {
-                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
-                            HabiticaSnackbar.showSnackbar(
-                                it1,
-                                String.format(getString(R.string.transferred_ownership), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL
-                            )
-                        }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.transferGroupOwnership(viewModel?.groupID ?: "", userID)
+                (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                    HabiticaSnackbar.showSnackbar(
+                        it1,
+                        String.format(getString(R.string.transferred_ownership), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                    )
+                }
+            }
             activity?.dismissKeyboard()
         }
         dialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
@@ -344,18 +342,15 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     private fun showRemoveMemberDialog(userID: String, displayName: String) {
         val dialog = context?.let { HabiticaAlertDialog(it) }
         dialog?.addButton(R.string.remove, true) { _, _ ->
-            socialRepository.removeMemberFromGroup(viewModel?.groupID ?: "", userID)
-                .subscribe(
-                    {
-                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
-                            HabiticaSnackbar.showSnackbar(
-                                it1,
-                                String.format(getString(R.string.removed_member), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL
-                            )
-                        }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.removeMemberFromGroup(viewModel?.groupID ?: "", userID)
+                (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                    HabiticaSnackbar.showSnackbar(
+                        it1,
+                        String.format(getString(R.string.removed_member), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                    )
+                }
+            }
             activity?.dismissKeyboard()
         }
         dialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
@@ -373,12 +368,13 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     }
 
     private fun getGroupChallenges(): List<Challenge> {
-        var groupChallenges = mutableListOf<Challenge>()
-        userRepository.getUserFlowable().forEach {
-            it.challenges?.forEach {
-                challengeRepository.getChallenge(it.challengeID).forEach {
-                    if (it.groupId.equals(viewModel?.groupID)) {
-                        groupChallenges.add(it)
+        val groupChallenges = mutableListOf<Challenge>()
+        lifecycleScope.launchCatching {
+            userRepository.getUser().collect {
+                it?.challenges?.forEach { membership ->
+                    val challenge = challengeRepository.getChallenge(membership.challengeID).firstOrNull()
+                    if (challenge != null && challenge.groupId == viewModel?.groupID) {
+                        groupChallenges.add(challenge)
                     }
                 }
             }
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 67b8961c7..bddbfc9a6 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
@@ -14,17 +14,18 @@ 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.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.AppTestingLevel
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.helpers.AppTestingLevel
 import com.jaredrummler.android.device.DeviceName
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
-import kotlinx.coroutines.launch
 
 class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
     private var deviceInfo: DeviceName.DeviceInfo? = null
@@ -62,7 +63,7 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        lifecycleScope.launch {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             DeviceName.with(context).request { info, _ ->
                 deviceInfo = info
             }
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 d01a7c2be..50140e9c0 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,10 +5,11 @@ import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.FAQRepository
 import com.habitrpg.android.habitica.databinding.FragmentFaqDetailBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import javax.inject.Inject
@@ -42,15 +43,12 @@ class FAQDetailFragment : BaseMainFragment<FragmentFaqDetailBinding>() {
                 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()
-                    )
-                )
+                lifecycleScope.launchCatching {
+                    faqRepository.getArticle(args.position).collect { faq ->
+                        binding?.questionTextView?.text = faq.question
+                        binding?.answerTextView?.text = MarkdownParser.parseMarkdown(faq.answer)
+                    }
+                }
             }
         }
 
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 39c4c28e7..9fecc4330 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
@@ -7,18 +7,18 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
 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.databinding.FragmentFaqOverviewBinding
 import com.habitrpg.android.habitica.databinding.SupportFaqItemBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.rxjava3.functions.Consumer
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.helpers.setMarkdown
 import javax.inject.Inject
 
 class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
@@ -77,22 +77,23 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
     }
 
     private fun loadArticles() {
-        compositeSubscription.add(
-            faqRepository.getArticles().subscribe(
-                Consumer {
-                    val context = context ?: return@Consumer
-                    for (article in it) {
-                        val binding = SupportFaqItemBinding.inflate(context.layoutInflater, binding?.faqLinearLayout, true)
-                        binding.textView.text = article.question
-                        binding.root.setOnClickListener {
-                            val direction = FAQOverviewFragmentDirections.openFAQDetail(null, null)
-                            direction.position = article.position ?: 0
-                            MainNavigationController.navigate(direction)
-                        }
+        lifecycleScope.launchCatching {
+            faqRepository.getArticles().collect {
+                val context = context ?: return@collect
+                for (article in it) {
+                    val binding = SupportFaqItemBinding.inflate(
+                        context.layoutInflater,
+                        binding?.faqLinearLayout,
+                        true
+                    )
+                    binding.textView.text = article.question
+                    binding.root.setOnClickListener {
+                        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 89d424f90..1b1d8c084 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
@@ -6,16 +6,18 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.net.toUri
+import androidx.lifecycle.lifecycleScope
 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.databinding.FragmentSupportMainBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -59,9 +61,11 @@ class SupportMainFragment : BaseMainFragment<FragmentSupportMainBinding>() {
         }
 
         binding?.resetTutorialButton?.setOnClickListener {
-            userRepository.resetTutorial().subscribe({
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.resetTutorial()
                 activity?.showSnackbar(null, null, getString(R.string.tutorial_reset_confirmation), displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
-            }, RxErrorHandler.handleEmptyError())
+
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
index 035729ba6..cd86dd2e4 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
@@ -9,19 +9,20 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 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.rxjava3.functions.Consumer
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import kotlinx.coroutines.launch
 
 class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
@@ -33,7 +34,9 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        compositeSubscription.add(inventoryRepository.retrieveInAppRewards().subscribe({ }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launchCatching {
+            inventoryRepository.retrieveInAppRewards()
+        }
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
@@ -42,7 +45,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
         (layoutManager as? GridLayoutManager)?.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
-                return if (recyclerAdapter?.getItemViewType(position) ?: 0 < 2) {
+                return if ((recyclerAdapter?.getItemViewType(position) ?: 0) < 2) {
                     (layoutManager as? GridLayoutManager)?.spanCount ?: 1
                 } else {
                     1
@@ -57,25 +60,19 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
         if (showCustomRewards) {
-            compositeSubscription.add(
-                inventoryRepository.getInAppRewards().subscribe(
-                    {
-                        (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-            )
+            lifecycleScope.launchCatching {
+                inventoryRepository.getInAppRewards().collect {
+                    (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
+                }
+            }
         }
 
-        (recyclerAdapter as? RewardsRecyclerViewAdapter)?.purchaseCardEvents?.subscribe(
-            {
+        (recyclerAdapter as? RewardsRecyclerViewAdapter)?.purchaseCardEvents = {
                 selectedCard = it
                 val intent = Intent(activity, SkillMemberActivity::class.java)
                 cardSelectedResult.launch(intent)
-            },
-            RxErrorHandler.handleEmptyError()
-        )?.let { compositeSubscription.add(it) }
-        recyclerAdapter?.brokenTaskEvents?.subscribeWithErrorHandler { showBrokenChallengeDialog(it) }?.let { compositeSubscription.add(it) }
+            }
+        recyclerAdapter?.brokenTaskEvents = { showBrokenChallengeDialog(it) }
 
         viewModel.user.observe(viewLifecycleOwner) {
             (recyclerAdapter as? RewardsRecyclerViewAdapter)?.user = it
@@ -93,13 +90,11 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
     override fun onRefresh() {
         binding?.refreshLayout?.isRefreshing = true
-        compositeSubscription.add(
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             userRepository.retrieveUser(withTasks = true, forced = true)
-                .flatMap { inventoryRepository.retrieveInAppRewards() }
-                .doOnTerminate {
-                    binding?.refreshLayout?.isRefreshing = false
-                }.subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+            inventoryRepository.retrieveInAppRewards()
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     private fun setGridSpanCount(width: Int) {
@@ -118,21 +113,19 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
     private val cardSelectedResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == Activity.RESULT_OK) {
-            userRepository.useSkill(
-                selectedCard?.key ?: "",
-                "member",
-                it.data?.getStringExtra("member_id") ?: ""
-            )
-                .subscribeWithErrorHandler(
-                    Consumer {
-                        val activity = (activity as? MainActivity) ?: return@Consumer
-                        HabiticaSnackbar.showSnackbar(
-                            activity.snackbarContainer,
-                            context?.getString(R.string.sent_card, selectedCard?.text),
-                            HabiticaSnackbar.SnackbarDisplayType.BLUE
-                        )
-                    }
+            lifecycleScope.launchCatching {
+                userRepository.useSkill(
+                    selectedCard?.key ?: "",
+                    "member",
+                    it.data?.getStringExtra("member_id") ?: ""
                 )
+                val activity = (activity as? MainActivity) ?: return@launchCatching
+                HabiticaSnackbar.showSnackbar(
+                    activity.snackbarContainer,
+                    context?.getString(R.string.sent_card, selectedCard?.text),
+                    HabiticaSnackbar.SnackbarDisplayType.BLUE
+                )
+            }
         }
     }
 
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 95c13db11..d18718192 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
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.tasks
 
 import android.content.Context
-import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
@@ -23,13 +22,14 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.extensions.setScaledPadding
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.helpers.launchCatching
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
@@ -50,43 +50,55 @@ import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.disposables.CompositeDisposable
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.Date
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(),
+    androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
     private var taskFlowJob: Job? = null
-    val viewModel: TasksViewModel by viewModels({requireParentFragment()})
+    val viewModel: TasksViewModel by viewModels({ requireParentFragment() })
 
-    internal var canEditTasks: Boolean = true
     internal var canScoreTaks: Boolean = true
     override var binding: FragmentRefreshRecyclerviewBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentRefreshRecyclerviewBinding {
         return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
     }
 
-    private var recyclerSubscription: CompositeDisposable = CompositeDisposable()
     var recyclerAdapter: TaskRecyclerViewAdapter? = null
     var itemAnimator = SafeDefaultItemAnimator()
+
     @Inject
     lateinit var userRepository: UserRepository
+
     @Inject
     lateinit var inventoryRepository: InventoryRepository
+
     @Inject
     lateinit var taskRepository: TaskRepository
+
     @Inject
     lateinit var soundManager: SoundManager
+
     @Inject
     lateinit var configManager: AppConfigManager
+
     @Inject
     lateinit var sharedPreferences: SharedPreferences
+
     @Inject
     lateinit var notificationsManager: NotificationsManager
 
@@ -99,24 +111,23 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         get() = this.taskType
 
     private fun setInnerAdapter() {
-        if (binding?.recyclerView?.adapter != null && binding?.recyclerView?.adapter == recyclerAdapter && !recyclerSubscription.isDisposed) {
+        if (binding?.recyclerView?.adapter != null && binding?.recyclerView?.adapter == recyclerAdapter) {
             return
         }
-        if (!recyclerSubscription.isDisposed) {
-            recyclerSubscription.dispose()
-        }
-        recyclerSubscription = CompositeDisposable()
         viewModel.let { viewModel ->
             val adapter: BaseRecyclerViewAdapter<*, *>? = when (this.taskType) {
                 TaskType.HABIT -> HabitsRecyclerViewAdapter(R.layout.habit_item_card, viewModel)
                 TaskType.DAILY -> DailiesRecyclerViewHolder(R.layout.daily_item_card, viewModel)
                 TaskType.TODO -> TodosRecyclerViewAdapter(R.layout.todo_item_card, viewModel)
-                TaskType.REWARD -> RewardsRecyclerViewAdapter(null, R.layout.reward_item_card)
+                TaskType.REWARD -> RewardsRecyclerViewAdapter(
+                    null,
+                    R.layout.reward_item_card,
+                    viewModel
+                )
                 else -> null
             }
 
             recyclerAdapter = adapter as? TaskRecyclerViewAdapter
-            recyclerAdapter?.canScoreTasks = canScoreTaks
             binding?.recyclerView?.adapter = adapter
 
             viewModel.getFilterSet(taskType)?.observe(viewLifecycleOwner) {
@@ -125,31 +136,31 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         }
         context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
 
-        recyclerAdapter?.errorButtonEvents?.subscribe(
-            {
-                taskRepository.syncErroredTasks().subscribe({}, RxErrorHandler.handleEmptyError())
-            },
-            RxErrorHandler.handleEmptyError()
-        )?.let { recyclerSubscription.add(it) }
-        recyclerAdapter?.taskOpenEvents?.subscribeWithErrorHandler {
-            openTaskForm(it.first)
-        }?.let { recyclerSubscription.add(it) }
-        recyclerAdapter?.taskScoreEvents
-            ?.doOnNext {
-                playSound(it.second)
-                context?.let { it1 -> notificationsManager.dismissTaskNotification(it1, it.first) }
-            }?.subscribeWithErrorHandler { scoreTask(it.first, it.second) }?.let { recyclerSubscription.add(it) }
-        recyclerAdapter?.checklistItemScoreEvents
-            ?.flatMap {
-                taskRepository.scoreChecklistItem(it.first.id ?: "", it.second.id ?: "")
-            }?.subscribeWithErrorHandler {}?.let { recyclerSubscription.add(it) }
-        recyclerAdapter?.brokenTaskEvents?.subscribeWithErrorHandler { showBrokenChallengeDialog(it) }?.let { recyclerSubscription.add(it) }
-        recyclerAdapter?.adventureGuideOpenEvents?.subscribeWithErrorHandler { MainNavigationController.navigate(R.id.adventureGuideActivity) }?.let { recyclerSubscription.add(it) }
+        recyclerAdapter?.errorButtonEvents = {
+                lifecycleScope.launchCatching {
+                    taskRepository.syncErroredTasks()
+                }
+            }
+        recyclerAdapter?.taskOpenEvents = { task, view ->
+            openTaskForm(task)
+        }
+        recyclerAdapter?.taskScoreEvents = { task, direction ->
+                playSound(direction)
+                context?.let { it1 -> notificationsManager.dismissTaskNotification(it1, task) }
+            scoreTask(task, direction)
+            }
+        recyclerAdapter?.checklistItemScoreEvents =  { task, item ->
+            scoreChecklistItem(task, item)
+        }
+        recyclerAdapter?.brokenTaskEvents = { showBrokenChallengeDialog(it) }
+        recyclerAdapter?.adventureGuideOpenEvents = {
+            MainNavigationController.navigate(
+                R.id.adventureGuideActivity
+            )
+        }
 
         viewModel.ownerID.observe(viewLifecycleOwner) {
-            canEditTasks = viewModel.isPersonalBoard
             canScoreTaks = viewModel.isPersonalBoard
-            recyclerAdapter?.canScoreTasks = canScoreTaks
             updateTaskSubscription(it)
         }
         lifecycleScope.launch {
@@ -162,11 +173,19 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         }
     }
 
+    private fun scoreChecklistItem(task: Task, item: ChecklistItem) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
+        }
+    }
+
     private fun handleTaskResult(result: TaskScoringResult, value: Int) {
         if (taskType == TaskType.REWARD) {
             (activity as? MainActivity)?.let { activity ->
                 HabiticaSnackbar.showSnackbar(
-                    activity.snackbarContainer, null, getString(R.string.notification_purchase_reward),
+                    activity.snackbarContainer,
+                    null,
+                    getString(R.string.notification_purchase_reward),
                     BitmapDrawable(resources, HabiticaIconsHelper.imageOfGold()),
                     ContextCompat.getColor(activity, R.color.yellow_10),
                     "-$value",
@@ -213,10 +232,12 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         component.inject(this)
     }
 
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        savedInstanceState?.let { this.taskType = TaskType.from(savedInstanceState.getString(CLASS_TYPE_KEY, "")) ?: TaskType.HABIT }
+        savedInstanceState?.let {
+            this.taskType =
+                TaskType.from(savedInstanceState.getString(CLASS_TYPE_KEY, "")) ?: TaskType.HABIT
+        }
 
         this.setInnerAdapter()
         recyclerAdapter?.filter()
@@ -237,11 +258,15 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
                 viewHolder: RecyclerView.ViewHolder,
                 target: RecyclerView.ViewHolder
             ): Boolean {
-                recyclerAdapter?.notifyItemMoved(viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
+                recyclerAdapter?.notifyItemMoved(
+                    viewHolder.bindingAdapterPosition,
+                    target.bindingAdapterPosition
+                )
                 return true
             }
 
-            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { /* no-on */ }
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { /* no-on */
+            }
 
             // defines the enabled move directions in each state (idle, swiping, dragging).
             override fun getMovementFlags(
@@ -264,7 +289,10 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
 
             override fun isLongPressDragEnabled(): Boolean = true
 
-            override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+            override fun clearView(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder
+            ) {
                 super.clearView(recyclerView, viewHolder)
                 binding?.refreshLayout?.isEnabled = true
 
@@ -287,21 +315,19 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
                         newPosition = if ((newPosition + 1) >= (recyclerAdapter?.data?.size ?: 0)) {
                             recyclerAdapter?.data?.get(newPosition - 1)?.position ?: newPosition
                         } else {
-                            (recyclerAdapter?.data?.get(newPosition + 1)?.position ?: newPosition) - 1
+                            (recyclerAdapter?.data?.get(newPosition + 1)?.position
+                                ?: newPosition) - 1
                         }
                     }
-                    compositeSubscription.add(
+                    //Factor in if adventure guide is shown.
+                    if (recyclerAdapter?.showAdventureGuide == true) {
+                        newPosition = newPosition - 1
+                    }
+                    lifecycleScope.launchCatching {
                         taskRepository.updateTaskPosition(
                             taskType, validTaskId, newPosition
                         )
-                            .delay(1, TimeUnit.SECONDS)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                {
-                                },
-                                RxErrorHandler.handleEmptyError()
-                            )
-                    )
+                    }
                 }
             }
         }
@@ -323,27 +349,30 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
             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
                 }
             }
         })
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable()
-                .distinct { it.hasCompletedOnboarding }
-                .doOnNext { recyclerAdapter?.showAdventureGuide = !it.hasCompletedOnboarding }
-                .subscribe({ recyclerAdapter?.user = it }, RxErrorHandler.handleEmptyError())
-        )
-
-        setPreferenceTaskFilters()
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .distinctUntilChangedBy { it?.hasCompletedOnboarding }
+                .onEach { recyclerAdapter?.showAdventureGuide = it?.hasCompletedOnboarding != true }
+                .takeWhile { it?.hasCompletedOnboarding != true }
+                .collect {
+                    recyclerAdapter?.user = it
+                }
+        }
     }
 
     private fun updateTaskSubscription(ownerID: String?) {
         if (taskFlowJob?.isActive == true) {
             taskFlowJob?.cancel()
         }
-        val additionalGroupIDs = viewModel.userViewModel.mirrorGroupTasks.toTypedArray()
-        taskFlowJob = lifecycleScope.launch {
+        val additionalGroupIDs =
+            if (ownerID == viewModel.userViewModel.userID) viewModel.userViewModel.mirrorGroupTasks.toTypedArray() else emptyArray()
+        taskFlowJob = lifecycleScope.launch(ExceptionHandler.coroutine()) {
             taskRepository.getTasks(taskType, ownerID, additionalGroupIDs).collect {
                 recyclerAdapter?.updateUnfilteredData(it)
             }
@@ -355,217 +384,250 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
             if (!task.isValid) {
                 return
             }
-            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) { _, _ ->
-                        if (!task.isValid) return@addButton
+            lifecycleScope.launchCatching {
+                val tasks = taskRepository.getTasksForChallenge(task.challengeID).firstOrNull()
+                    ?: return@launchCatching
+                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
+                ) { _, _ ->
+                    if (!task.isValid) return@addButton
+                    lifecycleScope.launch {
                         taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
-                            .flatMap { userRepository.retrieveUser(true, forced = true) }
-                            .subscribe({}, RxErrorHandler.handleEmptyError())
+                        userRepository.retrieveUser(true, forced = true)
                     }
-                    dialog.addButton(
-                        it.getString(R.string.delete_x_tasks, taskCount),
-                        isPrimary = false,
-                        isDestructive = true
-                    ) { _, _ ->
-                        if (!task.isValid) return@addButton
+                }
+                dialog.addButton(
+                    it.getString(R.string.delete_x_tasks, taskCount),
+                    isPrimary = false,
+                    isDestructive = true
+                ) { _, _ ->
+                    if (!task.isValid) return@addButton
+                    lifecycleScope.launch {
                         taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
-                            .flatMap { userRepository.retrieveUser(true, forced = true) }
-                            .subscribe({}, RxErrorHandler.handleEmptyError())
-                    }
-                    dialog.setExtraCloseButtonVisibility(View.VISIBLE)
-                    dialog.show()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        }
-    }
-
-    private fun setEmptyLabels() {
-        binding?.recyclerView?.emptyItem = if (viewModel.filterCount(taskType) > 0) {
-            when (this.taskType) {
-                TaskType.HABIT -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_habits_filtered),
-                        getString(R.string.empty_description_habits_filtered),
-                        R.drawable.icon_habits
-                    )
-                }
-                TaskType.DAILY -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_dailies_filtered),
-                        getString(R.string.empty_description_dailies_filtered),
-                        R.drawable.icon_dailies
-                    )
-                }
-                TaskType.TODO -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_todos_filtered),
-                        getString(R.string.empty_description_todos_filtered),
-                        R.drawable.icon_todos
-                    )
-                }
-                TaskType.REWARD -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_rewards_filtered),
-                        null,
-                        R.drawable.icon_rewards
-                    )
-                }
-                else -> EmptyItem("")
-            }
-        } else {
-            when (this.taskType) {
-                TaskType.HABIT -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_habits),
-                        getString(R.string.empty_description_habits),
-                        R.drawable.icon_habits
-                    )
-                }
-                TaskType.DAILY -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_dailies),
-                        getString(R.string.empty_description_dailies),
-                        R.drawable.icon_dailies
-                    )
-                }
-                TaskType.TODO -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_todos),
-                        getString(R.string.empty_description_todos),
-                        R.drawable.icon_todos
-                    )
-                }
-                TaskType.REWARD -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_rewards),
-                        null,
-                        R.drawable.icon_rewards
-                    )
-                }
-                else -> EmptyItem("")
-            }
-        }
-    }
-
-    private fun scoreTask(task: Task, direction: TaskDirection) {
-        viewModel.scoreTask(task, direction) { result, value ->
-            handleTaskResult(result, value)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putString(CLASS_TYPE_KEY, this.taskType.value)
-    }
-
-    override val displayedClassName: String?
-        get() = this.taskType.value + super.displayedClassName
-
-    override fun onRefresh() {
-        binding?.refreshLayout?.isRefreshing = true
-        viewModel.refreshData {
-            binding?.refreshLayout?.isRefreshing = false
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
-        setInnerAdapter()
-        recyclerAdapter?.filter()
-    }
-
-    fun setActiveFilter(activeFilter: String) {
-        viewModel.setActiveFilter(taskType, activeFilter)
-        recyclerAdapter?.filter()
-
-        setEmptyLabels()
-
-        if (activeFilter == Task.FILTER_COMPLETED) {
-            compositeSubscription.add(taskRepository.retrieveCompletedTodos().subscribe({}, RxErrorHandler.handleEmptyError()))
-        }
-    }
-
-    private fun setPreferenceTaskFilters() {
-        (activity as? MainActivity)?.viewModel?.user?.observeOnce(this) {
-            if (it != null) {
-                when (taskType) {
-                    TaskType.TODO -> viewModel.setActiveFilter(
-                        TaskType.TODO,
-                        Task.FILTER_ACTIVE
-                    )
-                    TaskType.DAILY -> {
-                        if (!viewModel.initialPreferenceFilterSet) {
-                            viewModel.initialPreferenceFilterSet = true
-                            if (it.isValid && it.preferences?.dailyDueDefaultView == true) {
-                                viewModel.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE)
-                            }
-                        }
-                    }
-                    else -> {}
-                }
-            }
-        }
-    }
-
-    private fun openTaskForm(task: Task) {
-        if (Date().time - (TasksFragment.lastTaskFormOpen?.time ?: 0) < 2000 || !task.isValid || !canEditTasks) {
-            return
-        }
-
-        val bundle = Bundle()
-        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, task.type?.value)
-        bundle.putString(TaskFormActivity.TASK_ID_KEY, task.id)
-        bundle.putDouble(TaskFormActivity.TASK_VALUE_KEY, task.value)
-
-        val intent = Intent(activity, TaskFormActivity::class.java)
-        intent.putExtras(bundle)
-        TasksFragment.lastTaskFormOpen = Date()
-        if (isAdded) {
-            startActivity(intent)
-        }
-    }
-
-    companion object {
-        private const val CLASS_TYPE_KEY = "CLASS_TYPE_KEY"
-
-        fun newInstance(context: Context?, classType: TaskType): TaskRecyclerViewFragment {
-            val fragment = TaskRecyclerViewFragment()
-            fragment.taskType = classType
-            var tutorialTexts: List<String>? = null
-            if (context != null) {
-                when (fragment.taskType) {
-                    TaskType.HABIT -> {
-                        fragment.tutorialStepIdentifier = "habits"
-                        tutorialTexts = listOf(context.getString(R.string.tutorial_overview), context.getString(R.string.tutorial_habits_1), context.getString(R.string.tutorial_habits_2), context.getString(R.string.tutorial_habits_3), context.getString(R.string.tutorial_habits_4))
-                    }
-                    TaskType.DAILY -> {
-                        fragment.tutorialStepIdentifier = "dailies"
-                        tutorialTexts = listOf(context.getString(R.string.tutorial_dailies_1), context.getString(R.string.tutorial_dailies_2))
-                    }
-                    TaskType.TODO -> {
-                        fragment.tutorialStepIdentifier = "todos"
-                        tutorialTexts = listOf(context.getString(R.string.tutorial_todos_1), context.getString(R.string.tutorial_todos_2))
-                    }
-                    TaskType.REWARD -> {
-                        fragment.tutorialStepIdentifier = "rewards"
-                        tutorialTexts = listOf(context.getString(R.string.tutorial_rewards_1), context.getString(R.string.tutorial_rewards_2))
+                        userRepository.retrieveUser(true, forced = true)
                     }
                 }
-            }
-
-            if (tutorialTexts != null) {
-                fragment.tutorialTexts = ArrayList(tutorialTexts)
-            }
-            fragment.tutorialCanBeDeferred = false
-
-            return fragment
+                dialog.setExtraCloseButtonVisibility(View.VISIBLE)
+                dialog.show()
         }
     }
 }
+
+private fun setEmptyLabels() {
+    binding?.recyclerView?.emptyItem = if (viewModel.filterCount(taskType) > 0) {
+        when (this.taskType) {
+            TaskType.HABIT -> {
+                EmptyItem(
+                    getString(R.string.empty_title_habits_filtered),
+                    getString(R.string.empty_description_habits_filtered),
+                    R.drawable.icon_habits
+                )
+            }
+            TaskType.DAILY -> {
+                EmptyItem(
+                    getString(R.string.empty_title_dailies_filtered),
+                    getString(R.string.empty_description_dailies_filtered),
+                    R.drawable.icon_dailies
+                )
+            }
+            TaskType.TODO -> {
+                EmptyItem(
+                    getString(R.string.empty_title_todos_filtered),
+                    getString(R.string.empty_description_todos_filtered),
+                    R.drawable.icon_todos
+                )
+            }
+            TaskType.REWARD -> {
+                EmptyItem(
+                    getString(R.string.empty_title_rewards_filtered),
+                    null,
+                    R.drawable.icon_rewards
+                )
+            }
+            else -> EmptyItem("")
+        }
+    } else {
+        when (this.taskType) {
+            TaskType.HABIT -> {
+                EmptyItem(
+                    getString(R.string.empty_title_habits),
+                    getString(R.string.empty_description_habits),
+                    R.drawable.icon_habits
+                )
+            }
+            TaskType.DAILY -> {
+                EmptyItem(
+                    getString(R.string.empty_title_dailies),
+                    getString(R.string.empty_description_dailies),
+                    R.drawable.icon_dailies
+                )
+            }
+            TaskType.TODO -> {
+                EmptyItem(
+                    getString(R.string.empty_title_todos),
+                    getString(R.string.empty_description_todos),
+                    R.drawable.icon_todos
+                )
+            }
+            TaskType.REWARD -> {
+                EmptyItem(
+                    getString(R.string.empty_title_rewards),
+                    null,
+                    R.drawable.icon_rewards
+                )
+            }
+            else -> EmptyItem("")
+        }
+    }
+}
+
+private fun scoreTask(task: Task, direction: TaskDirection) {
+    viewModel.scoreTask(task, direction) { result, value ->
+        handleTaskResult(result, value)
+    }
+}
+
+override fun onSaveInstanceState(outState: Bundle) {
+    super.onSaveInstanceState(outState)
+    outState.putString(CLASS_TYPE_KEY, this.taskType.value)
+}
+
+override val displayedClassName: String?
+    get() = this.taskType.value + super.displayedClassName
+
+override fun onRefresh() {
+    binding?.refreshLayout?.isRefreshing = true
+    viewModel.refreshData {
+        binding?.refreshLayout?.isRefreshing = false
+    }
+}
+
+override fun onResume() {
+    super.onResume()
+    context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
+    setInnerAdapter()
+}
+
+fun setActiveFilter(activeFilter: String) {
+    viewModel.setActiveFilter(taskType, activeFilter)
+    recyclerAdapter?.filter()
+
+    setEmptyLabels()
+
+    if (activeFilter == Task.FILTER_COMPLETED) {
+        lifecycleScope.launchCatching {
+            taskRepository.retrieveCompletedTodos()
+        }
+    }
+}
+
+private fun setPreferenceTaskFilters() {
+    (activity as? MainActivity)?.viewModel?.user?.observeOnce(this) {
+        if (it != null) {
+            when (taskType) {
+                TaskType.TODO -> viewModel.setActiveFilter(
+                    TaskType.TODO,
+                    Task.FILTER_ACTIVE
+                )
+                TaskType.DAILY -> {
+                    if (!viewModel.initialPreferenceFilterSet) {
+                        viewModel.initialPreferenceFilterSet = true
+                        if (it.isValid && it.preferences?.dailyDueDefaultView == true) {
+                            viewModel.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE)
+                        }
+                    }
+                }
+                else -> {}
+            }
+        }
+    }
+}
+
+private fun openTaskForm(task: Task) {
+    if (Date().time - (TasksFragment.lastTaskFormOpen?.time
+            ?: 0) < 2000 || !task.isValid
+    ) {
+        return
+    }
+
+    val bundle = Bundle()
+    bundle.putString(TaskFormActivity.TASK_TYPE_KEY, task.type?.value)
+    bundle.putString(TaskFormActivity.TASK_ID_KEY, task.id)
+    bundle.putString(TaskFormActivity.GROUP_ID_KEY, task.group?.groupID)
+    bundle.putDouble(TaskFormActivity.TASK_VALUE_KEY, task.value)
+
+    lifecycleScope.launchCatching {
+        val id = if (viewModel.canEditTask(task)) {
+            R.id.taskFormActivity
+        } else {
+            R.id.taskSummaryActivity
+        }
+        withContext(Dispatchers.Main) {
+            MainNavigationController.navigate(id, bundle)
+        }
+    }
+    TasksFragment.lastTaskFormOpen = Date()
+}
+
+companion object {
+    private const val CLASS_TYPE_KEY = "CLASS_TYPE_KEY"
+
+    fun newInstance(context: Context?, classType: TaskType): TaskRecyclerViewFragment {
+        val fragment = TaskRecyclerViewFragment()
+        fragment.taskType = classType
+        var tutorialTexts: List<String>? = null
+        if (context != null) {
+            when (fragment.taskType) {
+                TaskType.HABIT -> {
+                    fragment.tutorialStepIdentifier = "habits"
+                    tutorialTexts = listOf(
+                        context.getString(R.string.tutorial_overview),
+                        context.getString(R.string.tutorial_habits_1),
+                        context.getString(R.string.tutorial_habits_2),
+                        context.getString(R.string.tutorial_habits_3),
+                        context.getString(R.string.tutorial_habits_4)
+                    )
+                }
+                TaskType.DAILY -> {
+                    fragment.tutorialStepIdentifier = "dailies"
+                    tutorialTexts = listOf(
+                        context.getString(R.string.tutorial_dailies_1),
+                        context.getString(R.string.tutorial_dailies_2)
+                    )
+                }
+                TaskType.TODO -> {
+                    fragment.tutorialStepIdentifier = "todos"
+                    tutorialTexts = listOf(
+                        context.getString(R.string.tutorial_todos_1),
+                        context.getString(R.string.tutorial_todos_2)
+                    )
+                }
+                TaskType.REWARD -> {
+                    fragment.tutorialStepIdentifier = "rewards"
+                    tutorialTexts = listOf(
+                        context.getString(R.string.tutorial_rewards_1),
+                        context.getString(R.string.tutorial_rewards_2)
+                    )
+                }
+            }
+        }
+
+        if (tutorialTexts != null) {
+            fragment.tutorialTexts = ArrayList(tutorialTexts)
+        }
+        fragment.tutorialCanBeDeferred = false
+
+        return fragment
+    }
+}
+}
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 d7a70ecbd..88441ed20 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
@@ -15,9 +15,9 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import com.habitrpg.android.habitica.HabiticaBaseApplication
@@ -26,8 +26,7 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
@@ -81,7 +80,7 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
             if (args.ownerID?.isNotBlank() == true) {
                 viewModel.canSwitchOwners.value = false
                 viewModel.ownerID.value = args.ownerID ?: viewModel.userViewModel.userID
-            } else {
+            } else if (viewModel.ownerID.value?.isNotBlank() != true) {
                 viewModel.ownerID.value = viewModel.userViewModel.userID
             }
             if (taskTypeValue?.isNotBlank() == true) {
@@ -117,7 +116,9 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
         }
         binding?.viewPager?.currentItem = binding?.viewPager?.currentItem ?: 0
         bottomNavigation?.listener = this
-        bottomNavigation?.canAddTasks = viewModel.isPersonalBoard
+        lifecycleScope.launchCatching {
+            bottomNavigation?.canAddTasks = viewModel.canAddTasks()
+        }
 
         activity?.binding?.content?.toolbarTitle?.setOnClickListener {
             viewModel.cycleOwnerIDs()
@@ -185,10 +186,6 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
                 viewModel.refreshData { }
                 true
             }
-            R.id.action_team_info -> {
-                MainNavigationController.navigate(R.id.guildFragment, bundleOf(Pair("groupID", viewModel.ownerID)))
-                true
-            }
             else -> super.onOptionsItemSelected(item)
         }
     }
@@ -263,9 +260,9 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
         if (bottomNavigation == null) {
             return
         }
-        compositeSubscription.add(
-            tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards")).subscribe(
-                { tutorialSteps ->
+        lifecycleScope.launchCatching {
+            tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards"))
+                .collect { tutorialSteps ->
                     val activeTutorialFragments = ArrayList<TaskType>()
                     for (step in tutorialSteps) {
                         var id = -1
@@ -297,7 +294,8 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
                         }
                     }
                     if (activeTutorialFragments.size == 1) {
-                        val fragment = viewFragmentsDictionary?.get(indexForTaskType(activeTutorialFragments[0]))
+                        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) {
@@ -305,10 +303,8 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
                             }
                         }
                     }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+                }
+        }
     }
     // endregion
 
@@ -330,6 +326,9 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
 
         val bundle = Bundle()
         bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type.value)
+        if (!viewModel.isPersonalBoard) {
+            bundle.putString(TaskFormActivity.GROUP_ID_KEY, viewModel.ownerID.value)
+        }
         bundle.putStringArrayList(TaskFormActivity.SELECTED_TAGS_KEY, ArrayList(viewModel.tags))
 
         val intent = Intent(activity, TaskFormActivity::class.java)
@@ -422,7 +421,9 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
         if (viewModel.ownerTitle.isNotBlank()) {
             activity?.title = viewModel.ownerTitle
         }
-        val isPersonalBoard = viewModel.isPersonalBoard
-        bottomNavigation?.canAddTasks = isPersonalBoard
+        viewModel.userViewModel.currentTeamPlan.value = viewModel.teamPlans[viewModel.ownerID.value]
+        lifecycleScope.launchCatching {
+            bottomNavigation?.canAddTasks = viewModel.canAddTasks()
+        }
     }
 }
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 d624d7787..0812b69c6 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
@@ -43,11 +43,11 @@ class AutocompleteAdapter(
                             lastAutocomplete = Date().time
                             userResults = arrayListOf()
                             isAutocompletingUsers = true
-                            socialRepository.findUsernames(constraint.toString().drop(1), autocompleteContext, groupID).blockingSubscribe {
+                            /*socialRepository.findUsernames(constraint.toString().drop(1), autocompleteContext, groupID).blockingSubscribe {
                                 userResults = it
                                 filterResults.values = userResults
                                 filterResults.count = userResults.size
-                            }
+                            }*/
                         } else {
                             filterResults.values = userResults
                             filterResults.count = userResults.size
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
index 2586929be..42b2cd6f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
@@ -8,6 +8,7 @@ data class HabiticaDrawerItem(
     var transitionId: Int,
     val identifier: String,
     val text: String,
+    val icon: Drawable? = null,
     val isHeader: Boolean = false
 ) {
     constructor(transitionId: Int, identifier: String) : this(transitionId, identifier, "")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
new file mode 100644
index 000000000..5b138b3ac
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
@@ -0,0 +1,118 @@
+package com.habitrpg.android.habitica.ui.theme
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Shapes
+import androidx.compose.material.Typography
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.google.android.material.composethemeadapter.createMdcTheme
+
+@Composable
+fun HabiticaTheme(
+    content: @Composable () -> Unit
+) {
+    val context = LocalContext.current
+    val layoutDirection = LocalLayoutDirection.current
+    val (colors, _, shapes) = createMdcTheme(
+        context = context,
+        layoutDirection = layoutDirection,
+        setTextColors = true
+    )
+    MaterialTheme(
+        colors = colors ?: MaterialTheme.colors,
+        typography = Typography(
+            defaultFontFamily = FontFamily.Default,
+            h1 = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 20.sp,
+                letterSpacing = (0.05).sp
+            ),
+            h2 = TextStyle(
+                fontWeight = FontWeight.Normal,
+                fontSize = 28.sp,
+                letterSpacing = (0.05).sp
+            ),
+            subtitle1 = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 16.sp,
+            ),
+            subtitle2 = TextStyle(
+                fontWeight = FontWeight.Normal,
+                fontSize = 16.sp,
+                letterSpacing = 0.1.sp
+            ),
+            body1 = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 14.sp,
+                letterSpacing = 0.35.sp,
+                lineHeight = 16.sp
+            ),
+            body2 = TextStyle(
+                fontWeight = FontWeight.Normal,
+                fontSize = 14.sp,
+                letterSpacing = 0.2.sp,
+                lineHeight = 16.sp
+            ),
+            button = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 14.sp,
+                letterSpacing = 1.25.sp
+            ),
+            caption = TextStyle(
+                fontWeight = FontWeight.Bold,
+                fontSize = 12.sp
+            ),
+            overline = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 10.sp,
+                letterSpacing = 1.5.sp
+            )
+        ),
+        shapes = Shapes(
+            RoundedCornerShape(4.dp),
+            RoundedCornerShape(8.dp),
+            RoundedCornerShape(12.dp)
+        ),
+        content = content
+    )
+}
+
+val Typography.caption1
+    get() = caption
+val Typography.caption2
+get() = TextStyle(
+    fontWeight = FontWeight.Medium,
+    fontSize = 12.sp,
+    letterSpacing = 0.4.sp
+)
+val Typography.caption3
+    get() = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 12.sp,
+        letterSpacing = 0.3.sp,
+        lineHeight = 14.sp
+    )
+val Typography.caption4
+    get() = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 12.sp,
+        letterSpacing = 0.35.sp
+    )
+val Typography.subtitle3
+    get() = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        letterSpacing = 0.15.sp
+    )
+object HabiticaTheme {
+    val typography: Typography
+    @Composable
+    get() = MaterialTheme.typography
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
index 1d9936845..fa1f6469f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
@@ -5,5 +5,9 @@ import androidx.recyclerview.widget.RecyclerView
 
 abstract class BindableViewHolder<T>(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-    abstract fun bind(data: T, position: Int, displayMode: String)
+    abstract fun bind(
+        data: T,
+        position: Int,
+        displayMode: String
+    )
 }
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 a595185ca..ce016af29 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
@@ -13,20 +13,20 @@ import com.habitrpg.android.habitica.databinding.ChatItemBinding
 import com.habitrpg.android.habitica.databinding.TavernChatIntroItemBinding
 import com.habitrpg.android.habitica.extensions.getAgoString
 import com.habitrpg.android.habitica.extensions.setScaledPadding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
 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.SnackbarActivity
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.helpers.setParsedMarkdown
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Maybe
-import io.reactivex.rxjava3.schedulers.Schedulers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 open class ChatRecyclerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
@@ -41,7 +41,8 @@ class ChatRecyclerIntroViewHolder(itemView: View, replyToUUID: String) : ChatRec
         binding.sublineTextview.setOnClickListener { onOpenProfile?.invoke(replyToUUID) }
     }
 
-    fun bind(member: Member) {
+    fun bind(member: Member?) {
+        if (member == null) return
         binding.avatarView.setAvatar(member)
         binding.displayNameTextview.username = member.displayName
         binding.displayNameTextview.tier = member.contributor?.level ?: 0
@@ -184,17 +185,13 @@ class ChatRecyclerMessageViewHolder(
         binding.messageText.setParsedMarkdown(chatMessage?.parsedText)
         if (msg.parsedText == null) {
             binding.messageText.text = chatMessage?.text
-            Maybe.just(chatMessage?.text ?: "")
-                .map { MarkdownParser.parseMarkdown(it) }
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    { parsedText ->
-                        chatMessage?.parsedText = parsedText
-                        binding.messageText.setParsedMarkdown(parsedText)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            MainScope().launch(Dispatchers.IO) {
+                val parsedText = MarkdownParser.parseMarkdown(chatMessage?.text ?: "")
+                withContext(Dispatchers.Main) {
+                    chatMessage?.parsedText = parsedText
+                    binding.messageText.setParsedMarkdown(parsedText)
+                }
+            }
         }
 
         val username = user?.formattedUsername
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
index 8bdc10c86..7f5910529 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
@@ -71,7 +71,7 @@ class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.Recyc
         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))
+            binding.sublineTextview.text = itemView.context.getString(R.string.user_level_with_class, user.stats?.lvl, user.stats?.getTranslatedClassName(itemView.context.resources))
         } else {
             binding.sublineTextview.text = itemView.context.getString(R.string.user_level, user.stats?.lvl)
         }
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 77cb28d8b..0bc6bae05 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
@@ -9,12 +9,11 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.MountOverviewItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
-import io.reactivex.rxjava3.subjects.PublishSubject
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 
-class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<String>) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.mount_overview_item)), View.OnClickListener {
+class MountViewHolder(parent: ViewGroup, private val onEquip: ((String) -> Unit)?) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.mount_overview_item)), View.OnClickListener {
     private var binding: MountOverviewItemBinding = MountOverviewItemBinding.bind(itemView)
     private var owned: Boolean = false
     var animal: Mount? = null
@@ -60,7 +59,7 @@ class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject
         val labelId = if (hasCurrentMount) R.string.unequip else R.string.equip
         menu.addMenuItem(BottomSheetMenuItem(resources.getString(labelId)))
         menu.setSelectionRunnable {
-            animal?.let { equipEvents.onNext(it.key ?: "") }
+            animal?.let { onEquip?.invoke(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 f17959cfe..be791b6f7 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
@@ -13,16 +13,15 @@ import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Food
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.common.habitica.extensions.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.rxjava3.subjects.PublishSubject
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 
 class PetViewHolder(
     parent: ViewGroup,
-    private val equipEvents: PublishSubject<String>,
-    private val feedEvents: PublishSubject<Pair<Pet, Food?>>,
+    private val onEquip: ((String) -> Unit)?,
+    private val onFeed: ((Pet, Food?) -> Unit)?,
     private val ingredientsReceiver: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)?
 ) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.pet_detail_item)),
     View.OnClickListener {
@@ -130,16 +129,16 @@ class PetViewHolder(
             when (index) {
                 0 -> {
                     animal?.let {
-                        equipEvents.onNext(it.key ?: "")
+                        onEquip?.invoke(it.key ?: "")
                     }
                 }
                 1 -> {
-                    feedEvents.onNext(Pair(pet, null))
+                    onFeed?.invoke(pet, null)
                 }
                 2 -> {
                     val saddle = Food()
                     saddle.key = "Saddle"
-                    feedEvents.onNext(Pair(pet, saddle))
+                    onFeed?.invoke(pet, saddle)
                 }
             }
         }
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 2d40a1341..81b1e558e 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
@@ -13,7 +13,7 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.android.habitica.ui.views.EllipsisTextView
@@ -22,27 +22,28 @@ import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.helpers.setParsedMarkdown
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.functions.Action
-import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 abstract class BaseTaskViewHolder constructor(
     itemView: View,
     var scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     var openTaskFunc: ((Pair<Task, View>) -> Unit),
-    var brokenTaskFunc: ((Task) -> Unit)
+    var brokenTaskFunc: ((Task) -> Unit),
+    var assignedTextProvider: GroupPlanInfoProvider?
 ) : BindableViewHolder<Task>(itemView), View.OnTouchListener {
     private val scope = MainScope()
+
     var task: Task? = null
     var movingFromPosition: Int? = null
-    var errorButtonClicked: Action? = null
+    var errorButtonClicked: (() -> Unit)? = null
+    var userID: String? = null
     var isLocked = false
     protected var context: Context
     private val mainTaskWrapper: ViewGroup = itemView.findViewById(R.id.main_task_wrapper)
+    protected val assignedTextView: TextView = itemView.findViewById(R.id.assigned_textview)
     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)
@@ -51,7 +52,7 @@ abstract class BaseTaskViewHolder constructor(
     private val iconViewChallenge: ImageView? = 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 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)
@@ -96,7 +97,7 @@ abstract class BaseTaskViewHolder constructor(
 
         titleTextView.setOnClickListener { onTouch(it, null) }
         notesTextView?.setOnClickListener { onTouch(it, null) }
-        errorIconView?.setOnClickListener { errorButtonClicked?.run() }
+        errorIconView?.setOnClickListener { errorButtonClicked?.invoke() }
 
         notesTextView?.movementMethod = LinkMovementMethod.getInstance()
         titleTextView.movementMethod = LinkMovementMethod.getInstance()
@@ -132,6 +133,15 @@ abstract class BaseTaskViewHolder constructor(
     }
 
     override fun bind(data: Task, position: Int, displayMode: String) {
+        bind(data, position, displayMode, null)
+    }
+
+    open fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
         notesExpanded = false
         task = data
         itemView.setBackgroundColor(context.getThemeColor(R.attr.colorContentBackground))
@@ -155,17 +165,13 @@ abstract class BaseTaskViewHolder constructor(
             } else {
                 titleTextView.text = data.text
                 if (data.text.isNotEmpty()) {
-                    Single.just(data.text)
-                        .map { MarkdownParser.parseMarkdown(it) }
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(
-                            { parsedText ->
-                                data.parsedText = parsedText
-                                titleTextView.setParsedMarkdown(parsedText)
-                            },
-                            RxErrorHandler.handleEmptyError()
-                        )
+                    scope.launch(Dispatchers.IO) {
+                        val parsedText = MarkdownParser.parseMarkdown(data.text)
+                        withContext(Dispatchers.Main) {
+                            data.parsedText = parsedText
+                            titleTextView.setParsedMarkdown(parsedText)
+                        }
+                    }
                 }
             }
             if (displayMode != "minimal") {
@@ -182,17 +188,13 @@ abstract class BaseTaskViewHolder constructor(
                             if (notes.isEmpty()) {
                                 return@let
                             }
-                            Single.just(notes)
-                                .map { MarkdownParser.parseMarkdown(it) }
-                                .subscribeOn(Schedulers.io())
-                                .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe(
-                                    { parsedNotes ->
-                                        data.parsedNotes = parsedNotes
-                                        notesTextView?.setParsedMarkdown(parsedNotes)
-                                    },
-                                    RxErrorHandler.handleEmptyError()
-                                )
+                            scope.launch(Dispatchers.IO) {
+                                val parsedNotes = MarkdownParser.parseMarkdown(notes)
+                                withContext(Dispatchers.Main) {
+                                    data.parsedNotes = parsedNotes
+                                    notesTextView?.setParsedMarkdown(parsedNotes)
+                                }
+                            }
                         }
                     }
                 }
@@ -226,7 +228,7 @@ abstract class BaseTaskViewHolder constructor(
             }
             configureSpecialTaskTextView(data)
 
-            iconViewTeam?.visibility = if (data.isGroupTask) View.VISIBLE else View.GONE
+            iconViewTeam?.visibility = if (data.isGroupTask && ownerID != data.group?.groupID) View.VISIBLE else View.GONE
 
             taskIconWrapper?.visibility = if (taskIconWrapperIsVisible) View.VISIBLE else View.GONE
         } else {
@@ -235,9 +237,16 @@ abstract class BaseTaskViewHolder constructor(
         }
 
         if (data.isPendingApproval) {
-            approvalRequiredTextView?.visibility = View.VISIBLE
+            approvalRequiredTextView.visibility = View.VISIBLE
         } else {
-            approvalRequiredTextView?.visibility = View.GONE
+            approvalRequiredTextView.visibility = View.GONE
+        }
+
+        if (data.group?.assignedUsers?.isNotEmpty() == true) {
+            assignedTextView.text = assignedTextProvider?.assignedTextForTask(context.resources, data.group?.assignedUsers ?: emptyList())
+            assignedTextView.visibility = View.VISIBLE
+        } else {
+            assignedTextView.visibility = View.GONE
         }
 
         syncingView?.visibility = if (task?.isSaving == true) View.VISIBLE else View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
index b771d8f15..cae10b607 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
@@ -12,7 +12,8 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.common.habitica.extensions.getThemeColor
@@ -21,17 +22,19 @@ import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.helpers.setParsedMarkdown
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.schedulers.Schedulers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 abstract class ChecklistedViewHolder(
     itemView: View,
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     var scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc, assignedTextProvider) {
 
     private val checkboxHolder: ViewGroup = itemView.findViewById(R.id.checkBoxHolder)
     private val checkmarkView: ImageView = itemView.findViewById(R.id.checkmark)
@@ -48,8 +51,13 @@ abstract class ChecklistedViewHolder(
         checklistIndicatorWrapper.setOnClickListener { onChecklistIndicatorClicked() }
     }
 
-    override fun bind(data: Task, position: Int, displayMode: String) {
-        var completed = data.completed
+    override fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
+        var completed = data.completed(userID)
         if (data.isPendingApproval) {
             completed = false
         }
@@ -69,15 +77,15 @@ abstract class ChecklistedViewHolder(
         this.updateChecklistDisplay()
 
         this.checklistIndicatorWrapper.visibility = if (data.checklist?.size == 0) View.GONE else View.VISIBLE
-        super.bind(data, position, displayMode)
+        super.bind(data, position, displayMode, ownerID)
         val regularBoxBackground = if (task?.type == TaskType.DAILY) R.drawable.daily_unchecked else R.drawable.todo_unchecked
         val completedBoxBackground = if (task?.type == TaskType.DAILY) R.drawable.daily_checked else R.drawable.todo_checked
         val inactiveBoxBackground = R.drawable.daily_inactive
-        if (this.shouldDisplayAsActive(data) && !data.isPendingApproval) {
+        if (this.shouldDisplayAsActive(data, userID) && !data.isPendingApproval) {
             this.checkboxHolder.setBackgroundResource(data.lightTaskColor)
             checkboxBackground.setBackgroundResource(regularBoxBackground)
         } else {
-            if (data.completed) {
+            if (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))
@@ -91,7 +99,7 @@ abstract class ChecklistedViewHolder(
         }
     }
 
-    abstract fun shouldDisplayAsActive(newTask: Task?): Boolean
+    abstract fun shouldDisplayAsActive(task: Task?, userID: String?): Boolean
 
     private fun updateChecklistDisplay() {
         // This needs to be a LinearLayout, as ListViews can not be inside other ListViews.
@@ -109,7 +117,7 @@ abstract class ChecklistedViewHolder(
                         context,
                         (
                             if (context.isUsingNightModeResources()) {
-                                if (task?.completed == true || (task?.type == TaskType.DAILY && task?.isDue == false)) {
+                                if (task?.completed(userID) == true || (task?.type == TaskType.DAILY && task?.isDue == false)) {
                                     R.color.checkbox_fill
                                 } else {
                                     task?.lightTaskColor
@@ -124,16 +132,12 @@ abstract class ChecklistedViewHolder(
                     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(
-                                {
-                                    textView?.setParsedMarkdown(it)
-                                },
-                                RxErrorHandler.handleEmptyError()
-                            )
+                        MainScope().launch(Dispatchers.IO) {
+                            val parsedText = MarkdownParser.parseMarkdown(item.text ?: "")
+                            withContext(Dispatchers.Main) {
+                                textView?.setParsedMarkdown(parsedText)
+                            }
+                        }
                     }
                     val checkmark = itemView?.findViewById<ImageView>(R.id.checkmark)
                     checkmark?.drawable?.setTintMode(PorterDuff.Mode.SRC_ATOP)
@@ -144,7 +148,7 @@ abstract class ChecklistedViewHolder(
                     }
                     val color = ContextCompat.getColor(
                         context,
-                        if (task?.completed == true || (task?.type == TaskType.DAILY && task?.isDue == false)) {
+                        if (task?.completed(userID) == true || (task?.type == TaskType.DAILY && task?.isDue == false)) {
                             checkmark?.drawable?.setTint(ContextCompat.getColor(context, R.color.text_dimmed))
                             R.color.offset_background
                         } else {
@@ -200,7 +204,7 @@ abstract class ChecklistedViewHolder(
     override fun onLeftActionTouched() {
         super.onLeftActionTouched()
         if (task?.isValid == true) {
-            onCheckedChanged(!(task?.completed ?: false))
+            onCheckedChanged(!(task?.completed(userID) ?: false))
         }
     }
 
@@ -217,8 +221,8 @@ abstract class ChecklistedViewHolder(
         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(userID)) {
+            task?.let { scoreTaskFunc(it, if (task?.completed(userID) == false) TaskDirection.UP else TaskDirection.DOWN) }
         }
     }
 
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 9b1665f04..d9cf2886d 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,9 +1,10 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
 import android.view.View
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import java.text.DateFormat
 import java.util.Calendar
 import java.util.Date
@@ -13,8 +14,9 @@ class DailyViewHolder(
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc, assignedTextProvider) {
 
     override val taskIconWrapperIsVisible: Boolean
         get() {
@@ -25,7 +27,12 @@ class DailyViewHolder(
             return isVisible
         }
 
-    override fun bind(data: Task, position: Int, displayMode: String) {
+    override fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
         this.task = data
         setChecklistIndicatorBackgroundActive(data.isChecklistDisplayActive)
 
@@ -59,16 +66,16 @@ class DailyViewHolder(
             reminderTextView.text = reminderString
         }
 
-        super.bind(data, position, displayMode)
+        super.bind(data, position, displayMode, ownerID)
     }
 
-    override fun shouldDisplayAsActive(newTask: Task?): Boolean {
-        return newTask?.isDisplayedActive ?: false
+    override fun shouldDisplayAsActive(task: Task?, userID: String?): Boolean {
+        return task?.isDisplayedActiveForUser(userID) ?: false
     }
 
     override fun configureSpecialTaskTextView(task: Task) {
         super.configureSpecialTaskTextView(task)
-        if (task.streak ?: 0 > 0) {
+        if ((task.streak ?: 0) > 0) {
             this.streakTextView.text = task.streak.toString()
             this.streakTextView.visibility = View.VISIBLE
             this.streakIconView.visibility = View.VISIBLE
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 2c8cf24ab..b56939f23 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
@@ -7,6 +7,7 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
 
@@ -14,8 +15,9 @@ class HabitViewHolder(
     itemView: View,
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc, assignedTextProvider) {
 
     private val btnPlusWrapper: FrameLayout = itemView.findViewById(R.id.btnPlusWrapper)
     private val btnPlusIconView: ImageView = itemView.findViewById(R.id.btnPlusIconView)
@@ -33,7 +35,12 @@ class HabitViewHolder(
         btnMinus.isClickable = true
     }
 
-    override fun bind(data: Task, position: Int, displayMode: String) {
+    override fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
         this.task = data
         if (data.up == true) {
             val plusIcon = if (isLocked) {
@@ -121,7 +128,7 @@ class HabitViewHolder(
         }
         reminderTextView.visibility = View.GONE
         calendarIconView?.visibility = View.GONE
-        super.bind(data, position, displayMode)
+        super.bind(data, position, displayMode, ownerID)
         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))
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 fb5b8b7d5..c083240b7 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
@@ -4,20 +4,30 @@ import android.view.MotionEvent
 import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
+import androidx.core.graphics.drawable.toDrawable
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.RewardItemCardBinding
-import com.habitrpg.common.habitica.helpers.NumberAbbreviator
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.ItemDetailDialog
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.helpers.NumberAbbreviator
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 
 class RewardViewHolder(
     itemView: View,
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : BaseTaskViewHolder(
+    itemView,
+    scoreTaskFunc,
+    openTaskFunc,
+    brokenTaskFunc,
+    assignedTextProvider
+) {
     private val binding = RewardItemCardBinding.bind(itemView)
 
     private val isItem: Boolean
@@ -27,6 +37,7 @@ class RewardViewHolder(
         binding.buyButton.setOnClickListener {
             buyReward()
         }
+        binding.goldIcon.setImageBitmap(HabiticaIconsHelper.imageOfGold())
     }
 
     override fun canContainMarkdown(): Boolean {
@@ -61,29 +72,48 @@ class RewardViewHolder(
         binding.buyButton.isEnabled = !taskActionsDisabled
     }
 
-    fun bind(reward: Task, position: Int, canBuy: Boolean, displayMode: String) {
+    fun bind(reward: Task, position: Int, canBuy: Boolean, displayMode: String, ownerID: String?) {
         this.task = reward
         streakTextView.visibility = View.GONE
-        super.bind(reward, position, displayMode)
-        binding.priceLabel.text = NumberAbbreviator.abbreviate(itemView.context, this.task?.value ?: 0.0)
+        super.bind(reward, position, displayMode, ownerID)
+        binding.priceLabel.text =
+            NumberAbbreviator.abbreviate(itemView.context, this.task?.value ?: 0.0)
 
         if (isLocked) {
-            binding.goldIcon.setImageResource(R.drawable.task_lock)
-            binding.goldIcon.drawable.setTint(ContextCompat.getColor(context, R.color.reward_buy_button_text))
-            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))
+            binding.priceLabel.setCompoundDrawablesWithIntrinsicBounds(
+                HabiticaIconsHelper.imageOfLocked(
+                    ContextCompat.getColor(context, R.color.gray_1_30), 10, 12
+                ).toDrawable(context.resources), null, null, null
+            )
+            binding.priceLabel.compoundDrawablePadding = 2.dpToPx(context)
         } else {
-            binding.goldIcon.setImageBitmap(HabiticaIconsHelper.imageOfGold())
-            if (canBuy) {
-                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 {
-                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))
-            }
+            binding.priceLabel.setCompoundDrawables(null, null, null, null)
+        }
+        if (canBuy && !isLocked) {
+            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 {
+            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
+                )
+            )
         }
     }
 }
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 6657681ba..8ac863f50 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
@@ -1,9 +1,10 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
 import android.view.View
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import java.text.DateFormat
 
 class TodoViewHolder(
@@ -11,17 +12,23 @@ class TodoViewHolder(
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc, assignedTextProvider) {
 
     private val dateFormatter: DateFormat = android.text.format.DateFormat.getDateFormat(context)
 
-    override fun bind(data: Task, position: Int, displayMode: String) {
+    override fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
         this.task = data
         setChecklistIndicatorBackgroundActive(data.isChecklistDisplayActive)
         reminderTextView.visibility = View.GONE
         this.streakTextView.visibility = View.GONE
-        super.bind(data, position, displayMode)
+        super.bind(data, position, displayMode, ownerID)
     }
 
     override fun configureSpecialTaskTextView(task: Task) {
@@ -35,7 +42,7 @@ class TodoViewHolder(
         }
     }
 
-    override fun shouldDisplayAsActive(newTask: Task?): Boolean {
-        return newTask?.completed != true
+    override fun shouldDisplayAsActive(task: Task?, userID: String?): Boolean {
+        return task?.completed(userID) != true
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
index 8230ddd5e..c73bd6e2f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
@@ -17,27 +17,23 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.GooglePlayServicesUtil
 import com.google.android.gms.common.Scopes
-import com.google.android.gms.common.UserRecoverableException
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.addCloseButton
-import com.habitrpg.common.habitica.helpers.KeyHelper
 import com.habitrpg.android.habitica.helpers.SignInWithAppleResult
 import com.habitrpg.android.habitica.helpers.SignInWithAppleService
-import com.habitrpg.common.habitica.models.auth.UserAuthResponse
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.api.HostConfig
+import com.habitrpg.common.habitica.helpers.KeyHelper
+import com.habitrpg.common.habitica.models.auth.UserAuthResponse
 import com.willowtreeapps.signinwithapplebutton.SignInWithAppleConfiguration
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.exceptions.Exceptions
-import io.reactivex.rxjava3.schedulers.Schedulers
-import java.io.IOException
+import kotlinx.coroutines.MainScope
 import javax.inject.Inject
 
 class AuthenticationViewModel() {
@@ -55,8 +51,6 @@ class AuthenticationViewModel() {
     @JvmField
     var keyHelper: KeyHelper? = null
 
-    private var compositeSubscription = CompositeDisposable()
-
     var googleEmail: String? = null
 
     init {
@@ -117,44 +111,25 @@ class AuthenticationViewModel() {
         val scopesString = Scopes.PROFILE + " " + Scopes.EMAIL
         val scopes = "oauth2:$scopesString"
         var newUser = false
-        compositeSubscription.add(
-            Flowable.defer {
-                try {
-                    @Suppress("Deprecation")
-                    return@defer Flowable.just(GoogleAuthUtil.getToken(activity, googleEmail ?: "", scopes))
-                } catch (e: IOException) {
-                    throw Exceptions.propagate(e)
-                } catch (e: GoogleAuthException) {
-                    throw Exceptions.propagate(e)
-                } catch (e: UserRecoverableException) {
-                    return@defer Flowable.empty()
+        MainScope().launchCatching({ throwable ->
+            if (recoverFromPlayServicesErrorResult == null) return@launchCatching
+            throwable.cause?.let {
+                if (GoogleAuthException::class.java.isAssignableFrom(it.javaClass)) {
+                    handleGoogleAuthException(
+                        throwable.cause as GoogleAuthException,
+                        activity,
+                        recoverFromPlayServicesErrorResult
+                    )
                 }
             }
-                .subscribeOn(Schedulers.io())
-                .flatMap { token -> apiClient.connectSocial("google", googleEmail ?: "", token) }
-                .doOnNext {
-                    newUser = it.newUser
-                    handleAuthResponse(it)
-                }
-                .flatMap { userRepository.retrieveUser(true, true) }
-                .subscribe(
-                    {
-                        onSuccess(it, newUser)
-                    },
-                    { throwable ->
-                        if (recoverFromPlayServicesErrorResult == null) return@subscribe
-                        throwable.cause?.let {
-                            if (GoogleAuthException::class.java.isAssignableFrom(it.javaClass)) {
-                                handleGoogleAuthException(
-                                    throwable.cause as GoogleAuthException,
-                                    activity,
-                                    recoverFromPlayServicesErrorResult
-                                )
-                            }
-                        }
-                    }
-                )
-        )
+        }) {
+            val token = GoogleAuthUtil.getToken(activity, googleEmail ?: "", scopes)
+            val response = apiClient.connectSocial("google", googleEmail ?: "", token) ?: return@launchCatching
+            newUser = response.newUser
+            handleAuthResponse(response)
+            val user = userRepository.retrieveUser(true, true) ?: return@launchCatching
+            onSuccess(user, newUser)
+        }
     }
 
     private fun handleGoogleAuthException(
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 78c3fc71a..f54e5b2dc 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
@@ -2,12 +2,13 @@ package com.habitrpg.android.habitica.ui.viewmodels
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 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.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.rxjava3.disposables.CompositeDisposable
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 abstract class BaseViewModel(initializeComponent: Boolean = true) : ViewModel() {
@@ -31,16 +32,12 @@ abstract class BaseViewModel(initializeComponent: Boolean = true) : ViewModel()
 
     override fun onCleared() {
         userRepository.close()
-        disposable.clear()
         super.onCleared()
     }
 
-    internal val disposable = CompositeDisposable()
-
     fun updateUser(path: String, value: Any) {
-        disposable.add(
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
             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 08e69698c..06f351c1b 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
@@ -3,26 +3,29 @@ package com.habitrpg.android.habitica.ui.viewmodels
 import android.os.Bundle
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
 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.extensions.filterOptionalDoOnEmpty
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.common.habitica.extensions.Optional
-import com.habitrpg.common.habitica.extensions.asOptional
 import com.habitrpg.common.habitica.models.notifications.NewChatMessageData
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.BehaviorSubject
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import retrofit2.HttpException
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 enum class GroupViewType(internal val order: String) {
@@ -36,24 +39,33 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
 
     @Inject
     lateinit var challengeRepository: ChallengeRepository
+
     @Inject
     lateinit var socialRepository: SocialRepository
+
     @Inject
     lateinit var notificationsManager: NotificationsManager
 
+    protected val groupIDState = MutableStateFlow<String?>(null)
+    val groupIDFlow: Flow<String?> = groupIDState
+
     var groupViewType: GroupViewType? = null
 
-    private val group: MutableLiveData<Group?> by lazy {
-        MutableLiveData<Group?>()
-    }
+    private val groupFlow = groupIDFlow
+        .filterNotNull()
+        .flatMapLatest { socialRepository.getGroup(it) }
+    private val group = groupFlow.asLiveData()
 
-    private val leader: MutableLiveData<Member?> by lazy {
-        MutableLiveData<Member?>()
-    }
+    private val leaderFlow = groupFlow.map { it?.leaderID }
+        .filterNotNull()
+        .flatMapLatest { socialRepository.retrieveMember(it).toFlow() }
+    private val leader = leaderFlow.asLiveData()
 
-    private val isMemberData: MutableLiveData<Boolean?> by lazy {
-        MutableLiveData<Boolean?>()
-    }
+    private val isMemberFlow = groupIDFlow
+        .filterNotNull()
+        .flatMapLatest { socialRepository.getGroupMembership(it) }
+        .map { it != null }
+    private val isMemberData = isMemberFlow.asLiveData()
 
     private val _chatMessages: MutableLiveData<List<ChatMessage>> by lazy {
         MutableLiveData<List<ChatMessage>>(listOf())
@@ -62,16 +74,8 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
         _chatMessages
     }
 
-    protected val groupIDSubject = BehaviorSubject.create<Optional<String>>()
-    val groupIDFlowable: Flowable<Optional<String>> = groupIDSubject.toFlowable(BackpressureStrategy.BUFFER)
     var gotNewMessages: Boolean = false
 
-    init {
-        loadGroupFromLocal()
-        loadLeaderFromLocal()
-        loadMembershipFromLocal()
-    }
-
     override fun inject(component: UserComponent) {
         component.inject(this)
     }
@@ -82,28 +86,21 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
     }
 
     fun setGroupID(groupID: String) {
-        if (groupID == groupIDSubject.value?.value) return
-        groupIDSubject.onNext(groupID.asOptional())
+        if (groupID == groupIDState.value) return
+        groupIDState.value = groupID
 
-        disposable.add(
-            notificationsManager.getNotifications().firstElement().map {
-                it.filter { notification ->
+        viewModelScope.launchCatching {
+            val notifications =
+                notificationsManager.getNotifications().firstOrNull()?.filter { notification ->
                     val data = notification.data as? NewChatMessageData
                     data?.group?.id == groupID
-                }
-            }
-                .filter { it.isNotEmpty() }
-                .flatMapPublisher { userRepository.readNotification(it.first().id) }
-                .subscribe(
-                    {
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+                } ?: return@launchCatching
+            notifications.forEach { userRepository.readNotification(it.id) }
+        }
     }
 
     val groupID: String?
-        get() = groupIDSubject.value?.value
+        get() = groupIDState.value
     val isMember: Boolean
         get() = isMemberData.value ?: false
     val leaderID: String?
@@ -115,92 +112,49 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
 
     fun getGroupData(): LiveData<Group?> = group
     fun getLeaderData(): LiveData<Member?> = leader
-    fun getIsMemberData(): LiveData<Boolean?> = isMemberData
-
-    private fun loadGroupFromLocal() {
-        disposable.add(
-            groupIDFlowable
-                .filterOptionalDoOnEmpty { group.value = null }
-                .flatMap { socialRepository.getGroupFlowable(it) }
-                .map { socialRepository.getUnmanagedCopy(it) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ group.value = it }, RxErrorHandler.handleEmptyError())
-        )
-    }
-
-    private fun loadLeaderFromLocal() {
-        disposable.add(
-            groupIDFlowable
-                .filterOptionalDoOnEmpty { leader.value = null }
-                .flatMap { socialRepository.getGroupFlowable(it) }
-                .distinctUntilChanged { group1, group2 -> group1.id == group2.id }
-                .flatMap { socialRepository.getMember(it.leaderID) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ leader.value = it }, RxErrorHandler.handleEmptyError())
-        )
-    }
-
-    private fun loadMembershipFromLocal() {
-        disposable.add(
-            groupIDFlowable
-                .filterOptionalDoOnEmpty { isMemberData.value = null }
-                .flatMap { socialRepository.getGroupMemberships() }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        isMemberData.value = it.firstOrNull { membership -> membership.groupID == groupID } != null
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
-    }
+    fun getIsMemberData(): LiveData<Boolean> = isMemberData
 
     fun retrieveGroup(function: (() -> Unit)?) {
         if (groupID?.isNotEmpty() == true) {
-            disposable.add(
-                socialRepository.retrieveGroup(groupID ?: "")
-                    .filter { groupViewType == GroupViewType.PARTY }
-                    .flatMap { group1 ->
-                        socialRepository.retrieveGroupMembers(group1.id, true)
-                    }
-                    .doOnComplete { function?.invoke() }
-                    .subscribe({ }, {
-                        if (it is HttpException && it.code() == 404) {
-                            MainNavigationController.navigateBack()
-                        }
-                        RxErrorHandler.reportError(it)
-                    })
-            )
+            viewModelScope.launch(ExceptionHandler.coroutine {
+                if (it is HttpException && it.code() == 404) {
+                    MainNavigationController.navigateBack()
+                }
+            }) {
+                val group = socialRepository.retrieveGroup(groupID ?: "")
+                if (groupViewType == GroupViewType.PARTY) {
+                    socialRepository.retrievePartyMembers(group?.id ?: "", true)
+                }
+                function?.invoke()
+            }
         }
     }
 
     fun inviteToGroup(inviteData: HashMap<String, Any>) {
-        disposable.add(
+        viewModelScope.launchCatching {
             socialRepository.inviteToGroup(group.value?.id ?: "", inviteData)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 
     fun updateOrCreateGroup(bundle: Bundle?) {
-        if (group.value == null) {
-            socialRepository.createGroup(
-                bundle?.getString("name"),
-                bundle?.getString("description"),
-                bundle?.getString("leader"),
-                bundle?.getString("groupType"),
-                bundle?.getString("privacy"),
-                bundle?.getBoolean("leaderCreateChallenge")
-            )
-        } else {
-            disposable.add(
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            if (group.value == null) {
+                socialRepository.createGroup(
+                    bundle?.getString("name"),
+                    bundle?.getString("description"),
+                    bundle?.getString("leader"),
+                    bundle?.getString("groupType"),
+                    bundle?.getString("privacy"),
+                    bundle?.getBoolean("leaderCreateChallenge")
+                )
+            } else {
                 socialRepository.updateGroup(
                     group.value, bundle?.getString("name"),
                     bundle?.getString("description"),
                     bundle?.getString("leader"),
                     bundle?.getBoolean("leaderCreateChallenge")
                 )
-                    .subscribe({ }, RxErrorHandler.handleEmptyError())
-            )
+            }
         }
     }
 
@@ -210,43 +164,39 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
         function: (() -> Unit)? = null
     ) {
         if (!keepChallenges) {
-            for (challenge in groupChallenges) {
-                challengeRepository.leaveChallenge(challenge, "remove-all").subscribe({}, RxErrorHandler.handleEmptyError())
+            viewModelScope.launchCatching {
+                for (challenge in groupChallenges) {
+                    challengeRepository.leaveChallenge(challenge, "remove-all")
+                }
             }
         }
-        disposable.add(
-            socialRepository.leaveGroup(this.group.value?.id ?: "", keepChallenges)
-                .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
-                .subscribe(
-                    {
-                        function?.invoke()
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.leaveGroup(groupID ?: "", keepChallenges)
+            userRepository.retrieveUser(withTasks = false, forced = true)
+        }
     }
 
     fun joinGroup(id: String? = null, function: (() -> Unit)? = null) {
-        disposable.add(
-            socialRepository.joinGroup(id ?: groupID).subscribe(
-                {
-                    function?.invoke()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        viewModelScope.launchCatching {
+            socialRepository.joinGroup(id ?: groupID)
+            function?.invoke()
+        }
     }
 
     fun rejectGroupInvite(id: String? = null) {
         groupID?.let {
-            disposable.add(socialRepository.rejectGroupInvite(id ?: it).subscribe({ }, RxErrorHandler.handleEmptyError()))
+            viewModelScope.launchCatching {
+                socialRepository.rejectGroupInvite(id ?: it)
+            }
         }
     }
 
     fun markMessagesSeen() {
-        groupIDSubject.value?.value?.let {
+        groupID?.let {
             if (groupViewType != GroupViewType.TAVERN && it.isNotEmpty() && gotNewMessages) {
-                socialRepository.markMessagesSeen(it)
+                viewModelScope.launchCatching {
+                    socialRepository.markMessagesSeen(it)
+                }
             }
         }
     }
@@ -254,15 +204,14 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
     fun likeMessage(message: ChatMessage) {
         val index = _chatMessages.value?.indexOf(message)
         if (index == null || index < 0) return
-        disposable.add(
-            socialRepository.likeMessage(message).subscribe(
-                {
-                    val list = _chatMessages.value?.toMutableList()
-                    list?.set(index, it)
-                    _chatMessages.postValue(list)
-                }, RxErrorHandler.handleEmptyError()
-            )
-        )
+        viewModelScope.launchCatching {
+            val message = socialRepository.likeMessage(message)
+            val list = _chatMessages.value?.toMutableList()
+            if (message != null) {
+                list?.set(index, message)
+            }
+            _chatMessages.postValue(list)
+        }
     }
 
     fun deleteMessage(chatMessage: ChatMessage) {
@@ -270,55 +219,47 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
         val list = _chatMessages.value?.toMutableList()
         list?.remove(chatMessage)
         _chatMessages.postValue(list)
-        disposable.add(
-            socialRepository.deleteMessage(chatMessage).subscribe({
-            }, {
-                list?.add(oldIndex, chatMessage)
-                _chatMessages.postValue(list)
-                RxErrorHandler.reportError(it)
-            })
-        )
+        viewModelScope.launch(ExceptionHandler.coroutine {
+            list?.add(oldIndex, chatMessage)
+            _chatMessages.postValue(list)
+            ExceptionHandler.reportError(it)
+        }) {
+            socialRepository.deleteMessage(chatMessage)
+        }
     }
 
     fun postGroupChat(chatText: String, onComplete: () -> Unit, onError: () -> Unit) {
-        groupIDSubject.value?.value?.let { groupID ->
-            socialRepository.postGroupChat(groupID, chatText).subscribe(
-                {
-                    val list = _chatMessages.value?.toMutableList()
-                    list?.add(0, it.message)
-                    _chatMessages.postValue(list)
-                    onComplete()
-                },
-                { error ->
-                    RxErrorHandler.reportError(error)
-                    onError()
+        groupID?.let { groupID ->
+            viewModelScope.launch(ExceptionHandler.coroutine {
+                ExceptionHandler.reportError(it)
+                onError()
+            }) {
+                val response = socialRepository.postGroupChat(groupID, chatText)
+                val list = _chatMessages.value?.toMutableList()
+                if (response != null) {
+                    list?.add(0, response.message)
                 }
-            )
+                _chatMessages.postValue(list)
+                onComplete()
+            }
         }
     }
 
     fun retrieveGroupChat(onComplete: () -> Unit) {
-        val groupID = groupIDSubject.value?.value
+        val groupID = groupID
         if (groupID.isNullOrEmpty()) {
             onComplete()
             return
         }
-        disposable.add(
-            socialRepository.retrieveGroupChat(groupID)
-                .delay(500, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        _chatMessages.postValue(it)
-                        onComplete()
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            val messages = socialRepository.retrieveGroupChat(groupID)
+            _chatMessages.postValue(messages)
+            onComplete()
+        }
     }
 
     fun updateGroup(bundle: Bundle?) {
-        disposable.add(
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
             socialRepository.updateGroup(
                 group.value,
                 bundle?.getString("name"),
@@ -326,7 +267,6 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
                 bundle?.getString("leader"),
                 bundle?.getBoolean("leaderOnlyChallenges")
             )
-                .subscribe({}, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 }
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 95489448b..8bebb03c3 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
@@ -4,24 +4,28 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
 import androidx.paging.DataSource
 import androidx.paging.PagedList
 import androidx.paging.PositionalDataSource
 import androidx.paging.toLiveData
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.common.habitica.extensions.Optional
-import com.habitrpg.common.habitica.extensions.asOptional
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.BehaviorSubject
+import io.realm.kotlin.toFlow
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.ceil
@@ -30,6 +34,9 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
     @Inject
     lateinit var socialRepository: SocialRepository
 
+    protected var memberIDFlow = MutableStateFlow<String?>(null)
+    val memberIDState: StateFlow<String?> = memberIDFlow
+
     private val config = PagedList.Config.Builder()
         .setPageSize(10)
         .setEnablePlaceholders(false)
@@ -37,31 +44,19 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
 
     val dataSourceFactory = MessagesDataSourceFactory(socialRepository, recipientID, ChatMessage())
     val messages: LiveData<PagedList<ChatMessage>> = dataSourceFactory.toLiveData(config)
-    private val member: MutableLiveData<Member?> by lazy {
-        MutableLiveData<Member?>()
-    }
+    private val member = memberIDFlow
+        .filterNotNull()
+        .flatMapLatest { socialRepository.retrieveMember(it).toFlow() }
+        .asLiveData()
     fun getMemberData(): LiveData<Member?> = member
 
-    private fun loadMemberFromLocal() {
-        disposable.add(
-            memberIDFlowable
-                .filterOptionalDoOnEmpty { member.value = null }
-                .flatMap { socialRepository.getMember(it) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ member.value = it }, RxErrorHandler.handleEmptyError())
-        )
-    }
-
-    protected var memberIDSubject = BehaviorSubject.create<Optional<String>>()
-    val memberIDFlowable: Flowable<Optional<String>> = memberIDSubject.toFlowable(BackpressureStrategy.BUFFER)
-
-    fun setMemberID(groupID: String) {
-        if (groupID == memberIDSubject.value?.value) return
-        memberIDSubject.onNext(groupID.asOptional())
+    fun setMemberID(memberID: String) {
+        if (memberID == memberIDState.value) return
+        memberIDFlow.value = memberID
     }
 
     val memberID: String?
-        get() = memberIDSubject.value?.value
+        get() = memberIDFlow.value
 
     override fun inject(component: UserComponent) {
         component.inject(this)
@@ -74,17 +69,13 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
     init {
         if (recipientID?.isNotBlank() == true) {
             setMemberID(recipientID)
-            loadMemberFromLocal()
         } else if (recipientUsername?.isNotBlank() == true) {
-            socialRepository.getMemberWithUsername(recipientUsername).subscribe(
-                {
-                    setMemberID(it.id ?: "")
-                    member.value = it
-                    dataSourceFactory.updateRecipientID(memberIDSubject.value?.value)
-                    invalidateDataSource()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                val member = socialRepository.retrieveMemberWithUsername(recipientUsername)
+                setMemberID(member?.id ?: "")
+                invalidateDataSource()
+                dataSourceFactory.updateRecipientID(memberID)
+            }
         }
     }
 }
@@ -104,17 +95,13 @@ class MessagesDataSource(
         MainScope().launch(Dispatchers.Main.immediate) {
             if (recipientID?.isNotBlank() != true) { return@launch }
             val page = ceil(params.startPosition.toFloat() / params.loadSize.toFloat()).toInt()
-            socialRepository.retrieveInboxMessages(recipientID ?: "", page)
-                .subscribe(
-                    {
-                        if (it.size < 10) {
-                            lastFetchWasEnd = true
-                            callback.onResult(it)
-                        } else
-                            callback.onResult(it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            val messages = socialRepository.retrieveInboxMessages(recipientID ?: "", page) ?: return@launch
+            if (messages.size < 10) {
+                lastFetchWasEnd = true
+                callback.onResult(messages)
+            } else {
+                callback.onResult(messages)
+            }
         }
     }
 
@@ -123,29 +110,25 @@ class MessagesDataSource(
         MainScope().launch(Dispatchers.Main.immediate) {
             socialRepository.getInboxMessages(recipientID)
                 .map { socialRepository.getUnmanagedCopy(it) }
-                .firstElement()
-                .flatMapPublisher {
+                .take(1)
+                .flatMapLatest {
                     if (it.isEmpty()) {
-                        if (recipientID?.isNotBlank() != true) { return@flatMapPublisher Flowable.just(it) }
-                        socialRepository.retrieveInboxMessages(recipientID ?: "", 0)
-                            .doOnNext { messages ->
-                                if (messages.size < 10) {
-                                    lastFetchWasEnd = true
-                                }
-                            }
+                        if (recipientID?.isNotBlank() != true) { return@flatMapLatest flowOf(it) }
+                        val messages = socialRepository.retrieveInboxMessages(recipientID ?: "", 0) ?: return@flatMapLatest emptyFlow()
+                        if (messages.size < 10) {
+                            lastFetchWasEnd = true
+                        }
+                        flowOf(messages)
                     } else {
-                        Flowable.just(it)
+                        flowOf(it)
                     }
                 }
-                .subscribe(
-                    {
+                .collect {
                         if (it.size < 10 && footer != null)
                             callback.onResult(it.plusElement(footer!!), 0)
                         else
                             callback.onResult(it, 0)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+                }
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
index 1c0119848..9c6c215d4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
@@ -10,8 +10,9 @@ import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
 import com.habitrpg.android.habitica.models.TutorialStep
 import com.habitrpg.android.habitica.models.inventory.Egg
@@ -19,9 +20,8 @@ import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.TutorialView
 import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.shared.habitica.models.responses.MaintenanceResponse
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.schedulers.Schedulers
 import io.realm.kotlin.isValid
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import java.util.Date
 import javax.inject.Inject
@@ -71,7 +71,7 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
 
     fun onCreate() {
         try {
-            viewModelScope.launch {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 taskAlarmManager.scheduleAllSavedAlarms(sharedPreferences.getBoolean("preventDailyReminder", false))
             }
         } catch (e: Exception) {
@@ -89,21 +89,21 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
 
     fun retrieveUser(forced: Boolean = false) {
         if (hostConfig.hasAuthentication()) {
-            disposable.add(
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 contentRepository.retrieveWorldState()
-                    .flatMap { userRepository.retrieveUser(true, forced) }
-                    .doOnNext { user1 ->
-                        analyticsManager.setUserProperty("has_party", if (user1.party?.id?.isNotEmpty() == true) "true" else "false")
-                        analyticsManager.setUserProperty("is_subscribed", if (user1.isSubscribed) "true" else "false")
-                        analyticsManager.setUserProperty("checkin_count", user1.loginIncentives.toString())
-                        analyticsManager.setUserProperty("level", user1.stats?.lvl?.toString() ?: "")
-                        pushNotificationManager.setUser(user1)
-                        pushNotificationManager.addPushDeviceUsingStoredToken()
-                    }
-                    .flatMap { userRepository.retrieveTeamPlans() }
-                    .flatMap { contentRepository.retrieveContent() }
-                    .subscribe({ }, RxErrorHandler.handleEmptyError())
-            )
+                userRepository.retrieveUser(true, forced)?.let { user ->
+                    analyticsManager.setUserProperty("has_party", if (user.party?.id?.isNotEmpty() == true) "true" else "false")
+                    analyticsManager.setUserProperty("is_subscribed", if (user.isSubscribed) "true" else "false")
+                    analyticsManager.setUserProperty("checkin_count", user.loginIncentives.toString())
+                    analyticsManager.setUserProperty("level", user.stats?.lvl?.toString() ?: "")
+                    pushNotificationManager.setUser(user)
+                    pushNotificationManager.addPushDeviceUsingStoredToken()
+                }
+                contentRepository.retrieveContent()
+            }
+            viewModelScope.launchCatching {
+                userRepository.retrieveTeamPlans()
+            }
         }
     }
 
@@ -130,20 +130,13 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
     }
 
     fun ifNeedsMaintenance(onResult: ((MaintenanceResponse) -> Unit)) {
-        disposable.add(
-            this.maintenanceService.maintenanceStatus
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    { maintenanceResponse ->
-                        if (maintenanceResponse.activeMaintenance == null) {
-                            return@subscribe
-                        }
-                        onResult(maintenanceResponse)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        viewModelScope.launchCatching {
+            val maintenanceResponse = maintenanceService.getMaintenanceStatus()
+            if (maintenanceResponse?.activeMaintenance == null) {
+                return@launchCatching
+            }
+            onResult(maintenanceResponse)
+        }
     }
 
     fun getToolbarTitle(
@@ -153,21 +146,17 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
         onSuccess: ((CharSequence?) -> Unit)
     ) {
         if (id == R.id.petDetailRecyclerFragment || id == R.id.mountDetailRecyclerFragment) {
-            disposable.add(
-                inventoryRepository.getItem("egg", eggType ?: "").firstElement().subscribe(
-                    {
-                        if (!it.isValid()) return@subscribe
-                        onSuccess(
-                            if (id == R.id.petDetailRecyclerFragment) {
-                                (it as? Egg)?.text
-                            } else {
-                                (it as? Egg)?.mountText
-                            }
-                        )
-                    },
-                    RxErrorHandler.handleEmptyError()
+            viewModelScope.launchCatching {
+                val item = inventoryRepository.getItem("egg", eggType ?: "").firstOrNull()
+                if (item?.isValid() != true) return@launchCatching
+                onSuccess(
+                    if (id == R.id.petDetailRecyclerFragment) {
+                        (item as? Egg)?.text
+                    } else {
+                        (item as? Egg)?.mountText
+                    }
                 )
-            )
+            }
         } else {
             onSuccess(
                 if (id == R.id.promoInfoFragment) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
index 3b29243c2..ba0b0ec5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
@@ -2,27 +2,29 @@ package com.habitrpg.android.habitica.ui.viewmodels
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.asLiveData
-import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.invitations.PartyInvite
+import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.modules.AppModule
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import javax.inject.Inject
-import javax.inject.Named
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.launch
 
-class MainUserViewModel(val userRepository: UserRepository) {
-
-    @field:[Inject Named(AppModule.NAMED_USER_ID)]
-    lateinit var injectedUserID: String
+class MainUserViewModel(private val providedUserID: String, val userRepository: UserRepository, val socialRepository: SocialRepository) {
 
     val formattedUsername: CharSequence?
         get() = user.value?.formattedUsername
     val partyInvitations: List<PartyInvite>
         get() = user.value?.invitations?.parties ?: emptyList()
     val userID: String
-        get() = user.value?.id ?: injectedUserID
+        get() = user.value?.id ?: providedUserID
     val username: CharSequence
         get() = user.value?.username ?: ""
     val displayName: CharSequence
@@ -36,31 +38,33 @@ class MainUserViewModel(val userRepository: UserRepository) {
     val mirrorGroupTasks: List<String>
     get() = user.value?.preferences?.tasks?.mirrorGroupTasks ?: emptyList()
 
-    val user: LiveData<User?>
-
-    init {
-        HabiticaBaseApplication.userComponent?.inject(this)
-        user = userRepository.getUser().asLiveData()
-    }
+    val user: LiveData<User?> = userRepository.getUser().asLiveData()
+    var currentTeamPlan: MutableStateFlow<TeamPlan?> = MutableStateFlow(null)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    var currentTeamPlanGroup = currentTeamPlan
+        .filterNotNull()
+        .distinctUntilChanged { old, new -> old.id == new.id }
+        .flatMapLatest { socialRepository.getGroup(it.id) }
+    @OptIn(ExperimentalCoroutinesApi::class)
+    var currentTeamPlanMembers: LiveData<List<Member>> = currentTeamPlan
+        .filterNotNull()
+        .distinctUntilChanged { old, new -> old.id == new.id }
+        .flatMapLatest { socialRepository.getGroupMembers(it.id) }
+        .asLiveData()
 
     fun onCleared() {
         userRepository.close()
-        disposable.clear()
     }
 
-    internal val disposable = CompositeDisposable()
-
     fun updateUser(path: String, value: Any) {
-        disposable.add(
+        MainScope().launch(ExceptionHandler.coroutine()) {
             userRepository.updateUser(path, value)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 
     fun updateUser(data: Map<String, Any>) {
-        disposable.add(
+        MainScope().launch(ExceptionHandler.coroutine()) {
             userRepository.updateUser(data)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
index 39be81d98..292a1465c 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
@@ -2,12 +2,14 @@ package com.habitrpg.android.habitica.ui.viewmodels
 
 import android.os.Bundle
 import androidx.core.os.bundleOf
+import androidx.lifecycle.viewModelScope
 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.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.models.Notification
@@ -19,11 +21,12 @@ import com.habitrpg.common.habitica.models.notifications.NewStuffData
 import com.habitrpg.common.habitica.models.notifications.PartyInvitationData
 import com.habitrpg.common.habitica.models.notifications.PartyInvite
 import com.habitrpg.common.habitica.models.notifications.QuestInvitationData
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.functions.BiFunction
-import io.reactivex.rxjava3.subjects.BehaviorSubject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 open class NotificationsViewModel : BaseViewModel() {
@@ -49,15 +52,13 @@ open class NotificationsViewModel : BaseViewModel() {
 
     private var party: UserParty? = null
 
-    private val customNotifications: BehaviorSubject<List<Notification>> = BehaviorSubject.create()
+    private val customNotifications = MutableStateFlow<List<Notification>>(emptyList())
 
     override fun inject(component: UserComponent) {
         component.inject(this)
     }
 
     init {
-        customNotifications.onNext(emptyList())
-
         userViewModel.user.observeForever {
             if (it == null) return@observeForever
             party = it.party
@@ -70,42 +71,35 @@ open class NotificationsViewModel : BaseViewModel() {
                 notification.data = data
                 notifications.add(notification)
             }
-            customNotifications.onNext(notifications)
+            customNotifications.value = notifications
         }
     }
 
-    fun getNotifications(): Flowable<List<Notification>> {
+    fun getNotifications(): Flow<List<Notification>> {
         val serverNotifications = notificationsManager.getNotifications()
             .map { filterSupportedTypes(it) }
 
-        return Flowable.combineLatest(
-            serverNotifications,
-            customNotifications.toFlowable(BackpressureStrategy.LATEST),
-            BiFunction {
-                    serverNotificationsList, customNotificationsList ->
-                if (serverNotificationsList.firstOrNull { notification -> notification.type == Notification.Type.NEW_STUFF.type } != null) {
-                    return@BiFunction serverNotificationsList + customNotificationsList.filter { notification -> notification.type != Notification.Type.NEW_STUFF.type }
-                }
-                return@BiFunction serverNotificationsList + customNotificationsList
+        return serverNotifications.combine(customNotifications) { serverNotificationsList, customNotificationsList ->
+            if (serverNotificationsList.firstOrNull { notification -> notification.type == Notification.Type.NEW_STUFF.type } != null) {
+                return@combine serverNotificationsList + customNotificationsList.filter { notification -> notification.type != Notification.Type.NEW_STUFF.type }
             }
-        )
-            .map { it.sortedBy { notification -> notification.priority } }
-            .observeOn(AndroidSchedulers.mainThread())
+            return@combine serverNotificationsList + customNotificationsList
+        }.map { it.sortedBy { notification -> notification.priority } }
     }
 
-    fun getNotificationCount(): Flowable<Int> {
+    fun getNotificationCount(): Flow<Int> {
         return getNotifications()
             .map { it.count() }
             .distinctUntilChanged()
     }
 
-    fun allNotificationsSeen(): Flowable<Boolean> {
+    fun allNotificationsSeen(): Flow<Boolean> {
         return getNotifications()
             .map { it.all { notification -> notification.seen != false } }
             .distinctUntilChanged()
     }
 
-    fun getHasPartyNotification(): Flowable<Boolean> {
+    fun getHasPartyNotification(): Flow<Boolean> {
         return getNotifications()
             .map {
                 it.find { notification ->
@@ -116,7 +110,7 @@ open class NotificationsViewModel : BaseViewModel() {
             .distinctUntilChanged()
     }
 
-    fun refreshNotifications(): Flowable<*> {
+    suspend fun refreshNotifications(): User? {
         return userRepository.retrieveUser(withTasks = false, forced = true)
     }
 
@@ -195,17 +189,14 @@ open class NotificationsViewModel : BaseViewModel() {
     fun dismissNotification(notification: Notification) {
         if (isCustomNotification(notification)) {
             if (isCustomNewStuffNotification(notification)) {
-                customNotifications.onNext(
-                    customNotifications.value?.filterNot { it.id == notification.id } ?: listOf()
-                )
+                customNotifications.value = customNotifications.value.filterNot { it.id == notification.id }
             }
             return
         }
 
-        disposable.add(
+        viewModelScope.launchCatching {
             userRepository.readNotification(notification.id)
-                .subscribe({}, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 
     fun dismissAllNotifications(notifications: List<Notification>) {
@@ -228,10 +219,9 @@ open class NotificationsViewModel : BaseViewModel() {
         val notificationIds = HashMap<String, List<String>>()
         notificationIds["notificationIds"] = dismissableIds
 
-        disposable.add(
+        viewModelScope.launchCatching {
             userRepository.readNotifications(notificationIds)
-                .subscribe({}, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 
     fun markNotificationsAsSeen(notifications: List<Notification>) {
@@ -247,10 +237,9 @@ open class NotificationsViewModel : BaseViewModel() {
         val notificationIds = HashMap<String, List<String>>()
         notificationIds["notificationIds"] = unseenIds
 
-        disposable.add(
+        viewModelScope.launchCatching {
             userRepository.seeNotifications(notificationIds)
-                .subscribe({}, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 
     private fun findNotification(id: String): Notification? {
@@ -327,7 +316,9 @@ open class NotificationsViewModel : BaseViewModel() {
             Notification.Type.GROUP_TASK_REQUIRES_APPROVAL.type -> acceptTaskApproval(notification)
         }
         if (isCustomNotification(notification)) {
-            disposable.add(userRepository.retrieveUser(false).subscribe())
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.retrieveUser()
+            }
         } else {
             dismissNotification(notification)
         }
@@ -354,61 +345,43 @@ open class NotificationsViewModel : BaseViewModel() {
 
     private fun acceptGroupInvitation(groupId: String?) {
         groupId?.let {
-            disposable.add(
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 socialRepository.joinGroup(it)
-                    .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(
-                        {
-                            refreshNotifications()
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+                refreshUser()
+            }
         }
     }
 
     fun rejectGroupInvite(groupId: String?) {
         groupId?.let {
-            disposable.add(
+            viewModelScope.launchCatching {
                 socialRepository.rejectGroupInvite(it)
-                    .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(
-                        {
-                            refreshNotifications()
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+                refreshUser()
+            }
         }
     }
 
     private fun acceptQuestInvitation() {
         party?.id?.let {
-            disposable.add(
+            viewModelScope.launchCatching {
                 socialRepository.acceptQuest(null, it)
-                    .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(
-                        {
-                            refreshNotifications()
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+                refreshUser()
+            }
         }
     }
 
     private fun rejectQuestInvitation() {
         party?.id?.let {
-            disposable.add(
+            viewModelScope.launchCatching {
                 socialRepository.rejectQuest(null, it)
-                    .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(
-                        {
-                            refreshNotifications()
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+                refreshUser()
+            }
+        }
+    }
+
+    private fun refreshUser() {
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            refreshNotifications()
         }
     }
 
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 0bca2c7c1..e00498adc 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
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.ui.viewmodels
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.members.Member
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.BackpressureStrategy
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 class PartyViewModel(initializeComponent: Boolean) : GroupViewModel(initializeComponent) {
@@ -23,62 +23,38 @@ class PartyViewModel(initializeComponent: Boolean) : GroupViewModel(initializeCo
                 ?: true
             )
 
-    private val members: MutableLiveData<List<Member>?> by lazy {
-        MutableLiveData<List<Member>?>()
-    }
+    private val membersFlow = groupIDFlow
+        .filterNotNull()
+        .flatMapLatest { socialRepository.getPartyMembers(it) }
+    private val members = membersFlow.asLiveData()
 
     init {
         groupViewType = GroupViewType.PARTY
-        loadMembersFromLocal()
     }
 
     override fun inject(component: UserComponent) {
         component.inject(this)
     }
 
-    fun getMembersData(): LiveData<List<Member>?> = members
-
-    private fun loadMembersFromLocal() {
-        disposable.add(
-            groupIDSubject.toFlowable(BackpressureStrategy.LATEST)
-                .distinctUntilChanged()
-                .filterOptionalDoOnEmpty { members.value = null }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    viewModelScope.launch {
-                        socialRepository.getGroupMembers(it)
-                            .collect {
-                                members.value = it
-                            }
-                    }}, RxErrorHandler.handleEmptyError())
-        )
-    }
+    fun getMembersData() = members
 
     fun acceptQuest() {
-        groupIDSubject.value?.value?.let { groupID ->
-            disposable.add(
+        groupID?.let { groupID ->
+            viewModelScope.launchCatching {
                 socialRepository.acceptQuest(null, groupID)
-                    .flatMap { userRepository.retrieveUser() }
-                    .flatMap { socialRepository.retrieveGroup(groupID) }
-                    .subscribe(
-                        {},
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+                socialRepository.retrieveGroup(groupID)
+                userRepository.retrieveUser()
+            }
         }
     }
 
     fun rejectQuest() {
-        groupIDSubject.value?.value?.let { groupID ->
-            disposable.add(
+        groupID?.let { groupID ->
+            viewModelScope.launchCatching {
                 socialRepository.rejectQuest(null, groupID)
-                    .flatMap { userRepository.retrieveUser() }
-                    .flatMap { socialRepository.retrieveGroup(groupID) }
-                    .subscribe(
-                        {},
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+                socialRepository.retrieveGroup(groupID)
+                userRepository.retrieveUser()
+            }
         }
     }
 
@@ -88,16 +64,14 @@ class PartyViewModel(initializeComponent: Boolean) : GroupViewModel(initializeCo
     }
 
     fun loadPartyID() {
-        disposable.add(
-            userRepository.getUserFlowable()
-                .map { it.party?.id ?: "" }
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .map { it?.party?.id }
                 .distinctUntilChanged()
-                .subscribe(
-                    { groupID ->
-                        setGroupID(groupID)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+                .filterNotNull()
+                .collect {
+                    setGroupID(it)
+                }
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
index ebb5002a5..6ed5036b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
@@ -11,7 +11,8 @@ 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.getTranslatedType
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.inventory.Animal
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Mount
@@ -58,7 +59,7 @@ class StableViewModel(private val application: Application?, private val itemTyp
     }
 
     private fun loadItems() {
-        viewModelScope.launch {
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
             val animals = if ("pets" == itemType) {
                 inventoryRepository.getPets().firstOrNull()
             } else {
@@ -78,11 +79,9 @@ class StableViewModel(private val application: Application?, private val itemTyp
             }.collect {
                 _items.value = mapAnimals(animals, it)
             }
-
-            viewModelScope.launch {
-
+            viewModelScope.launchCatching {
+                _ownedItems.value = inventoryRepository.getOwnedItems(true).firstOrNull()
             }
-            disposable.add(inventoryRepository.getOwnedItems(true).subscribe({ _ownedItems.value = it }, RxErrorHandler.handleEmptyError()))
             _mounts.value = if ("pets" == itemType) {
                 inventoryRepository.getMounts().firstOrNull() ?: emptyList()
             } else {
@@ -133,7 +132,7 @@ class StableViewModel(private val application: Application?, private val itemTyp
             val isOwned = when (itemType) {
                 "pets" -> {
                     val ownedPet = ownedAnimals[animal.key] as? OwnedPet
-                    ownedPet?.trained ?: 0 > 0
+                    (ownedPet?.trained ?: 0) > 0
                 }
                 "mounts" -> {
                     val ownedMount = ownedAnimals[animal.key] as? OwnedMount
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TaskFormViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TaskFormViewModel.kt
new file mode 100644
index 000000000..dafb36964
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TaskFormViewModel.kt
@@ -0,0 +1,19 @@
+package com.habitrpg.android.habitica.ui.viewmodels
+
+import androidx.compose.runtime.mutableStateOf
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.shared.habitica.models.tasks.Attribute
+import com.habitrpg.shared.habitica.models.tasks.HabitResetOption
+import com.habitrpg.shared.habitica.models.tasks.TaskDifficulty
+
+class TaskFormViewModel: BaseViewModel() {
+    override fun inject(component: UserComponent) {
+        component.inject(this)
+    }
+
+    val taskDifficulty = mutableStateOf(TaskDifficulty.EASY)
+    val selectedAttribute = mutableStateOf(Attribute.STRENGTH)
+    val habitResetOption = mutableStateOf(HabitResetOption.DAILY)
+    val habitScoringPositive = mutableStateOf(true)
+    val habitScoringNegative = mutableStateOf(false)
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
index 3b778a0e0..cfa141a87 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
@@ -1,42 +1,48 @@
 package com.habitrpg.android.habitica.ui.viewmodels
 
 import android.content.SharedPreferences
+import android.content.res.Resources
 import android.text.format.DateUtils
 import androidx.core.content.edit
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+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.data.TaskRepository
 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.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
+import com.habitrpg.android.habitica.helpers.launchCatching
+import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.realm.Case
 import io.realm.OrderedRealmCollection
 import io.realm.RealmQuery
 import io.realm.Sort
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import java.util.Date
 import javax.inject.Inject
 
-class TasksViewModel : BaseViewModel() {
-    private var compositeSubscription: CompositeDisposable = CompositeDisposable()
-
+class TasksViewModel : BaseViewModel(), GroupPlanInfoProvider {
     override fun inject(component: UserComponent) {
         component.inject(this)
     }
 
     @Inject
     lateinit var taskRepository: TaskRepository
+
     @Inject
     lateinit var tagRepository: TagRepository
+
     @Inject
     lateinit var appConfigManager: AppConfigManager
+
     @Inject
     lateinit var sharedPreferences: SharedPreferences
 
@@ -45,6 +51,7 @@ class TasksViewModel : BaseViewModel() {
     val ownerID: MutableLiveData<String?> by lazy {
         MutableLiveData()
     }
+    var teamPlans = mapOf<String, TeamPlan>()
     var initialPreferenceFilterSet: Boolean = false
 
     val isPersonalBoard: Boolean
@@ -58,10 +65,11 @@ class TasksViewModel : BaseViewModel() {
 
     init {
         if (appConfigManager.enableTeamBoards()) {
-            viewModelScope.launch {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 userRepository.getTeamPlans()
-                    .collect {
-                        owners = listOf(Pair(userViewModel.userID, userViewModel.displayName)) + it.map {
+                    .collect { plans ->
+                        teamPlans = plans.associateBy { it.id }
+                        owners = listOf(Pair(userViewModel.userID, userViewModel.displayName)) + plans.map {
                             Pair(
                                 it.id,
                                 it.summary
@@ -72,29 +80,23 @@ class TasksViewModel : BaseViewModel() {
                         }
                     }
             }
-            compositeSubscription.add(
-                userRepository.retrieveTeamPlans().subscribe({}, RxErrorHandler.handleEmptyError())
-            )
+            viewModelScope.launchCatching {
+                userRepository.retrieveTeamPlans()
+            }
         }
     }
 
     internal fun refreshData(onComplete: () -> Unit) {
-        if (isPersonalBoard) {
-            compositeSubscription.add(
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            if (isPersonalBoard) {
                 userRepository.retrieveUser(
                     withTasks = true,
                     forced = true
-                ).doOnTerminate {
-                    onComplete()
-                }.subscribe({ }, RxErrorHandler.handleEmptyError())
-            )
-        } else {
-            compositeSubscription.add(
+                )
+            } else {
                 userRepository.retrieveTeamPlan(ownerID.value ?: "")
-                    .doOnTerminate {
-                        onComplete()
-                    }.subscribe({ }, RxErrorHandler.handleEmptyError())
-            )
+            }
+            onComplete()
         }
     }
 
@@ -108,9 +110,18 @@ class TasksViewModel : BaseViewModel() {
         }
     }
 
-    fun scoreTask(task: Task, direction: TaskDirection, onResult: (TaskScoringResult, Int) -> Unit) {
-        compositeSubscription.add(
-            taskRepository.taskChecked(null, task.id ?: "", direction == TaskDirection.UP, false) { result ->
+    fun scoreTask(
+        task: Task,
+        direction: TaskDirection,
+        onResult: (TaskScoringResult, Int) -> Unit
+    ) {
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            taskRepository.taskChecked(
+                null,
+                task.id ?: "",
+                direction == TaskDirection.UP,
+                false
+            ) { result ->
                 onResult(result, task.value.toInt())
                 if (!DateUtils.isToday(sharedPreferences.getLong("last_task_reporting", 0))) {
                     AmplitudeManager.sendEvent(
@@ -122,15 +133,16 @@ class TasksViewModel : BaseViewModel() {
                         putLong("last_task_reporting", Date().time)
                     }
                 }
-            }.subscribe({}, RxErrorHandler.handleEmptyError())
-        )
+            }
+        }
     }
 
-    private val filterSets: HashMap<TaskType, MutableLiveData<Triple<String?, String?, List<String>>>> = hashMapOf(
-        Pair(TaskType.HABIT, MutableLiveData()),
-        Pair(TaskType.DAILY, MutableLiveData()),
-        Pair(TaskType.TODO, MutableLiveData())
-    )
+    private val filterSets: HashMap<TaskType, MutableLiveData<Triple<String?, String?, List<String>>>> =
+        hashMapOf(
+            Pair(TaskType.HABIT, MutableLiveData()),
+            Pair(TaskType.DAILY, MutableLiveData()),
+            Pair(TaskType.TODO, MutableLiveData())
+        )
 
     fun getFilterSet(type: TaskType): MutableLiveData<Triple<String?, String?, List<String>>>? {
         return filterSets[type]
@@ -276,10 +288,12 @@ class TasksViewModel : BaseViewModel() {
                     } else {
                         query.equalTo("completed", false)
                     }
-                    Task.FILTER_GRAY -> query = query.equalTo("completed", true).or().equalTo("isDue", false)
+                    Task.FILTER_GRAY -> query =
+                        query.equalTo("completed", true).or().equalTo("isDue", false)
                     Task.FILTER_WEAK -> query = query.lessThan("value", 1.0)
                     Task.FILTER_STRONG -> query = query.greaterThanOrEqualTo("value", 1.0)
-                    Task.FILTER_DATED -> query = query.isNotNull("dueDate").equalTo("completed", false).sort("dueDate")
+                    Task.FILTER_DATED -> query =
+                        query.isNotNull("dueDate").equalTo("completed", false).sort("dueDate")
                     Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
                 }
             }
@@ -289,4 +303,45 @@ class TasksViewModel : BaseViewModel() {
         }
         return query
     }
+
+    override fun canScoreTask(task: Task): Boolean {
+        if (!task.isGroupTask) {
+            return true
+        }
+        return task.isAssignedToUser(userViewModel.userID) || task.group?.assignedUsers?.isEmpty() != false
+    }
+
+    override suspend fun canEditTask(task: Task): Boolean {
+        if (!task.isGroupTask) {
+            return true
+        }
+        val groupID = task.group?.groupID ?: return true
+        val group = userRepository.getTeamPlan(groupID).firstOrNull()
+        return group?.hasTaskEditPrivileges(userViewModel.userID) ?: false
+    }
+
+    override suspend fun canAddTasks(): Boolean {
+        if (isPersonalBoard) {
+            return true
+        }
+        val groupID = ownerID.value ?: return true
+        val group = userRepository.getTeamPlan(groupID).firstOrNull()
+        return group?.hasTaskEditPrivileges(userViewModel.userID) ?: false
+    }
+
+    override fun assignedTextForTask(resources: Resources, assignedUsers: List<String>): String {
+        return if (assignedUsers.contains(userViewModel.userID)) {
+            if (assignedUsers.size == 1) {
+                resources.getString(R.string.you)
+            } else {
+                resources.getQuantityString(R.plurals.you_x_others, assignedUsers.size - 1, assignedUsers.size - 1)
+            }
+        } else {
+            if (assignedUsers.size == 1) {
+                userViewModel.currentTeamPlanMembers.value?.firstOrNull { it.id == assignedUsers.first() }?.displayName ?: ""
+            } else {
+                resources.getQuantityString(R.plurals.people, assignedUsers.size, assignedUsers.size)
+            }
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
index bece1a9a1..31133d63f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.ui.viewmodels.inventory.equipment
 
-import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
 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.helpers.launchCatching
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.ui.viewmodels.BaseViewModel
 import javax.inject.Inject
 
-class EquipmentOverviewViewModel(savedStateHandle: SavedStateHandle) : BaseViewModel() {
+class EquipmentOverviewViewModel : BaseViewModel() {
     val usesAutoEquip: Boolean
         get() = user.value?.preferences?.autoEquip == true
     val usesCostume: Boolean
@@ -22,10 +22,10 @@ class EquipmentOverviewViewModel(savedStateHandle: SavedStateHandle) : BaseViewM
     }
 
     fun getGear(key: String, onSuccess: (Equipment) -> Unit) {
-        disposable.add(
-            inventoryRepository.getEquipment(key).subscribe({
+        viewModelScope.launchCatching {
+            inventoryRepository.getEquipment(key).collect {
                 onSuccess(it)
-            }, RxErrorHandler.handleEmptyError())
-        )
+            }
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
new file mode 100644
index 000000000..b9e1b0460
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
@@ -0,0 +1,209 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.os.bundleOf
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+
+@Composable
+fun UserLevelText(user: User) {
+    val text = if (user.hasClass) {
+        stringResource(
+            id = R.string.user_level_with_class,
+            user.stats?.lvl ?: 0,
+            user.stats?.getTranslatedClassName(
+                LocalContext.current.resources
+            ) ?: ""
+        )
+    } else {
+        stringResource(id = R.string.user_level, user.stats?.lvl ?: 0)
+    }
+    Text(
+        text,
+        fontSize = 12.sp,
+        fontWeight = FontWeight.SemiBold,
+        color = colorResource(R.color.text_primary)
+    )
+}
+
+@Composable
+fun AppHeaderView(
+    viewModel: MainUserViewModel,
+) {
+    val user by viewModel.user.observeAsState(null)
+    val teamPlan by viewModel.currentTeamPlan.collectAsState(null)
+    val teamPlanMembers by viewModel.currentTeamPlanMembers.observeAsState()
+    Column {
+        Row {
+            ComposableAvatarView(
+                user,
+                Modifier
+                    .size(110.dp, 100.dp)
+                    .padding(end = 16.dp)
+            )
+            Column(modifier = Modifier.height(100.dp)) {
+                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) {
+                    Column(modifier = Modifier.weight(1f)) {
+                        LabeledBar(
+                            icon = HabiticaIconsHelper.imageOfHeartLightBg(),
+                            label = stringResource(R.string.HP_default),
+                            color = colorResource(R.color.hpColor),
+                            value = user?.stats?.hp ?: 0.0,
+                            maxValue = user?.stats?.maxHealth?.toDouble() ?: 0.0,
+                            displayCompact = teamPlan != null,
+                            modifier = Modifier.weight(1f)
+                        )
+                        LabeledBar(
+                            icon = HabiticaIconsHelper.imageOfExperience(),
+                            label = stringResource(R.string.XP_default),
+                            color = colorResource(R.color.xpColor),
+                            value = user?.stats?.exp ?: 0.0,
+                            maxValue = user?.stats?.toNextLevel?.toDouble() ?: 0.0,
+                            displayCompact = teamPlan != null,
+                            modifier = Modifier.weight(1f)
+                        )
+                        if (user?.hasClass == true) {
+                            LabeledBar(
+                                icon = HabiticaIconsHelper.imageOfMagic(),
+                                label = stringResource(R.string.MP_default),
+                                color = colorResource(R.color.mpColor),
+                                value = user?.stats?.mp ?: 0.0,
+                                maxValue = user?.stats?.maxMP?.toDouble() ?: 0.0,
+                                displayCompact = teamPlan != null,
+                                modifier = Modifier.weight(1f)
+                            )
+                        }
+                    }
+                    val animWidth = with(LocalDensity.current) { 48.dp.roundToPx() }
+                    AnimatedVisibility(
+                        visible = teamPlan != null,
+                        enter = slideInHorizontally { animWidth } + fadeIn(),
+                        exit = slideOutHorizontally { animWidth } + fadeOut()) {
+                        Row(
+                            horizontalArrangement = Arrangement.Center,
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier
+                                .padding(start = 12.dp)
+                                .width(72.dp)
+                                .height(48.dp)
+                                .clip(MaterialTheme.shapes.medium)
+                                .background(
+                                    colorResource(R.color.window_background)
+                                )
+                                .clickable {
+                                    MainNavigationController.navigate(
+                                        R.id.guildFragment,
+                                        bundleOf("groupID" to teamPlan?.id)
+                                    )
+                                }
+                        ) {
+                            Image(painterResource(R.drawable.icon_chat), null, colorFilter = ColorFilter.tint(
+                                colorResource(R.color.text_ternary)))
+                        }
+                    }
+                }
+                val animHeight = with(LocalDensity.current) { 40.dp.roundToPx() }
+                AnimatedVisibility(
+                    visible = teamPlan != null,
+                    enter = slideInVertically { animHeight } + fadeIn(),
+                    exit = slideOutVertically { animHeight } + fadeOut()) {
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(14.dp, Alignment.CenterHorizontally),
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 12.dp)
+                            .height(40.dp)
+                            .width(72.dp)
+                            .clip(MaterialTheme.shapes.medium)
+                            .background(
+                                colorResource(R.color.window_background)
+                            )
+                            .clickable {
+                                MainNavigationController.navigate(
+                                    R.id.guildFragment,
+                                    bundleOf("groupID" to teamPlan?.id)
+                                )
+                            }
+                    ) {
+                        for (member in teamPlanMembers?.filter { it.id != user?.id }?.take(6) ?: emptyList()) {
+                            Box(modifier = Modifier
+                                .clip(CircleShape)
+                                .size(26.dp)
+                                .padding(end = 6.dp, top = 4.dp)) {
+                                ComposableAvatarView(
+                                    avatar = member,
+                                    Modifier
+                                        .size(64.dp)
+                                        .requiredSize(64.dp)
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            if (user?.hasClass == true) {
+                val icon = when (user?.stats?.habitClass) {
+                    "warrior" -> HabiticaIconsHelper.imageOfWarriorLightBg().asImageBitmap()
+                    "wizard" -> HabiticaIconsHelper.imageOfMageLightBg().asImageBitmap()
+                    "healer" -> HabiticaIconsHelper.imageOfHealerLightBg().asImageBitmap()
+                    "rogue" -> HabiticaIconsHelper.imageOfRogueLightBg().asImageBitmap()
+                    else -> null
+                }
+                if (icon != null) {
+                    Image(bitmap = icon, "", modifier = Modifier.padding(end = 4.dp))
+                }
+            }
+            user?.let { UserLevelText(it) }
+            Spacer(Modifier.weight(1f))
+            user?.hourglassCount?.toDouble()
+                ?.let { CurrencyText("hourglasses", it, modifier = Modifier.padding(end = 12.dp)) }
+            CurrencyText("gold", user?.stats?.gp ?: 0.0, modifier = Modifier.padding(end = 12.dp))
+            CurrencyText("gems", user?.gemCount?.toDouble() ?: 0.0)
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AvatarCircleShape.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AvatarCircleShape.kt
new file mode 100644
index 000000000..aa2a5d975
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AvatarCircleShape.kt
@@ -0,0 +1,17 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Outline
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.LayoutDirection
+
+object AvatarCircleShape : Shape {
+    override fun createOutline(
+        size: Size,
+        layoutDirection: LayoutDirection,
+        density: Density
+    ): Outline =
+        CircleShape.createOutline(size, 20f, 20f, 20f, 20f, layoutDirection)
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BottomSheetUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BottomSheetUtils.kt
new file mode 100644
index 000000000..9d3a399e6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BottomSheetUtils.kt
@@ -0,0 +1,134 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.app.Activity
+import android.util.Log
+import android.view.ViewGroup
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.ModalBottomSheetLayout
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.unit.dp
+import androidx.fragment.app.Fragment
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
+import kotlinx.coroutines.launch
+
+// Extension for Activity
+fun Activity.showAsBottomSheet(content: @Composable (() -> Unit) -> Unit) {
+    val viewGroup = this.findViewById(android.R.id.content) as ViewGroup
+    addContentToView(viewGroup, content)
+}
+
+// Extension for Fragment
+fun Fragment.showAsBottomSheet(content: @Composable (() -> Unit) -> Unit) {
+    val viewGroup = requireActivity().findViewById(android.R.id.content) as ViewGroup
+    addContentToView(viewGroup, content)
+}
+
+// Helper method
+private fun addContentToView(
+    viewGroup: ViewGroup,
+    content: @Composable (() -> Unit) -> Unit
+) {
+    viewGroup.addView(
+        ComposeView(viewGroup.context).apply {
+            setContent {
+                HabiticaTheme {
+                    BottomSheetWrapper(viewGroup, this, content)
+                }
+            }
+        }
+    )
+}
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+private fun BottomSheetWrapper(
+    parent: ViewGroup,
+    composeView: ComposeView,
+    content: @Composable (() -> Unit) -> Unit
+) {
+    val TAG = parent::class.java.simpleName
+    val coroutineScope = rememberCoroutineScope()
+    val modalBottomSheetState = rememberModalBottomSheetState(ModalBottomSheetValue.Hidden)
+    var isSheetOpened by remember { mutableStateOf(false) }
+
+    ModalBottomSheetLayout(
+        sheetBackgroundColor = Color.Transparent,
+        sheetState = modalBottomSheetState,
+        sheetContent = {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier
+                    .border(
+                        2.dp,
+                        colorResource(R.color.window_background),
+                        RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)
+                    )
+                    .background(
+                        MaterialTheme.colors.background,
+                        RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)
+                    )
+                    .padding(vertical = 8.dp)
+            ) {
+                Box(
+                    modifier = Modifier
+                        .padding(bottom = 16.dp)
+                        .background(colorResource(R.color.content_background_offset))
+                        .size(24.dp, 3.dp)
+                )
+                content {
+                    // Action passed for clicking close button in the content
+                    coroutineScope.launch {
+                        modalBottomSheetState.hide() // will trigger the LaunchedEffect
+                    }
+                }
+            }
+        }
+    ) {}
+
+    BackHandler {
+        coroutineScope.launch {
+            modalBottomSheetState.hide() // will trigger the LaunchedEffect
+        }
+    }
+
+    // Take action based on hidden state
+    LaunchedEffect(modalBottomSheetState.currentValue) {
+        when (modalBottomSheetState.currentValue) {
+            ModalBottomSheetValue.Hidden -> {
+                when {
+                    isSheetOpened -> parent.removeView(composeView)
+                    else -> {
+                        isSheetOpened = true
+                        modalBottomSheetState.show()
+                    }
+                }
+            }
+            else -> {
+                Log.i(TAG, "Bottom sheet ${modalBottomSheetState.currentValue} state")
+            }
+        }
+    }
+}
\ No newline at end of file
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 e3ee68a1d..88c7fb4bd 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
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.graphics.drawable.ColorDrawable
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
@@ -48,14 +47,6 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
 
     var identifier: String? = null
 
-    var separatorColor: Int
-        get() {
-            return (binding.separator.background as? ColorDrawable)?.color ?: 0
-        }
-        set(value) {
-            binding.separator.setBackgroundColor(value)
-        }
-
     private fun showViews() {
         updatePreferences()
         setCaretImage()
@@ -67,7 +58,7 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
     private fun hideViews() {
         updatePreferences()
         setCaretImage()
-        (2 until childCount)
+        (0 until childCount)
             .map { getChildAt(it) }
             .filter { it != binding.sectionTitleView }
             .forEach {
@@ -87,7 +78,7 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
     }
 
     private fun setChildMargins() {
-        (2 until childCount)
+        (0 until childCount)
             .map { getChildAt(it) }
             .filter { it != binding.sectionTitleView }
             .forEach {
@@ -104,11 +95,9 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         var height = 0
-        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)
+        (1 until childCount)
             .map { getChildAt(it) }
             .forEach {
                 if (it.visibility != View.GONE) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CompletedAt.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CompletedAt.kt
new file mode 100644
index 000000000..1cd66afc9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CompletedAt.kt
@@ -0,0 +1,40 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.text.format.DateUtils
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.habitrpg.android.habitica.R
+import java.text.DateFormat
+import java.util.Date
+
+val completedTimeFormatToday: DateFormat = DateFormat.getTimeInstance(DateFormat.SHORT)
+val completedTimeFormat: DateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT)
+
+@Composable
+fun CompletedAt(
+    completedAt: Date?,
+) {
+    val completedToday = completedAt?.time?.let { DateUtils.isToday(it) } ?: false
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.padding(top = 4.dp)
+    ) {
+        Image(painterResource(R.drawable.completed), null)
+        Text(stringResource(R.string.completed_at,
+            completedAt?.let { if (completedToday) completedTimeFormatToday.format(it) else completedTimeFormat.format(it) }
+                ?: ""),
+            fontSize = 14.sp,
+            color = if (completedToday) colorResource(R.color.green_10) else colorResource(R.color.text_secondary),
+            modifier = Modifier.padding(start = 4.dp))
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ComposableAvatarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ComposableAvatarView.kt
new file mode 100644
index 000000000..8b2180169
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ComposableAvatarView.kt
@@ -0,0 +1,25 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.viewinterop.AndroidView
+import com.habitrpg.common.habitica.views.AvatarView
+import com.habitrpg.shared.habitica.models.Avatar
+
+@Composable
+fun ComposableAvatarView(
+    avatar: Avatar?,
+    modifier: Modifier = Modifier
+) {
+    AndroidView(
+        modifier = modifier, // Occupy the max size in the Compose UI tree
+        factory = { context ->
+            AvatarView(context)
+        },
+        update = { view ->
+            if (avatar != null) {
+                view.setAvatar(avatar)
+            }
+        }
+    )
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyText.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyText.kt
new file mode 100644
index 000000000..69900db83
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyText.kt
@@ -0,0 +1,46 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.habitrpg.android.habitica.R
+import com.habitrpg.common.habitica.helpers.NumberAbbreviator
+
+@Composable
+fun CurrencyText(
+    currency: String,
+    value: Double,
+    modifier: Modifier = Modifier,
+    decimals: Int = 2,
+    minForAbbrevation: Int = 0
+) {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        when (currency) {
+            "gold" -> HabiticaIconsHelper.imageOfGold()
+            "gems" -> HabiticaIconsHelper.imageOfGem()
+            "hourglasses" -> HabiticaIconsHelper.imageOfHourglass()
+            else -> null
+        }?.asImageBitmap()?.let { Image(it, null, Modifier.padding(end = 5.dp)) }
+        Text(
+            NumberAbbreviator.abbreviate(null, value, decimals, minForAbbrevation),
+            color = when (currency) {
+                "gold" -> colorResource(R.color.text_gold)
+                "gems" -> colorResource(R.color.text_green)
+                "hourglasses" -> colorResource(R.color.text_brand)
+                else -> colorResource(R.color.text_primary)
+            },
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+            modifier = modifier
+        )
+    }
+}
\ 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 d62f07d79..551af68c0 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
@@ -69,21 +69,21 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
 
     private fun configureCurrency() {
         if ("gold" == currency) {
-            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGold()
+            icon = HabiticaIconsHelper.imageOfGold()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.yellow_1))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.yellow_100))
             }
         } else if ("gems" == currency) {
-            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGem()
+            icon = HabiticaIconsHelper.imageOfGem()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.green_10))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.green_50))
             }
         } else if ("hourglasses" == currency) {
-            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfHourglass()
+            icon = HabiticaIconsHelper.imageOfHourglass()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.brand_300))
             } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentOverviewView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentOverviewView.kt
new file mode 100644
index 000000000..052718b98
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentOverviewView.kt
@@ -0,0 +1,218 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.user.Outfit
+import com.habitrpg.android.habitica.models.user.Preferences
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
+import com.habitrpg.android.habitica.ui.theme.caption2
+
+@Composable
+fun OverviewItem(
+    text: String,
+    iconName: String?,
+    modifier: Modifier = Modifier,
+    isTwoHanded: Boolean = false
+) {
+    val hasIcon = iconName?.isNotBlank() == true
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier
+            .width(70.dp)
+    ) {
+        Box(
+            Modifier
+                .size(70.dp)
+                .clip(MaterialTheme.shapes.small)
+                .background(colorResource(if (hasIcon) R.color.gray_700 else R.color.gray_10)),
+            contentAlignment = Alignment.Center
+        ) {
+            if (isTwoHanded) {
+                Image(painterResource(R.drawable.equipment_two_handed), null)
+            } else if (hasIcon) {
+                PixelArtView(
+                    imageName = iconName, Modifier
+                        .size(70.dp)
+                )
+            } else {
+                Image(painterResource(R.drawable.equipment_nothing_equipped), null)
+            }
+        }
+        Text(
+            text,
+            style = HabiticaTheme.typography.caption2,
+            color = colorResource(R.color.gray_400),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(top = 4.dp)
+        )
+    }
+}
+
+@Composable
+fun EquipmentOverviewView(
+    outfit: Outfit?,
+    onEquipmentTap: (String, String?) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(18.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .clip(MaterialTheme.shapes.medium)
+            .background(colorResource(R.color.gray_50))
+            .padding(12.dp)
+    ) {
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(stringResource(R.string.outfit_weapon), outfit?.weapon.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("weapon", null)
+            })
+            OverviewItem(stringResource(R.string.outfit_shield), outfit?.shield.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("shield", null)
+            })
+            OverviewItem(stringResource(R.string.outfit_head), outfit?.head.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("head", null)
+            })
+            OverviewItem(stringResource(R.string.outfit_armor), outfit?.armor.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("armor", null)
+            })
+        }
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(
+                stringResource(R.string.outfit_headAccessory),
+                outfit?.headAccessory.let { "shop_$it" }, Modifier.clickable {
+                    onEquipmentTap("headAccessory", null)
+                })
+            OverviewItem(stringResource(R.string.outfit_body), outfit?.body.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("body", null)
+            })
+            OverviewItem(stringResource(R.string.outfit_back), outfit?.back.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("back", null)
+            })
+            OverviewItem(
+                stringResource(R.string.outfit_eyewear),
+                outfit?.eyeWear.let { "shop_$it" }, Modifier.clickable {
+                    onEquipmentTap("eyewear", null)
+                })
+        }
+    }
+}
+
+@Composable
+fun AvatarCustomizationOverviewView(
+    preferences: Preferences?,
+    onCustomizationTap: (String, String?) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(18.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .clip(MaterialTheme.shapes.medium)
+            .background(colorResource(R.color.gray_50))
+            .padding(12.dp)
+    ) {
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(
+                stringResource(R.string.avatar_shirt),
+                preferences?.shirt.let { "${preferences?.size}_shirt$it" }, Modifier.clickable {
+                    onCustomizationTap("shirt", null)
+                })
+            OverviewItem(
+                stringResource(R.string.avatar_skin),
+                preferences?.skin.let { "skin_$it" },
+                Modifier.clickable {
+                    onCustomizationTap("skin", null)
+                })
+            OverviewItem(
+                stringResource(R.string.avatar_hair_color),
+                if (preferences?.hair?.color != null && preferences.hair?.color != "") "hair_bangs_1_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "color")
+                }
+            )
+            OverviewItem(
+                stringResource(R.string.avatar_hair_bangs),
+                if (preferences?.hair?.bangs != null && preferences.hair?.bangs != 0) "hair_bangs_" + preferences.hair?.bangs + "_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "bangs")
+                }
+            )
+        }
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(
+                stringResource(R.string.avatar_style),
+                if (preferences?.hair?.base != null && preferences.hair?.base != 0) "hair_base_" + preferences.hair?.base + "_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "base")
+                }
+            )
+            OverviewItem(
+                stringResource(R.string.avatar_mustache),
+                if (preferences?.hair?.mustache != null && preferences.hair?.mustache != 0) "hair_mustache_" + preferences.hair?.mustache + "_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "mustache")
+                }
+            )
+            OverviewItem(
+                stringResource(R.string.avatar_beard),
+                if (preferences?.hair?.beard != null && preferences.hair?.beard != 0) "hair_beard_" + preferences.hair?.beard + "_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "beard")
+                }
+            )
+            OverviewItem(
+                stringResource(R.string.avatar_flower),
+                if (preferences?.hair?.flower != null && preferences.hair?.flower != 0) "hair_flower_" + preferences.hair?.flower else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "flower")
+                }
+            )
+        }
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(
+                stringResource(R.string.avatar_wheelchair),
+                preferences?.chair?.let { if (it.startsWith("handleless")) "chair_$it" else it })
+            OverviewItem(
+                stringResource(R.string.avatar_background),
+                preferences?.background.let { "background_$it" })
+            Box(Modifier.size(70.dp))
+            Box(Modifier.size(70.dp))
+        }
+    }
+}
+
+@Preview
+@Composable
+fun EquipmentOverviewItemPreview() {
+    Column(Modifier.width(320.dp)) {
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            OverviewItem("Main-Hand", "shop_weapon_warrior_1")
+            OverviewItem("Off-Hand", null, isTwoHanded = true)
+            OverviewItem("Armor", null)
+        }
+        EquipmentOverviewView(null, { _, _ -> })
+        AvatarCustomizationOverviewView(null, { _, _ -> })
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FlowLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FlowLayout.kt
new file mode 100644
index 000000000..a83f49fc2
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FlowLayout.kt
@@ -0,0 +1,49 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.MeasurePolicy
+
+fun flowLayoutMeasurePolicy(spacing: Int = 0) = MeasurePolicy{ measurables,constraints ->
+    layout(constraints.maxWidth,constraints.maxHeight){
+        val placeables = measurables.map { measurable ->
+            measurable.measure(constraints)
+        }
+        var yPos = 0
+        var xPos = 0
+        var maxY = 0
+        placeables.forEach { placeable ->
+            if (xPos != 0) {
+                xPos += spacing
+            }
+            if (xPos + placeable.width >
+                constraints.maxWidth
+            ) {
+                xPos = 0
+                yPos += maxY + spacing
+                maxY = 0
+            }
+            placeable.placeRelative(
+                x = xPos,
+                y = yPos
+            )
+            xPos += placeable.width
+            if (maxY < placeable.height) {
+                maxY = placeable.height
+            }
+        }
+    }
+}
+
+@Composable
+fun FlowLayout(
+    modifier: Modifier = Modifier,
+    spacing: Int = 0,
+    content: @Composable () -> Unit,
+){
+    val measurePolicy = flowLayoutMeasurePolicy(spacing)
+    Layout(measurePolicy = measurePolicy,
+        content = content,
+        modifier = modifier )
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LabeledBar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LabeledBar.kt
new file mode 100644
index 000000000..7d05e9446
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LabeledBar.kt
@@ -0,0 +1,86 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.graphics.Bitmap
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.LinearProgressIndicator
+import androidx.compose.material.ProgressIndicatorDefaults
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.habitrpg.android.habitica.R
+import java.math.RoundingMode
+import java.text.NumberFormat
+
+@Composable
+fun LabeledBar(
+    icon: Bitmap,
+    label: String,
+    color: Color,
+    value: Double,
+    maxValue: Double,
+    displayCompact: Boolean,
+    modifier: Modifier = Modifier
+) {
+    val formatter = NumberFormat.getInstance()
+    formatter.maximumFractionDigits = 1
+    formatter.roundingMode = RoundingMode.UP
+    formatter.isGroupingUsed = true
+
+    val cleanedMaxVlaue = java.lang.Double.max(1.0, maxValue)
+
+    val animatedValue = animateFloatAsState(
+        targetValue = value.toFloat(),
+        animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
+    ).value
+    Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
+        AnimatedVisibility(
+            visible = !displayCompact,
+            enter = slideInHorizontally { -18 },
+            exit = slideOutHorizontally { -18 }) {
+            Image(icon.asImageBitmap(), null, modifier = Modifier.padding(end = 8.dp))
+        }
+        Column(modifier = Modifier.weight(1f)) {
+            LinearProgressIndicator(
+                progress = (animatedValue / cleanedMaxVlaue).toFloat(),
+                Modifier
+                    .fillMaxWidth()
+                    .clip(CircleShape)
+                    .height(8.dp),
+                backgroundColor = colorResource(R.color.window_background),
+                color = color
+            )
+            AnimatedVisibility(visible = !displayCompact) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.padding(top = 2.dp)
+                ) {
+                    Text(
+                        "${formatter.format(animatedValue)} / ${formatter.format(cleanedMaxVlaue)}",
+                        fontSize = 12.sp,
+                        color = colorResource(R.color.text_ternary)
+                    )
+                    Spacer(Modifier.weight(1f))
+                    Text(label, fontSize = 12.sp, color = colorResource(R.color.text_ternary))
+                }
+            }
+        }
+    }
+}
\ 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 34b7e2aaf..ce2f650c4 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
@@ -10,11 +10,10 @@ import android.widget.ImageView
 import androidx.core.graphics.drawable.toBitmap
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.NpcBannerBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import kotlin.math.roundToInt
 
 class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
@@ -50,14 +49,9 @@ class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(contex
             val width = (height * aspectRatio).roundToInt()
             val drawable = BitmapDrawable(context.resources, Bitmap.createScaledBitmap(it.toBitmap(), width, height, false))
             drawable.tileModeX = Shader.TileMode.REPEAT
-            Observable.just(drawable)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        binding.backgroundView.background = it
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            MainScope().launch {
+                binding.backgroundView.background = it
+            }
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
new file mode 100644
index 000000000..d9f95f89c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
@@ -0,0 +1,28 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.viewinterop.AndroidView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
+
+@Composable
+fun PixelArtView(
+    imageName: String?,
+    modifier: Modifier = Modifier,
+    imageFormat: String? = null
+) {
+    AndroidView(
+        modifier = modifier, // Occupy the max size in the Compose UI tree
+        factory = { context ->
+            PixelArtView(context)
+        },
+        update = { view ->
+            if (imageName != null) {
+                view.loadImage(imageName, imageFormat)
+            } else {
+                view.bitmap = null
+            }
+        }
+    )
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt
new file mode 100644
index 000000000..c13f53773
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt
@@ -0,0 +1,139 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedButton
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+
+/**
+ * items : list of items to be render
+ * defaultSelectedItemIndex : to highlight item by default (Optional)
+ * useFixedWidth : set true if you want to set fix width to item (Optional)
+ * itemWidth : Provide item width if useFixedWidth is set to true (Optional)
+ * cornerRadius : To make control as rounded (Optional)
+ * color : Set color to control (Optional)
+ * onItemSelection : Get selected item index
+ */
+@Composable
+fun SegmentedControl(
+    items: List<String>,
+    defaultSelectedItemIndex: Int = 0,
+    useFixedWidth: Boolean = false,
+    itemWidth: Dp = 120.dp,
+    cornerRadius : Int = 10,
+    onItemSelection: (selectedItemIndex: Int) -> Unit
+) {
+    val selectedIndex = remember { mutableStateOf(defaultSelectedItemIndex) }
+    val color = MaterialTheme.colors.primary
+    Row(
+        modifier = Modifier
+    ) {
+        items.forEachIndexed { index, item ->
+            OutlinedButton(
+                modifier = when (index) {
+                    0 -> {
+                        if (useFixedWidth) {
+                            Modifier
+                                .width(itemWidth)
+                                .offset(0.dp, 0.dp)
+                                .zIndex(if (selectedIndex.value == 0) 1f else 0f)
+                        } else {
+                            Modifier
+                                .wrapContentSize()
+                                .offset(0.dp, 0.dp)
+                                .zIndex(if (selectedIndex.value == 0) 1f else 0f)
+                        }
+                    } else -> {
+                        if (useFixedWidth)
+                            Modifier
+                                .width(itemWidth)
+                                .offset((-1 * index).dp, 0.dp)
+                                .zIndex(if (selectedIndex.value == index) 1f else 0f)
+                        else Modifier
+                            .wrapContentSize()
+                            .offset((-1 * index).dp, 0.dp)
+                            .zIndex(if (selectedIndex.value == index) 1f else 0f)
+                    }
+                },
+                onClick = {
+                    selectedIndex.value = index
+                    onItemSelection(selectedIndex.value)
+                },
+                shape = when (index) {
+                    /**
+                     * left outer button
+                     */
+                    0 -> RoundedCornerShape(
+                        topStartPercent = cornerRadius,
+                        topEndPercent = 0,
+                        bottomStartPercent = cornerRadius,
+                        bottomEndPercent = 0
+                    )
+                    /**
+                     * right outer button
+                     */
+                    items.size - 1 -> RoundedCornerShape(
+                        topStartPercent = 0,
+                        topEndPercent = cornerRadius,
+                        bottomStartPercent = 0,
+                        bottomEndPercent = cornerRadius
+                    )
+                    /**
+                     * middle button
+                     */
+                    else -> RoundedCornerShape(
+                        topStartPercent = 0,
+                        topEndPercent = 0,
+                        bottomStartPercent = 0,
+                        bottomEndPercent = 0
+                    )
+                },
+                border = BorderStroke(
+                    1.dp, if (selectedIndex.value == index) {
+                        color
+                    } else {
+                        color.copy(alpha = 0.75f)
+                    }
+                ),
+                colors = if (selectedIndex.value == index) {
+                    /**
+                     * selected colors
+                     */
+                    ButtonDefaults.outlinedButtonColors(
+                        backgroundColor = color
+                    )
+                } else {
+                    /**
+                     * not selected colors
+                     */
+                    ButtonDefaults.outlinedButtonColors(backgroundColor = Color.Transparent)
+                },
+            ) {
+                Text(
+                    text = item,
+                    fontWeight = FontWeight.Normal,
+                    color = if (selectedIndex.value == index) {
+                        Color.White
+                    } else {
+                        color.copy(alpha = 0.9f)
+                    },
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
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 beb762365..6d41cf526 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
@@ -8,8 +8,8 @@ import android.util.AttributeSet
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -51,8 +51,8 @@ class Typewriter : androidx.appcompat.widget.AppCompatTextView {
 
         setText(stringBuilder)
         job?.cancel()
-        job = GlobalScope.launch(Dispatchers.Main) {
-            while (index <= stringBuilder?.length ?: 0) {
+        job = MainScope().launch(Dispatchers.Main) {
+            while (index <= (stringBuilder?.length ?: 0)) {
                 stringBuilder?.setSpan(visibleSpan, 0, index++, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
                 setText(stringBuilder)
                 delay(delay)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UserRow.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UserRow.kt
new file mode 100644
index 000000000..09e293326
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UserRow.kt
@@ -0,0 +1,40 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun UserRow(
+    username: String,
+    modifier: Modifier = Modifier,
+    extraContent: @Composable (() -> Unit)? = null,
+    endContent: @Composable (() -> Unit)? = null,
+    color: Color? = null
+) {
+    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, modifier = modifier.fillMaxWidth()) {
+        Column {
+            Text(
+                "@$username",
+                fontSize = 16.sp,
+                fontWeight = FontWeight.Medium,
+                color = color ?: MaterialTheme.colors.primary,
+            )
+            if (extraContent != null) {
+                extraContent()
+            }
+        }
+        if (endContent != null) {
+            endContent()
+        }
+    }
+}
\ 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 3e3b35b4a..468bed602 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
@@ -6,12 +6,12 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogHatchPetButtonBinding
 import com.habitrpg.android.habitica.databinding.DialogPetSuggestHatchBinding
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Animal
 import com.habitrpg.android.habitica.models.inventory.Egg
@@ -21,9 +21,7 @@ import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.loadImage
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Observable
+import kotlinx.coroutines.MainScope
 import java.util.Locale
 import javax.inject.Inject
 
@@ -140,21 +138,16 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                     val activity = (getActivity() as? MainActivity) ?: return@addButton
                     val thisPotion = potion ?: return@addButton
                     val thisEgg = egg ?: return@addButton
-                    var observable: Flowable<Any> = Flowable.just("")
-                    if (!hasEgg) {
-                        observable = observable.flatMap { activity.inventoryRepository.purchaseItem("eggs", thisEgg.key, 1) }
+                    lifecycleScope.launchCatching {
+                        if (!hasEgg) {
+                            activity.inventoryRepository.purchaseItem("eggs", thisEgg.key, 1)
+                        }
+                        if (!hasPotion) {
+                            activity.inventoryRepository.purchaseItem("hatchingPotions", thisPotion.key, 1)
+                        }
+                        activity.userRepository.retrieveUser(true, forced = true)
+                        hatchPet(thisPotion, thisEgg)
                     }
-                    if (!hasPotion) {
-                        observable = observable.flatMap { activity.inventoryRepository.purchaseItem("hatchingPotions", thisPotion.key, 1) }
-                    }
-                    observable
-                        .flatMap { activity.userRepository.retrieveUser(true, forced = true) }
-                        .subscribe(
-                            {
-                                hatchPet(thisPotion, thisEgg)
-                            },
-                            RxErrorHandler.handleEmptyError()
-                        )
                 }
             }
 
@@ -167,25 +160,22 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
         DataBindingUtils.loadImage(context, imageName) {
             val resources = context.resources ?: return@loadImage
             val drawable = if (hasMount) it else BitmapDrawable(resources, it.toBitmap().extractAlpha())
-            Observable.just(drawable)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        binding.petView.bitmap = drawable.toBitmap()
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            MainScope().launchCatching {
+                binding.petView.bitmap = drawable.toBitmap()
+            }
         }
     }
 
     private fun hatchPet(potion: HatchingPotion, egg: Egg) {
         (getActivity() as? BaseActivity)?.let {
-            hatchPetUseCase.observable(
-                HatchPetUseCase.RequestValues(
-                    potion, egg,
-                    it
+            it.lifecycleScope.launchCatching {
+                hatchPetUseCase.callInteractor(
+                    HatchPetUseCase.RequestValues(
+                        potion, egg,
+                        it
+                    )
                 )
-            ).subscribeWithErrorHandler {}
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
index 26597f250..a5e94d945 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
@@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
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 e6dfa6468..03e3d67fd 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,7 +5,6 @@ import android.content.Context
 import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.view.MotionEvent
-import android.view.View
 import android.view.animation.Animation
 import android.view.animation.BounceInterpolator
 import android.view.animation.LinearInterpolator
@@ -16,9 +15,9 @@ 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.setTintWith
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 
 interface HabiticaBottomNavigationViewListener {
@@ -68,26 +67,11 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
             field = value
             val animator = ObjectAnimator.ofFloat(0f, 1.0f)
             if (field) {
-                val params = binding.cutoutFill.layoutParams
-                params.height = binding.cutoutBackground.height
-                binding.cutoutFill.layoutParams = params
-                animator.addUpdateListener {
-                    val reversed = 1.0f - it.animatedFraction
-                    binding.cutoutFill.translationY = -(reversed) * binding.cutoutBackground.height
-                }
-                binding.cutoutSpace.visibility = View.VISIBLE
                 binding.addButtonBackground.animate()
                     .translationY(0f)
                     .alpha(1f)
                     .setDuration(200)
             } else {
-                val params = binding.cutoutFill.layoutParams
-                params.height = binding.cutoutBackground.height
-                binding.cutoutFill.layoutParams = params
-                animator.addUpdateListener {
-                    binding.cutoutFill.translationY = -it.animatedFraction * (binding.cutoutBackground.height)
-                }
-                binding.cutoutSpace.visibility = View.INVISIBLE
                 binding.addButtonBackground.animate()
                     .translationY(-binding.addButtonBackground.height.toFloat() / 2)
                     .alpha(0.0f)
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 ed8d33e19..6b26229e3 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
@@ -10,6 +10,7 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.PromoMenuBinding
+import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
 class PromoMenuView @JvmOverloads constructor(
@@ -26,7 +27,7 @@ class PromoMenuView @JvmOverloads constructor(
     var binding: PromoMenuBinding = PromoMenuBinding.inflate(context.layoutInflater, this)
 
     init {
-        setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
+        setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
         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 09f1e76d5..98e147614 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
@@ -9,6 +9,7 @@ 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 com.habitrpg.common.habitica.extensions.getThemeColor
 
 class SubscriptionBuyGemsPromoView @JvmOverloads constructor(
     context: Context,
@@ -18,7 +19,7 @@ class SubscriptionBuyGemsPromoView @JvmOverloads constructor(
 
     init {
         inflate(R.layout.promo_subscription_buy_gems, true)
-        setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
+        setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
         clipToPadding = false
         clipChildren = false
         clipToOutline = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 622503bb8..aaf51f764 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
@@ -10,6 +10,7 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
@@ -20,9 +21,10 @@ import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.getShortRemainingString
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.OwnedItem
@@ -38,14 +40,11 @@ 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.rxjava3.core.Flowable
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import java.lang.Integer.max
@@ -99,11 +98,19 @@ 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({ contentView.setQuestContent(it) }, RxErrorHandler.handleEmptyError())
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        val content = inventoryRepository.getQuestContent(shopItem.key).firstOrNull()
+                        if (content != null) {
+                            contentView.setQuestContentItem(content)
+                        }
+                    }
                 }
                 shopItem.isTypeGear -> {
                     contentView = PurchaseDialogGearContent(context)
-                    inventoryRepository.getEquipment(shopItem.key).firstElement().subscribe({ contentView.setEquipment(it) }, RxErrorHandler.handleEmptyError())
+                    lifecycleScope.launchCatching {
+                        inventoryRepository.getEquipment(shopItem.key).firstOrNull()
+                            ?.let { contentView.setEquipment(it) }
+                    }
                     checkGearClass()
                 }
                 "gems" == shopItem.purchaseType -> contentView = PurchaseDialogGemsContent(context)
@@ -182,7 +189,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             limitedTextView.setBackgroundColor(ContextCompat.getColor(context, R.color.inverted_background))
         } else if (shopItem.event?.end != null) {
             limitedTextViewJob?.cancel()
-            limitedTextViewJob = GlobalScope.launch(Dispatchers.Main) {
+            limitedTextViewJob = MainScope().launch(Dispatchers.Main) {
                 limitedTextView.visibility = View.VISIBLE
                 while (shopItem.event?.end?.after(Date()) == true) {
                     limitedTextView.text = context.getString(R.string.available_for, shopItem.event?.end?.getShortRemainingString())
@@ -212,7 +219,6 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         }
     }
 
-    private val compositeSubscription: CompositeDisposable = CompositeDisposable()
     var shopIdentifier: String? = null
     private var user: User? = null
     var isPinned: Boolean = false
@@ -250,11 +256,17 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         priceLabel = buyButton.findViewById(R.id.priceLabel)
         priceLabel.animationDuration = 0L
         buyLabel = buyButton.findViewById(R.id.buy_label)
-        pinButton.setOnClickListener { inventoryRepository.togglePinnedItem(shopItem).subscribe({ isPinned = !this.isPinned }, RxErrorHandler.handleEmptyError()) }
+        pinButton.setOnClickListener {
+            lifecycleScope.launchCatching {
+                inventoryRepository.togglePinnedItem(shopItem)
+                isPinned = !isPinned
+            }
+        }
 
         shopItem = item
-
-        compositeSubscription.add(userRepository.getUserFlowable().subscribe({ this.setUser(it) }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launchCatching {
+            userRepository.getUser().filterNotNull().collect { setUser(it) }
+        }
     }
 
     private fun setUser(user: User) {
@@ -298,13 +310,9 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         userRepository.close()
         inventoryRepository.close()
         limitedTextViewJob?.cancel()
-        if (!compositeSubscription.isDisposed) {
-            compositeSubscription.dispose()
-        }
         super.dismiss()
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
     private fun onBuyButtonClicked() {
         if (shopItem.isValid && !shopItem.locked) {
             val gemsLeft = if (shopItem.limitedNumberLeft != null) shopItem.limitedNumberLeft else 0
@@ -353,30 +361,31 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         )
         HapticFeedbackManager.tap(contentView)
         val snackbarText = arrayOf("")
-        val observable: Flowable<Any>
+        val observable: (suspend () -> 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).cast(Any::class.java)
+                { inventoryRepository.purchaseMysterySet(shopItem.key) }
             } else {
-                inventoryRepository.purchaseHourglassItem(shopItem.purchaseType, shopItem.key).cast(Any::class.java)
+                { inventoryRepository.purchaseHourglassItem(shopItem.purchaseType, shopItem.key) }
             }
         } else if (shopItem.purchaseType == "fortify") {
-            observable = userRepository.reroll().cast(Any::class.java)
+            observable = { userRepository.reroll() }
         } else if (shopItem.purchaseType == "quests" && shopItem.currency == "gold") {
-            observable = inventoryRepository.purchaseQuest(shopItem.key).cast(Any::class.java)
+            observable = { inventoryRepository.purchaseQuest(shopItem.key) }
         } else if (shopItem.purchaseType == "debuffPotion") {
-            observable = userRepository.useSkill(shopItem.key, null).cast(Any::class.java)
+            observable = { userRepository.useSkill(shopItem.key, null) }
         } else if (shopItem.purchaseType == "customization" || shopItem.purchaseType == "background" || shopItem.purchaseType == "backgrounds" || shopItem.purchaseType == "customizationSet") {
-            observable = userRepository.unlockPath(item.unlockPath ?: "${item.pinType}.${item.key}" ?: "", item.value).cast(Any::class.java)
+            observable = { userRepository.unlockPath(item.unlockPath ?: "${item.pinType}.${item.key}" ?: "", item.value) }
         } else if (shopItem.purchaseType == "debuffPotion") {
-            observable = userRepository.useSkill(shopItem.key, null).cast(Any::class.java)
+            observable = { userRepository.useSkill(shopItem.key, null) }
         } else if (shopItem.purchaseType == "card") {
             purchaseCardAction?.invoke(shopItem)
             dismiss()
             return
         } else if ("gold" == shopItem.currency && "gem" != shopItem.key) {
-            observable = inventoryRepository.buyItem(user, shopItem.key, shopItem.value.toDouble(), quantity).map { buyResponse ->
-                if (shopItem.key == "armoire" && configManager.enableNewArmoire()) {
+            observable = {
+                val buyResponse = inventoryRepository.buyItem(user, shopItem.key, shopItem.value.toDouble(), quantity)
+                if (shopItem.key == "armoire" && configManager.enableNewArmoire() && buyResponse != null) {
                     MainNavigationController.navigate(
                         R.id.armoireActivity,
                         ArmoireActivityDirections.openArmoireActivity(
@@ -387,45 +396,32 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                         ).arguments
                     )
                 }
-                buyResponse
             }
         } else {
-            observable = inventoryRepository.purchaseItem(shopItem.purchaseType, shopItem.key, quantity).cast(Any::class.java)
+            observable = { inventoryRepository.purchaseItem(shopItem.purchaseType, shopItem.key, quantity) }
         }
-        val subscription = observable
-            .doOnNext {
-                val text = if (snackbarText[0].isNotEmpty()) {
-                    snackbarText[0]
-                } else {
-                    context.getString(R.string.successful_purchase, shopItem.text)
-                }
-                val rightTextColor = when (item.currency) {
-                    "gold" -> ContextCompat.getColor(context, R.color.text_yellow)
-                    "gems" -> ContextCompat.getColor(context, R.color.text_green)
-                    "hourglasses" -> ContextCompat.getColor(context, R.color.text_brand)
-                    else -> 0
-                }
-                ((application?.currentActivity?.get() ?: getActivity() ?: ownerActivity) as? SnackbarActivity)?.showSnackbar(
-                    content = text,
-                    rightIcon = priceLabel.compoundDrawables[0],
-                    rightTextColor = rightTextColor,
-                    rightText = "-" + priceLabel.text
-                )
+        lifecycleScope.launchCatching {
+            val result = observable() ?: return@launchCatching
+            val text = snackbarText[0].ifEmpty {
+                context.getString(R.string.successful_purchase, shopItem.text)
             }
-            .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
-            .flatMap { inventoryRepository.retrieveInAppRewards() }
-            .subscribe({
-                if (item.isTypeGear || item.currency == "hourglasses") {
-                    onGearPurchased?.invoke(item)
-                }
-            }) { throwable ->
-                if (throwable.javaClass.isAssignableFrom(retrofit2.HttpException::class.java)) {
-                    val error = throwable as retrofit2.HttpException
-                    if (error.code() == 401 && shopItem.currency == "gems") {
-                        MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", false)))
-                    }
-                }
+            val rightTextColor = when (item.currency) {
+                "gold" -> ContextCompat.getColor(context, R.color.text_yellow)
+                "gems" -> ContextCompat.getColor(context, R.color.text_green)
+                "hourglasses" -> ContextCompat.getColor(context, R.color.text_brand)
+                else -> 0
             }
+            ((application?.currentActivity?.get() ?: getActivity() ?: ownerActivity) as? SnackbarActivity)?.showSnackbar(
+                content = text,
+                rightIcon = priceLabel.compoundDrawables[0],
+                rightTextColor = rightTextColor,
+                rightText = "-" + priceLabel.text
+            )
+            inventoryRepository.retrieveInAppRewards()
+            if (item.isTypeGear || item.currency == "hourglasses") {
+                onGearPurchased?.invoke(item)
+            }
+        }
     }
 
     private fun displayPurchaseConfirmationDialog(quantity: Int) {
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 a10a867ba..7f7f9dada 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
@@ -20,13 +20,14 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIcons
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.getThemeColor
 
 class OldQuestProgressView : LinearLayout {
     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.window_background)
+    private val lightGray = context.getThemeColor(R.attr.colorWindowBackground)
     private val mediumGray = ContextCompat.getColor(context, R.color.offset_background)
     private val darkGray = ContextCompat.getColor(context, R.color.separator)
 
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 9a32b88b4..fa8e349ed 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
@@ -19,21 +19,21 @@ import androidx.core.graphics.drawable.toBitmap
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.QuestCollectBinding
 import com.habitrpg.android.habitica.databinding.QuestProgressBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 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.common.habitica.extensions.DataBindingUtils
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.helpers.setMarkdown
 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.dialogs.HabiticaAlertDialog
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import kotlinx.coroutines.MainScope
 
 class QuestProgressView : LinearLayout {
     private val binding = QuestProgressBinding.inflate(context.layoutInflater, this, true)
@@ -152,7 +152,6 @@ class QuestProgressView : LinearLayout {
         binding.questFlourishesImageView.loadImage("quest_" + quest.key + "_flourishes")
         val lightColor = quest.colors?.lightColor
         if (lightColor != null) {
-            binding.questDescriptionSection.separatorColor = lightColor
             binding.questImageSeparator.setBackgroundColor(lightColor)
 
             val gradientDrawable = GradientDrawable(
@@ -182,22 +181,17 @@ class QuestProgressView : LinearLayout {
             val iconView = ImageView(context)
             if (strike.wasHit) {
                 DataBindingUtils.loadImage(context, "rage_strike_${strike.key}") {
-                    Observable.just(it)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(
-                            { drawable ->
-                                val bitmap = drawable.toBitmap()
-                                val displayDensity = resources.displayMetrics.density
-                                val width = bitmap.width * displayDensity
-                                val height = bitmap.height * displayDensity
-                                val scaledImage = Bitmap.createScaledBitmap(bitmap, width.toInt(), height.toInt(), false)
-                                iconView.setImageBitmap(HabiticaIconsHelper.imageOfRageStrikeActive(context, scaledImage))
-                                iconView.setOnClickListener {
-                                    showActiveStrikeAlert(strike.key)
-                                }
-                            },
-                            RxErrorHandler.handleEmptyError()
-                        )
+                    MainScope().launchCatching {
+                        val bitmap = it.toBitmap()
+                        val displayDensity = resources.displayMetrics.density
+                        val width = bitmap.width * displayDensity
+                        val height = bitmap.height * displayDensity
+                        val scaledImage = Bitmap.createScaledBitmap(bitmap, width.toInt(), height.toInt(), false)
+                        iconView.setImageBitmap(HabiticaIconsHelper.imageOfRageStrikeActive(context, scaledImage))
+                        iconView.setOnClickListener {
+                            showActiveStrikeAlert(strike.key)
+                        }
+                    }
                 }
             } else {
                 iconView.setImageBitmap(HabiticaIconsHelper.imageOfRageStrikeInactive())
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 88beb2920..056e47016 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
@@ -5,14 +5,18 @@ import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 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.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import io.reactivex.rxjava3.disposables.Disposable
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : AlertDialog(context) {
@@ -20,8 +24,6 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     @Inject
     lateinit var userRepository: UserRepository
 
-    var subscription: Disposable? = null
-
     private val allocatedPoints: Int
         get() {
             var value = 0
@@ -56,35 +58,30 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
 
     private fun saveChanges() {
         getButton(BUTTON_POSITIVE).isEnabled = false
-        userRepository.bulkAllocatePoints(
-            binding.strengthSliderView.currentValue,
-            binding.intelligenceSliderView.currentValue,
-            binding.constitutionSliderView.currentValue,
-            binding.perceptionSliderView.currentValue
-        )
-            .subscribe(
-                {
-                    this.dismiss()
-                },
-                {
-                    RxErrorHandler.reportError(it)
-                    this.dismiss()
-                }
+        lifecycleScope.launchCatching {
+            userRepository.bulkAllocatePoints(
+                binding.strengthSliderView.currentValue,
+                binding.intelligenceSliderView.currentValue,
+                binding.constitutionSliderView.currentValue,
+                binding.perceptionSliderView.currentValue
             )
+            dismiss()
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        subscription = userRepository.getUserFlowable().subscribe(
-            {
-                pointsToAllocate = it.stats?.points ?: 0
-                binding.strengthSliderView.previousValue = it.stats?.strength ?: 0
-                binding.intelligenceSliderView.previousValue = it.stats?.intelligence ?: 0
-                binding.constitutionSliderView.previousValue = it.stats?.constitution ?: 0
-                binding.perceptionSliderView.previousValue = it.stats?.per ?: 0
-            },
-            RxErrorHandler.handleEmptyError()
-        )
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .filterNotNull()
+                .collect {
+                    pointsToAllocate = it.stats?.points ?: 0
+                    binding.strengthSliderView.previousValue = it.stats?.strength ?: 0
+                    binding.intelligenceSliderView.previousValue = it.stats?.intelligence ?: 0
+                    binding.constitutionSliderView.previousValue = it.stats?.constitution ?: 0
+                    binding.perceptionSliderView.previousValue = it.stats?.per ?: 0
+                }
+        }
 
         binding.strengthSliderView.allocateAction = {
             checkRedistribution(binding.strengthSliderView)
@@ -130,18 +127,13 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
         firstSlider: StatsSliderView?,
         secondSlider: StatsSliderView?
     ): StatsSliderView? {
-        return if (firstSlider?.currentValue ?: 0 > secondSlider?.currentValue ?: 0) {
+        return if ((firstSlider?.currentValue ?: 0) > (secondSlider?.currentValue ?: 0)) {
             firstSlider
         } else {
             secondSlider
         }
     }
 
-    override fun dismiss() {
-        subscription?.dispose()
-        super.dismiss()
-    }
-
     @SuppressLint("SetTextI18n")
     private fun updateTitle() {
         binding.allocatedTitle.text = "$allocatedPoints/$pointsToAllocate"
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 8a3455f0d..f1fe3e916 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
@@ -5,13 +5,128 @@ import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.StatsViewBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.extensions.layoutInflater
+
+@Composable
+fun StatsViewComposable(
+    statText: String,
+    statColor: Color,
+    levelValue: Int,
+    equipmentValue: Int,
+    buffValue: Int,
+    allocatedValue: Int,
+    canAllocate: Boolean,
+    allocateAction: () -> Unit
+) {
+    Column(
+        Modifier
+            .background(colorResource(R.color.window_background))
+            .clip(MaterialTheme.shapes.large)) {
+        Row(
+            Modifier
+                .height(43.dp)
+                .fillMaxWidth()
+                .background(statColor)
+                .padding(horizontal = 12.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically) {
+            Text(statText, color = colorResource(R.color.white))
+            Text("${levelValue + equipmentValue + buffValue + allocatedValue}", color = colorResource(R.color.white))
+        }
+        Row(Modifier.height(61.dp),
+            horizontalArrangement = Arrangement.SpaceEvenly,
+            verticalAlignment = Alignment.CenterVertically ) {
+            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+                Text(text = "$levelValue", fontSize = 20.sp)
+                Text(text = stringResource(R.string.level), color = colorResource(R.color.text_quad), fontSize = 12.sp)
+            }
+            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+                Text(text = "$equipmentValue", fontSize = 20.sp)
+                Text(text = stringResource(R.string.sidebar_equipment), color = colorResource(R.color.text_quad), fontSize = 12.sp)
+            }
+            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+                Text(text = "$buffValue", fontSize = 20.sp)
+                Text(text = stringResource(R.string.buffs), color = colorResource(R.color.text_quad), fontSize = 12.sp)
+            }
+            Column(modifier = Modifier
+                .weight(1f)
+                .fillMaxHeight()
+                .background(colorResource(if (canAllocate) R.color.offset_background_30 else R.color.window_background)), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+                Text(text = "$allocatedValue", fontSize = 20.sp, color = if (canAllocate) statColor else colorResource(R.color.text_primary))
+                Text(text = stringResource(R.string.allocated), color = if (canAllocate) statColor else colorResource(R.color.text_quad), fontSize = 12.sp)
+            }
+            AnimatedVisibility(visible = canAllocate) {
+                TextButton(onClick = allocateAction,
+                    Modifier
+                        .width(48.dp)
+                        .fillMaxHeight()
+                        .background(
+                            colorResource(id = R.color.offset_background_30)
+                        )) {
+                    Image(HabiticaIconsHelper.imageOfAttributeAllocateButton().asImageBitmap(), null)
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun StatsViewPreview() {
+    Column(Modifier.background(colorResource(id = R.color.content_background))) {
+        StatsViewComposable(
+            statText = "Strength",
+            statColor = colorResource(id = R.color.red_50),
+            levelValue = 10,
+            equipmentValue = 5,
+            buffValue = 4,
+            allocatedValue = 8,
+            canAllocate = false
+        ) {}
+        StatsViewComposable(
+            statText = "Intelligence",
+            statColor = colorResource(id = R.color.blue_50),
+            levelValue = 10,
+            equipmentValue = 5,
+            buffValue = 4,
+            allocatedValue = 8,
+            canAllocate = true
+        ) {}
+    }
+}
 
 class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
     private val binding = StatsViewBinding.inflate(context.layoutInflater, this, true)
@@ -53,8 +168,8 @@ class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context,
                 binding.allocatedValueTextView.setTextColor(statColor)
                 binding.allocatedLabelView.setTextColor(statColor)
             } else {
-                binding.allocatedWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
-                binding.allocateButton.setBackgroundColor(ContextCompat.getColor(context, R.color.window_background))
+                binding.allocatedWrapper.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
+                binding.allocateButton.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
                 binding.allocatedValueTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
                 binding.allocatedLabelView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
             }
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 4e96f6a56..eab805918 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
@@ -14,21 +14,20 @@ import androidx.appcompat.widget.AppCompatCheckBox
 import androidx.core.content.ContextCompat
 import androidx.core.widget.CompoundButtonCompat
 import androidx.core.widget.TextViewCompat
+import androidx.lifecycle.lifecycleScope
 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.DialogTaskFilterBinding
 import com.habitrpg.android.habitica.databinding.EditTagItemBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.disposables.Disposable
 import java.util.UUID
 import javax.inject.Inject
 
@@ -36,8 +35,6 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaBo
     lateinit var viewModel: TasksViewModel
     private val binding = DialogTaskFilterBinding.inflate(layoutInflater)
 
-    var tagDisposale: Disposable? = null
-
     @Inject
     lateinit var repository: TagRepository
 
@@ -99,14 +96,15 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaBo
     }
 
     override fun dismiss() {
-        tagDisposale?.dispose()
         super.dismiss()
     }
 
     override fun show() {
-        tagDisposale = viewModel.tagRepository.getTags().subscribe({
-            setTags(it)
-        }, RxErrorHandler.handleEmptyError())
+        lifecycleScope.launchCatching {
+            viewModel.tagRepository.getTags().collect {
+                setTags(it)
+            }
+        }
         super.show()
         this.window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
     }
@@ -193,9 +191,12 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaBo
         createTagViews()
         binding.tagEditButton.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({ 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())
+        lifecycleScope.launchCatching {
+
+            repository.updateTags(editedTags.values).forEach { editedTags.remove(it.id) }
+            repository.createTags(createdTags.values).forEach { tag -> createdTags.remove(tag.id) }
+            repeat(repository.deleteTags(deletedTags).size) { deletedTags.clear() }
+        }
     }
 
     private fun createTagEditViews() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
index 8f4af2bb0..4818f5060 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
@@ -13,10 +13,10 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.TaskFormChecklistItemBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 
 class ChecklistItemFormView @JvmOverloads constructor(
     context: Context,
@@ -77,7 +77,7 @@ class ChecklistItemFormView @JvmOverloads constructor(
     init {
         minimumHeight = 38.dpToPx(context)
         background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_task_form)
-        background.mutate().setTint(ContextCompat.getColor(context, R.color.taskform_gray))
+        background.mutate().setTint(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
         gravity = Gravity.CENTER_VERTICAL
 
         binding.button.setOnClickListener {
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
deleted file mode 100644
index 6b4d08728..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.habitrpg.android.habitica.ui.views.tasks.form
-
-import android.content.Context
-import android.graphics.Typeface
-import android.util.AttributeSet
-import android.view.Gravity
-import android.view.View
-import android.view.accessibility.AccessibilityEvent
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.extensions.nameRes
-import com.habitrpg.shared.habitica.models.tasks.HabitResetOption
-
-class HabitResetStreakButtons @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
-
-    var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
-
-    var selectedResetOption: HabitResetOption = HabitResetOption.DAILY
-        set(value) {
-            field = value
-            removeAllViews()
-            addAllButtons()
-            selectedButton.sendAccessibilityEvent(
-                AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION
-            )
-        }
-
-    private lateinit var selectedButton: TextView
-
-    init {
-        addAllButtons()
-    }
-
-    private fun addAllButtons() {
-        val lastResetOption = HabitResetOption.values().last()
-        val margin = 16.dpToPx(context)
-        val height = 28.dpToPx(context)
-        for (resetOption in HabitResetOption.values()) {
-            val button = createButton(resetOption)
-            val layoutParams = LayoutParams(0, height)
-            layoutParams.weight = 1f
-            if (resetOption != lastResetOption) {
-                layoutParams.marginEnd = margin
-            }
-            button.textAlignment = View.TEXT_ALIGNMENT_GRAVITY
-            button.gravity = Gravity.CENTER
-            button.layoutParams = layoutParams
-            addView(button)
-            if (resetOption == selectedResetOption) {
-                selectedButton = button
-            }
-        }
-    }
-
-    private fun createButton(resetOption: HabitResetOption): TextView {
-        val isActive = selectedResetOption == resetOption
-
-        val button = TextView(context)
-        val buttonText = context.getString(resetOption.nameRes)
-        button.text = buttonText
-        button.contentDescription = toContentDescription(buttonText, isActive)
-        button.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
-
-        if (isActive) {
-            button.background.setTint(tintColor)
-            button.setTextColor(ContextCompat.getColor(context, R.color.white))
-            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.text_secondary))
-            button.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
-        }
-        button.setOnClickListener {
-            selectedResetOption = resetOption
-        }
-        return button
-    }
-
-    private fun toContentDescription(buttonText: CharSequence, isActive: Boolean): String {
-        val statusString = if (isActive) {
-            context.getString(R.string.selected)
-        } else context.getString(R.string.not_selected)
-        return "$buttonText, $statusString"
-    }
-}
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 f5dd0af0c..1ba7edea0 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
@@ -1,81 +1,140 @@
 package com.habitrpg.android.habitica.ui.views.tasks.form
 
-import android.content.Context
-import android.graphics.Typeface
-import android.util.AttributeSet
-import android.view.Gravity
-import android.view.accessibility.AccessibilityEvent
-import android.widget.LinearLayout
-import androidx.core.content.ContextCompat
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.animateColor
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.TaskFormHabitScoringBinding
-import com.habitrpg.android.habitica.extensions.asDrawable
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.getThemeColor
 
-class HabitScoringButtonsView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
-    private val binding = TaskFormHabitScoringBinding.inflate(context.layoutInflater, this)
-
-    var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
-    var textTintColor: Int? = null
-
-    override fun setEnabled(isEnabled: Boolean) {
-        super.setEnabled(isEnabled)
-        binding.positiveView.isEnabled = isEnabled
-        binding.negativeView.isEnabled = isEnabled
-    }
-
-    var isPositive = true
-        set(value) {
-            field = value
-            binding.positiveImageView.setImageDrawable(HabiticaIconsHelper.imageOfHabitControlPlus(tintColor, value).asDrawable(resources))
-            if (value) {
-                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 {
-                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
-            binding.negativeImageView.setImageDrawable(HabiticaIconsHelper.imageOfHabitControlMinus(tintColor, value).asDrawable(resources))
-            if (value) {
-                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 {
-                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)
-            }
-        }
-
-    private fun toContentDescription(descriptionStringId: Int, statusStringId: Int): String {
-        return context.getString(descriptionStringId) + ", " + context.getString(statusStringId)
-    }
-
-    init {
-        gravity = Gravity.CENTER
-
-        binding.positiveView.setOnClickListener {
-            isPositive = !isPositive
-            sendAccessibilityEvent(AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION)
-        }
-        binding.negativeView.setOnClickListener {
-            isNegative = !isNegative
-            sendAccessibilityEvent(AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION)
-        }
-
-        isPositive = true
-        isNegative = true
+@Composable
+fun HabitScoringSelector(
+    selectedUp: Boolean,
+    selectedDown: Boolean,
+    onSelectUp: () -> Unit,
+    onSelectDown: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(30.dp, Alignment.CenterHorizontally),
+        modifier = modifier
+    ) {
+        HabitScoringSelection(
+            selected = selectedUp,
+            icon = painterResource(id = R.drawable.habit_plus),
+            text = stringResource(R.string.positive_habit_form),
+            onSelect = onSelectUp
+        )
+        HabitScoringSelection(
+            selected = selectedDown,
+            icon = painterResource(id = R.drawable.habit_minus),
+            text = stringResource(R.string.negative_habit_form),
+            onSelect = onSelectDown
+        )
     }
 }
+
+@OptIn(ExperimentalAnimationApi::class)
+@Composable
+private fun HabitScoringSelection(
+    selected: Boolean,
+    icon: Painter,
+    text: String,
+    onSelect: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val selectedState = updateTransition(selected)
+    val iconColor = selectedState.animateColor {
+        val context = LocalContext.current
+        if (it) Color(context.getThemeColor(R.attr.colorTintedBackground)) else colorResource(R.color.text_dimmed)
+    }
+    val textColor = selectedState.animateColor {
+        if (it) MaterialTheme.colors.primary else colorResource(R.color.text_secondary)
+    }
+    val borderColor = selectedState.animateColor {
+        if (it) MaterialTheme.colors.primary else colorResource(R.color.text_dimmed)
+    }
+    Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = modifier) {
+        Box(
+            contentAlignment = Alignment.Center, modifier = Modifier
+                .padding(horizontal = 12.dp)
+                .size(34.dp)
+                .border(1.dp, borderColor.value, CircleShape
+                )
+                .clip(CircleShape)
+                .clickable { onSelect() }
+        ) {
+            this@Column.AnimatedVisibility(
+                selected,
+                enter = scaleIn(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
+                exit = scaleOut(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium))
+            ) {
+                Box(
+                    Modifier
+                        .size(32.dp)
+                        .background(MaterialTheme.colors.primary, CircleShape)
+                )
+            }
+            Image(icon, null, colorFilter = ColorFilter.tint(iconColor.value))
+        }
+        Text(
+            text,
+            fontWeight = if (selected) FontWeight.Medium else FontWeight.Normal,
+            fontSize = 14.sp,
+            color = textColor.value
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    val selectedUp = remember { mutableStateOf(true) }
+    val selectedDown = remember { mutableStateOf(false) }
+    Box(
+        Modifier
+            .background(MaterialTheme.colors.background)
+            .width(300.dp)
+            .padding(8.dp)) {
+        HabitScoringSelector(
+            selectedUp.value, selectedDown.value,
+            { selectedUp.value = !selectedUp.value },
+            { selectedDown.value = !selectedDown.value }, Modifier.align(Alignment.Center)
+        )
+    }
+}
\ No newline at end of file
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 f3fc7cea6..79d4a32bb 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
@@ -91,7 +91,7 @@ class ReminderItemFormView @JvmOverloads constructor(
     init {
         minimumHeight = 38.dpToPx(context)
         background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_task_form)
-        background.mutate().setTint(ContextCompat.getColor(context, R.color.taskform_gray))
+        background.mutate().setTint(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
         gravity = Gravity.CENTER_VERTICAL
 
         binding.button.setOnClickListener {
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 128a7818a..ea38382e3 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
@@ -1,102 +1,130 @@
 package com.habitrpg.android.habitica.ui.views.tasks.form
 
-import android.content.Context
-import android.graphics.Typeface
-import android.util.AttributeSet
-import android.view.View
-import android.view.accessibility.AccessibilityEvent
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.Space
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.core.view.children
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.animateColor
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.asDrawable
-import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.nameRes
 import com.habitrpg.shared.habitica.models.tasks.TaskDifficulty
 
-class TaskDifficultyButtons @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
-
-    var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
-    var textTintColor: Int? = null
-    var selectedDifficulty: Float = 1f
-        set(value) {
-            field = value
-            removeAllViews()
-            addAllButtons()
-            selectedButton.sendAccessibilityEvent(AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION)
-        }
-    private lateinit var selectedButton: View
-
-    override fun setEnabled(isEnabled: Boolean) {
-        super.setEnabled(isEnabled)
-        for (child in this.children) {
-            child.isEnabled = isEnabled
-        }
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        removeAllViews()
-        addAllButtons()
-    }
-
-    private fun addAllButtons() {
-        val lastDifficulty = TaskDifficulty.values().last()
-        for (difficulty in TaskDifficulty.values()) {
-            val button = createButton(difficulty)
-            addView(button)
-            if (difficulty != lastDifficulty) {
-                val space = Space(context)
-                val layoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT)
-                layoutParams.weight = 1f
-                space.layoutParams = layoutParams
-                addView(space)
-            }
-            if (difficulty.value == selectedDifficulty) {
-                selectedButton = button
-            }
-        }
-    }
-
-    private fun createButton(difficulty: TaskDifficulty): View {
-        val view = inflate(R.layout.task_form_task_difficulty, false)
-        val isActive = selectedDifficulty == difficulty.value
-        var difficultyColor = ContextCompat.getColor(context, R.color.white)
-        if (isActive) {
-            view.findViewById<ImageView>(R.id.image_view).background.mutate().setTint(tintColor)
-            view.findViewById<TextView>(R.id.text_view).setTextColor(textTintColor ?: tintColor)
-            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.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)
-        view.findViewById<ImageView>(R.id.image_view).setImageDrawable(drawable)
-
-        val buttonText = context.getText(difficulty.nameRes)
-        view.findViewById<TextView>(R.id.text_view).text = buttonText
-        view.contentDescription = toContentDescription(buttonText, isActive)
-
-        view.setOnClickListener {
-            selectedDifficulty = difficulty.value
-        }
-        return view
-    }
-
-    private fun toContentDescription(buttonText: CharSequence, isActive: Boolean): String {
-        val statusString = if (isActive) {
-            context.getString(R.string.selected)
-        } else context.getString(R.string.not_selected)
-        return "$buttonText, $statusString"
+@Composable
+fun TaskDifficultySelector(
+    selected: TaskDifficulty,
+    onSelect: (TaskDifficulty) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = modifier.fillMaxWidth()) {
+        for (difficulty in TaskDifficulty.values())
+            TaskDifficultySelection(
+                value = difficulty,
+                selected = selected == difficulty,
+                icon = HabiticaIconsHelper.imageOfTaskDifficultyStars(
+                    colorResource(R.color.white).toArgb(), difficulty.value, true
+                ).asImageBitmap(),
+                text = stringResource(difficulty.nameRes),
+                onSelect = onSelect
+            )
     }
 }
+
+@OptIn(ExperimentalAnimationApi::class)
+@Composable
+private fun TaskDifficultySelection(
+    value: TaskDifficulty,
+    selected: Boolean,
+    icon: ImageBitmap,
+    text: String,
+    onSelect: (TaskDifficulty) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val selectedState = updateTransition(selected)
+    val iconColor = selectedState.animateColor {
+        val context = LocalContext.current
+        if (it) Color(context.getThemeColor(R.attr.colorTintedBackground)) else MaterialTheme.colors.primary
+    }
+    val textColor = selectedState.animateColor {
+        if (it) MaterialTheme.colors.primary else colorResource(R.color.text_secondary)
+    }
+    Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(6.dp), modifier = modifier) {
+        Box(
+            contentAlignment = Alignment.Center, modifier = Modifier
+                .size(57.dp)
+                .background(
+                    Color(
+                        LocalContext.current.getThemeColor(R.attr.colorTintedBackgroundOffset)
+                    ), MaterialTheme.shapes.medium
+                )
+                .clip(MaterialTheme.shapes.medium)
+                .clickable { onSelect(value) }
+        ) {
+            this@Column.AnimatedVisibility(
+                selected,
+                enter = scaleIn(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
+                exit = scaleOut(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium))
+            ) {
+                Box(
+                    Modifier
+                        .size(57.dp)
+                        .background(MaterialTheme.colors.primary, MaterialTheme.shapes.medium)
+                )
+            }
+            Image(icon, null, colorFilter = ColorFilter.tint(iconColor.value))
+        }
+        Text(
+            text,
+            fontWeight = if (selected) FontWeight.Medium else FontWeight.Normal,
+            fontSize = 14.sp,
+            color = textColor.value
+        )
+    }
+}
+
+private class DifficultyProvider : PreviewParameterProvider<TaskDifficulty> {
+    override val values = TaskDifficulty.values().asSequence()
+}
+
+@Preview
+@Composable
+private fun TaskDifficultySelectorPreview(@PreviewParameter(DifficultyProvider::class) difficulty: TaskDifficulty) {
+    val selected = remember { mutableStateOf(difficulty) }
+    TaskDifficultySelector(selected.value, { selected.value = it }, Modifier.width(300.dp))
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskFormSelector.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskFormSelector.kt
new file mode 100644
index 000000000..997c52eed
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskFormSelector.kt
@@ -0,0 +1,131 @@
+package com.habitrpg.android.habitica.ui.views.tasks.form
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.animateColor
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.habitrpg.android.habitica.R
+import com.habitrpg.common.habitica.extensions.getThemeColor
+
+data class LabeledValue<V>(val label: String, val value: V)
+
+@Composable
+fun <V> TaskFormSelector(
+    selected: V,
+    values: List<LabeledValue<V>>,
+    onSelect: (V) -> Unit,
+    modifier: Modifier = Modifier,
+    columnSize: Int = 2,
+    spacing: Dp = 10.dp
+) {
+    Column(verticalArrangement = Arrangement.spacedBy(spacing), modifier = modifier) {
+        for (row in values.chunked(columnSize)) {
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(spacing)
+            ) {
+                for (value in row)
+                    TaskFormSelection(
+                        value = value.value,
+                        selected = selected == value.value,
+                        text = value.label,
+                        onSelect = onSelect,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1f)
+                    )
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalAnimationApi::class)
+@Composable
+private fun <V> TaskFormSelection(
+    value: V,
+    selected: Boolean,
+    text: String,
+    onSelect: (V) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val selectedState = updateTransition(selected)
+    val textColor = selectedState.animateColor {
+        if (it) Color(LocalContext.current.getThemeColor(R.attr.colorTintedBackground)) else MaterialTheme.colors.primary
+    }
+    Box(
+        contentAlignment = Alignment.Center, modifier = modifier
+            .background(
+                Color(
+                    LocalContext.current.getThemeColor(R.attr.colorTintedBackgroundOffset)
+                ), MaterialTheme.shapes.medium
+            )
+            .clip(MaterialTheme.shapes.medium)
+            .clickable { onSelect(value) }
+    ) {
+        AnimatedVisibility(
+            selected,
+            enter = scaleIn(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
+            exit = scaleOut(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
+            modifier = Modifier.matchParentSize()
+        ) {
+            Box(
+                Modifier
+                    .background(MaterialTheme.colors.primary, MaterialTheme.shapes.medium)
+                    .matchParentSize()
+            )
+        }
+        Text(
+            text,
+            fontWeight = if (selected) FontWeight.Medium else FontWeight.Normal,
+            fontSize = 16.sp,
+            color = textColor.value,
+            modifier = Modifier.padding(15.dp)
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun TaskFormSelectorPreview() {
+    val selected = remember { mutableStateOf("second") }
+    TaskFormSelector(
+        selected.value,
+        listOf(
+            LabeledValue("First", "first"),
+            LabeledValue("Second", "second"),
+            LabeledValue("Third", "third"),
+            LabeledValue("Fourth", "fourth"),
+            LabeledValue("Fifth", "Fifth"),
+            LabeledValue("Sixth", "sixth")
+        ),
+        { selected.value = it },
+        Modifier.width(300.dp)
+    )
+}
\ No newline at end of file
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 de2c71120..223804860 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
@@ -21,6 +21,7 @@ import com.habitrpg.android.habitica.databinding.TaskFormTaskSchedulingBinding
 import com.habitrpg.android.habitica.models.tasks.Days
 import com.habitrpg.android.habitica.ui.adapter.SimpleSpinnerAdapter
 import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.shared.habitica.models.tasks.Frequency
 import com.habitrpg.shared.habitica.models.tasks.TaskType
@@ -287,10 +288,10 @@ class TaskSchedulingControls @JvmOverloads constructor(
             if (isActive) {
                 button.background = ContextCompat.getDrawable(context, R.drawable.habit_scoring_circle_selected)
                 button.background.mutate().setTint(tintColor)
-                button.setTextColor(ContextCompat.getColor(context, R.color.white))
+                button.setTextColor(context.getThemeColor(R.attr.colorTintedBackground))
             } else {
                 button.background = ContextCompat.getDrawable(context, R.drawable.habit_scoring_circle)
-                button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+                button.setTextColor(context.getThemeColor(R.attr.colorPrimaryDark))
             }
             button.setOnClickListener {
                 setWeekdayActive(weekdayCode, !isActive)
@@ -320,14 +321,14 @@ class TaskSchedulingControls @JvmOverloads constructor(
     }
 
     private fun styleButtonAsActive(button: TextView) {
-        button.setTextColor(ContextCompat.getColor(context, R.color.white))
+        button.setTextColor(context.getThemeColor(R.attr.colorTintedBackground))
         button.background.mutate().setTint(tintColor)
         button.contentDescription = toContentDescription(button.text, true)
     }
 
     private fun styleButtonAsInactive(button: TextView) {
-        button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
-        button.background.mutate().setTint(ContextCompat.getColor(context, R.color.taskform_gray))
+        button.setTextColor(context.getThemeColor(R.attr.colorPrimaryDark))
+        button.background.mutate().setTint(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
         button.contentDescription = toContentDescription(button.text, false)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
index ce3059d8a..2266ddfdc 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
@@ -9,24 +9,31 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 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.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import java.lang.ref.WeakReference
 import java.util.Calendar
 import java.util.Date
-import java.util.concurrent.TimeUnit
 import kotlin.math.abs
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class YesterdailyDialog private constructor(
     context: Context,
@@ -81,7 +88,9 @@ class YesterdailyDialog private constructor(
             }
         }
         lastCronRun = Date()
-        userRepository.runCron(completedTasks)
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            userRepository.runCron(completedTasks)
+        }
         displayedDialog = null
     }
 
@@ -137,14 +146,12 @@ class YesterdailyDialog private constructor(
         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())
+            scoreChecklistItem(task, item)
             configureChecklistView(checklistView, task, item)
         }
         checklistView.setOnClickListener {
             item.completed = !item.completed
-            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+            scoreChecklistItem(task, item)
             configureChecklistView(checklistView, task, item)
         }
         checkboxHolder?.setBackgroundResource(
@@ -173,6 +180,15 @@ class YesterdailyDialog private constructor(
         )
     }
 
+    private fun scoreChecklistItem(
+        task: Task,
+        item: ChecklistItem
+    ) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
+        }
+    }
+
     private fun configureTaskView(taskView: View, task: Task) {
         val completed = !task.isDisplayedActive
         val checkmark = taskView.findViewById<ImageView>(R.id.checkmark)
@@ -181,7 +197,7 @@ class YesterdailyDialog private constructor(
         val checkboxBackground = taskView.findViewById<View>(R.id.checkbox_background)
         checkmark?.visibility = if (completed) View.VISIBLE else View.GONE
         if (completed) {
-            checkboxHolder.setBackgroundResource(R.color.window_background)
+            checkboxHolder.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
             checkboxBackground.setBackgroundResource(R.drawable.daily_checked)
         } else {
             checkboxHolder.setBackgroundResource(task.lightTaskColor)
@@ -208,75 +224,57 @@ class YesterdailyDialog private constructor(
             taskRepository: TaskRepository
         ) {
             if (userRepository != null && userId != null) {
-                Observable.just("")
-                    .delay(500, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
-                    .filter { !userRepository.isClosed }
-                    .flatMapMaybe { userRepository.getUserFlowable().firstElement() }
-                    .filter { it.needsCron }
-                    .flatMapMaybe {
-                        val cal = Calendar.getInstance()
-                        cal.add(Calendar.DATE, -1)
-                        taskRepository.retrieveDailiesFromDate(cal.time).firstElement()
+                MainScope().launchCatching {
+                    delay(500.toDuration(DurationUnit.MILLISECONDS))
+                    if (userRepository.isClosed) {
+                        return@launchCatching
                     }
-                    .map {
-                        it.tasks.values.filter { task ->
-                            return@filter task.type == TaskType.DAILY && task.isDue == true && !task.completed && task.yesterDaily
-                        }
+                    val user = userRepository.getUser().firstOrNull()
+                    if (user?.needsCron != true) {
+                        return@launchCatching
+                    }
+                    val cal = Calendar.getInstance()
+                    cal.add(Calendar.DATE, -1)
+                    val tasks = taskRepository.retrieveDailiesFromDate(cal.time)?.tasks?.values?.filter { task ->
+                        return@filter task.type == TaskType.DAILY && task.isDue == true && !task.completed && task.yesterDaily && !task.isGroupTask
+                    }
+                    if (displayedDialog?.get()?.isShowing == true) {
+                        return@launchCatching
                     }
-                    .retry(1)
-                    .throttleFirst(2, TimeUnit.SECONDS)
-                    .filter {
-                        if (displayedDialog?.get()?.isShowing == true) {
-                            return@filter false
-                        }
 
-                        if (abs((lastCronRun?.time ?: 0) - Date().time) < 60 * 60 * 1000L) {
-                            return@filter false
-                        }
-                        return@filter true
+                    if (abs((lastCronRun?.time ?: 0) - Date().time) < 60 * 60 * 1000L) {
+                        return@launchCatching
                     }
-                    .firstElement()
-                    .map {
-                        it.filter { !it.isGroupTask }
-                    }
-                    .zipWith(
-                        taskRepository.getTasksFlowable(TaskType.DAILY, null, emptyArray())
-                            .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
-                            )
+                    val dailies = taskRepository.getTasks(TaskType.DAILY, null, emptyArray()).map {
+                            val taskMap = mutableMapOf<String, Int>()
+                            it.forEachIndexed { index, task -> taskMap[task.id ?: ""] = index }
+                            taskMap
+                        }.firstOrNull()
+                    val sortedTasks = tasks?.sortedBy { dailies?.get(it.id ?: "") }
 
-                            if (tasks.isNotEmpty()) {
-                                displayedDialog = WeakReference(
-                                    showDialog(
-                                        activity,
-                                        userRepository,
-                                        taskRepository,
-                                        tasks
-                                    )
-                                )
-                            } else {
-                                lastCronRun = Date()
-                                userRepository.runCron()
-                            }
-                        },
-                        RxErrorHandler.handleEmptyError()
+                    val additionalData = HashMap<String, Any>()
+                    additionalData["task count"] = sortedTasks?.size ?: 0
+                    AmplitudeManager.sendEvent(
+                        "show cron",
+                        AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR,
+                        AmplitudeManager.EVENT_HITTYPE_EVENT,
+                        additionalData
                     )
+
+                    if (sortedTasks?.isNotEmpty() == true) {
+                        displayedDialog = WeakReference(
+                            showDialog(
+                                activity,
+                                userRepository,
+                                taskRepository,
+                                sortedTasks
+                            )
+                        )
+                    } else {
+                        lastCronRun = Date()
+                        userRepository.runCron()
+                    }
+                }
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt
new file mode 100644
index 000000000..9adef8c45
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt
@@ -0,0 +1,31 @@
+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.models.tasks.GroupAssignedDetails
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class AssignedDetailsDeserializer: JsonDeserializer<RealmList<GroupAssignedDetails?>> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): RealmList<GroupAssignedDetails?> {
+        val list = RealmList<GroupAssignedDetails?>()
+        if (json == null) {
+            return list
+        } else if (json.isJsonArray) {
+            json.asJsonArray.forEach { list.add(context?.deserialize(it, GroupAssignedDetails::class.java)) }
+        } else {
+            val jsonObject = json.asJsonObject
+            jsonObject.keySet().forEach {
+                val details= context?.deserialize<GroupAssignedDetails>(jsonObject[it], GroupAssignedDetails::class.java)
+                details?.assignedUserID = it
+                list.add(details)
+            }
+        }
+        return list
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
index ef2461ff5..3466d4ee7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
@@ -5,7 +5,7 @@ import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Customization
 import io.realm.Realm
 import io.realm.RealmList
@@ -154,7 +154,7 @@ class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
                         format.parse(setInfo.get("availableUntil").asString)
                 }
             } catch (e: Exception) {
-                RxErrorHandler.reportError(e)
+                ExceptionHandler.reportError(e)
             }
         }
 
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 db4079c98..f72d4d244 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
@@ -62,6 +62,14 @@ class GroupSerialization : JsonDeserializer<Group>, JsonSerializer<Group> {
                 }
             }
         }
+        if (obj.has("managers")) {
+            group.managers = RealmList()
+            for (manager in obj.getAsJsonObject("managers").entrySet()) {
+                if (manager.value.asBoolean) {
+                    group.managers?.add(manager.key)
+                }
+            }
+        }
         if (obj.has("quest")) {
             group.quest = context.deserialize(obj.get("quest"), object : TypeToken<Quest>() {}.type)
             group.quest?.id = group.id
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt
index 3effe6188..ce666273f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt
@@ -85,6 +85,7 @@ class TaskSerializer : JsonSerializer<Task>, JsonDeserializer<Task> {
         } catch (ignored: java.lang.UnsupportedOperationException) {}
         task.dateCreated = context.deserialize(obj.get("createdAt"), Date::class.java)
         task.dueDate = context.deserialize(obj.get("date"), Date::class.java)
+        task.updatedAt = context.deserialize(obj.get("updatedAt"), Date::class.java)
         task.startDate = context.deserialize(obj.get("startDate"), Date::class.java)
         task.isDue = obj.get("isDue")?.asBoolean
         if (obj.has("nextDue")) {
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 bbab794b2..62f511e6f 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
@@ -11,7 +11,7 @@ import android.widget.RemoteViews
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
@@ -19,6 +19,9 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.helpers.HealthFormatter
 import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 import com.habitrpg.common.habitica.views.AvatarView
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 
 class AvatarStatsWidgetProvider : BaseWidgetProvider() {
 
@@ -52,10 +55,12 @@ class AvatarStatsWidgetProvider : BaseWidgetProvider() {
         avatarView.layoutParams = layoutParams
 
         this.setUp()
-        userRepository.getUserFlowable().subscribe({
-            user = it
-            updateData()
-        }, RxErrorHandler.handleEmptyError())
+        MainScope().launchCatching {
+            userRepository.getUser().collect {
+                user = it
+                updateData()
+            }
+        }
     }
 
     override fun onUpdate(
@@ -79,10 +84,11 @@ class AvatarStatsWidgetProvider : BaseWidgetProvider() {
         this.context = context
 
         if (user == null) {
-            userRepository.getUserFlowable().firstElement().subscribe({
-                user = it
+            MainScope().launch {
+                val user = userRepository.getUser().firstOrNull() ?: return@launch
+                this@AvatarStatsWidgetProvider.user = user
                 updateData(appWidgetIds)
-            }, RxErrorHandler.handleEmptyError())
+            }
         } else {
             updateData()
         }
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 6c561c5d7..2684fd174 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
@@ -8,8 +8,11 @@ import android.widget.RemoteViews
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 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.helpers.ExceptionHandler
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class HabitButtonWidgetProvider : BaseWidgetProvider() {
@@ -72,8 +75,12 @@ class HabitButtonWidgetProvider : BaseWidgetProvider() {
             val ids = intArrayOf(appWidgetId)
 
             if (taskId != null) {
-                userRepository.getUserFlowable().firstElement().flatMap { user -> taskRepository.taskChecked(user, taskId, TaskDirection.UP.text == direction, false, null) }
-                    .subscribe({ taskDirectionData -> showToastForTaskDirection(context, taskDirectionData) }, RxErrorHandler.handleEmptyError(), { this.onUpdate(context, mgr, ids) })
+                MainScope().launch(ExceptionHandler.coroutine()) {
+                    val user = userRepository.getUser().firstOrNull()
+                    val response = taskRepository.taskChecked(user, taskId, TaskDirection.UP.text == direction, false, null)
+                    showToastForTaskDirection(context, response)
+                    this@HabitButtonWidgetProvider.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 b7fe8c728..52c469901 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
@@ -16,10 +16,13 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.common.habitica.helpers.MarkdownParser
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.min
 
@@ -42,10 +45,14 @@ class HabitButtonWidgetService : Service() {
         allWidgetIds = appWidgetManager?.getAppWidgetIds(thisWidget)
         makeTaskMapping()
 
-        for (taskid in this.taskMapping.keys) {
-            taskRepository.getUnmanagedTask(taskid).firstElement().subscribe({ this.updateData(it) }, RxErrorHandler.handleEmptyError())
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            for (taskid in taskMapping.keys) {
+                val task = taskRepository.getUnmanagedTask(taskid).firstOrNull()
+                updateData(task)
+            }
         }
 
+
         stopSelf()
 
         return START_STICKY
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 b6d7cdef5..958e92401 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
@@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 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.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.shared.habitica.models.tasks.TaskType
@@ -45,7 +46,7 @@ abstract class TaskListFactory internal constructor(
         if (!this::taskRepository.isInitialized) {
             return
         }
-        CoroutineScope(Dispatchers.Main + job).launch {
+        CoroutineScope(Dispatchers.Main + job).launch(ExceptionHandler.coroutine()) {
             val tasks = taskRepository.getTasks(taskType, null, emptyArray()).firstOrNull()?.filter { task ->
                 task.type == TaskType.TODO && !task.completed || task.isDisplayedActive
             } ?: return@launch
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 f12de930f..72bda08f9 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,8 +12,11 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
 import com.habitrpg.android.habitica.extensions.withMutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.activities.MainActivity
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 abstract class TaskListWidgetProvider : BaseWidgetProvider() {
@@ -44,14 +47,12 @@ abstract class TaskListWidgetProvider : BaseWidgetProvider() {
             val taskId = intent.getStringExtra(TASK_ID_ITEM)
 
             if (taskId != null) {
-                userRepository.getUserFlowable().firstElement().flatMap { user -> taskRepository.taskChecked(user, taskId, up = true, force = false, notifyFunc = null) }
-                    .subscribe(
-                        { taskDirectionData ->
-                            showToastForTaskDirection(context, taskDirectionData)
-                            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
+                MainScope().launch(ExceptionHandler.coroutine()) {
+                    val user = userRepository.getUser().firstOrNull()
+                    val response = taskRepository.taskChecked(user, taskId, up = true, force = false, notifyFunc = null)
+                    showToastForTaskDirection(context, response)
+                    AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
+                }
             }
         }
         super.onReceive(context, intent)
diff --git a/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt b/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt
index 666fb780d..9faf96f41 100644
--- a/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt
+++ b/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt
@@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.proxy
 
 import android.content.Context
 import android.os.Bundle
-import com.amplitude.api.Amplitude
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.habitrpg.android.habitica.helpers.AmplitudeManager
 
 class AnalyticsManagerImpl(context: Context) : AnalyticsManager {
 
@@ -16,7 +16,7 @@ class AnalyticsManagerImpl(context: Context) : AnalyticsManager {
 
     override fun setUserIdentifier(identifier: String) {
         FirebaseCrashlytics.getInstance().setUserId(identifier)
-        Amplitude.getInstance().userId = identifier
+        AmplitudeManager.amplitude.setUserId(identifier)
     }
 
     override fun setUserProperty(identifier: String, value: String) {
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
index 02905f207..bfa0ada14 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
@@ -81,10 +81,10 @@ class TaskRepositoryImplTest : WordSpec({
             every { apiClient.postTaskDirection(any(), "up") } returns Flowable.just(
                 TaskDirectionData()
             )
-            every { localRepository.getUser("") } returns Flowable.just(user)
+            every { localRepository.getUserFlowable("") } returns Flowable.just(user)
             repository.taskChecked(null, task, true, false, null)
             eventually(5000) {
-                localRepository.getUser("")
+                localRepository.getUserFlowable("")
             }
         }
         "does not update user for team tasks" {
diff --git a/build.gradle b/build.gradle
index 653c19d3f..76a6daafa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,25 +2,27 @@
 
 buildscript {
     ext {
-        target_sdk = 32
+        min_sdk = 21
+        target_sdk = 33
         app_version_name = ''
         app_version_code = 0
 
-
-        amplitude_version = '3.35.1'
-        appcompat_version = '1.5.0'
-        coil_version = '2.1.0'
-        core_ktx_version = '1.8.0'
-        coroutines_version = '1.6.2'
-        daggerhilt_version = '2.42'
+        amplitude_version = '1.5.1'
+        appcompat_version = '1.5.1'
+        coil_version = '2.2.2'
+        compose_version = '1.3.1'
+        core_ktx_version = '1.9.0'
+        coroutines_version = '1.6.4'
+        daggerhilt_version = '2.44.2'
         firebase_bom = '30.2.0'
-        kotlin_version = '1.7.10'
-        lifecycle_version = '2.5.0'
+        kotlin_version = '1.7.21'
+        lifecycle_version = '2.5.1'
         markwon_version = '4.6.2'
-        moshi_version = '1.13.0'
-        okhttp_version = '4.9.3'
-        play_wearables_version = '17.1.0'
-        play_auth_version = '20.2.0'
+        moshi_version = '1.14.0'
+        navigation_version = '2.5.3'
+        okhttp_version = '4.10.0'
+        play_wearables_version = '18.0.0'
+        play_auth_version = '20.3.0'
         preferences_version = '1.2.0'
         realm_version = '1.0.2'
         retrofit_version = '2.9.0'
@@ -33,16 +35,16 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath 'com.google.gms:google-services:4.3.13'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
+        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "io.realm:realm-gradle-plugin:10.11.0"
         classpath("io.realm.kotlin:gradle-plugin:$realm_version")
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.1"
-        classpath 'com.google.firebase:perf-plugin:1.4.1'
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
+        classpath 'com.google.firebase:perf-plugin:1.4.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$daggerhilt_version"
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
index 0a56516b6..ad3a8d9bb 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk target_sdk
 
     defaultConfig {
-        minSdk 21
-        targetSdk 32
+        minSdk min_sdk
+        targetSdkVersion target_sdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -33,6 +33,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace 'com.habitrpg.common.habitica'
 }
 
 dependencies {
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 411eba234..a5918e68a 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.habitrpg.common.habitica">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
index 7ffdc4647..11e29dfe4 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
@@ -7,7 +7,7 @@ import java.text.DecimalFormat
 
 object NumberAbbreviator {
 
-    fun abbreviate(context: Context, number: Double, numberOfDecimals: Int = 2, minForAbbrevation: Int = 0): String {
+    fun abbreviate(context: Context?, number: Double, numberOfDecimals: Int = 2, minForAbbrevation: Int = 0): String {
         var usedNumber = number
         var counter = 0
         while (usedNumber >= 1000 && number >= minForAbbrevation) {
@@ -23,11 +23,11 @@ object NumberAbbreviator {
         return formatter.format(usedNumber)
     }
 
-    private fun abbreviationForCounter(context: Context, counter: Int): String = when (counter) {
-        1 -> context.getString(R.string.thousand_abbrev)
-        2 -> context.getString(R.string.million_abbrev)
-        3 -> context.getString(R.string.billion_abbrev)
-        4 -> context.getString(R.string.trillion_abbrev)
+    private fun abbreviationForCounter(context: Context?, counter: Int): String = when (counter) {
+        1 -> context?.getString(R.string.thousand_abbrev) ?: "k"
+        2 -> context?.getString(R.string.million_abbrev) ?: "m"
+        3 -> context?.getString(R.string.billion_abbrev) ?: "b"
+        4 -> context?.getString(R.string.trillion_abbrev) ?: "t"
         else -> ""
     }
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt b/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
index 54d70ad78..2e3a4a87b 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
@@ -184,11 +184,16 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
             if (animationDuration == 0L || binding.valueTextView.text.isEmpty()) {
                 currentValue = value
             } else {
-                val animator = ValueAnimator.ofInt(currentValue.toInt(), value.toInt())
+                val animator = if (0 < value && value < 1) {
+                    // Show floating points in animation only if the value is between 0 to 1
+                    ValueAnimator.ofFloat(currentValue.toFloat(), value.toFloat())
+                } else {
+                    ValueAnimator.ofInt(currentValue.toInt(), value.toInt())
+                }
                 animator.duration = animationDuration
                 animator.startDelay = animationDelay
                 animator.addUpdateListener {
-                    currentValue = (it.animatedValue as Int).toDouble()
+                    currentValue = (it.animatedValue as? Int)?.toDouble() ?: (it.animatedValue as Float).toDouble()
                     updateBar()
                 }
                 animator.start()
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
index adef2cfa0..44ad502ef 100644
--- a/common/src/main/res/values/colors.xml
+++ b/common/src/main/res/values/colors.xml
@@ -12,10 +12,13 @@
     <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_700">#F4F0FC</color>
+    <color name="brand_800">#FAF7FF</color>
     <color name="brand">@color/brand_100</color>
 
     <!--  HabitRPG task color -->
+    <color name="maroon_700">#FFF5F5</color>
+    <color name="maroon_600">#FCEDED</color>
     <color name="maroon_500">#f19595</color>
     <color name="maroon_100">#DE3F3F</color>
     <color name="maroon_50">#C92B2B</color>
@@ -23,6 +26,8 @@
     <color name="maroon_5">#7D0C0C</color>
     <color name="maroon_1">#4C0001</color>
 
+    <color name="red_700">#FFF6F7</color>
+    <color name="red_600">#FCEEEF</color>
     <color name="red_500">#ffb6b8</color>
     <color name="red_100">#FF6165</color>
     <color name="red_50">#F74E52</color>
@@ -30,30 +35,40 @@
     <color name="red_5">#BF262B</color>
     <color name="red_1">#6c0406</color>
 
+    <color name="orange_700">#FFF9F5</color>
+    <color name="orange_600">#FCF3ED</color>
     <color name="orange_500">#ffc8a7</color>
     <color name="orange_100">#FF944C</color>
     <color name="orange_50">#FA8537</color>
     <color name="orange_10">#F47825</color>
     <color name="orange_5">#A85219</color>
 
+    <color name="yellow_700">#FFFCF6</color>
+    <color name="yellow_600">#FCF3E5</color>
     <color name="yellow_500">#fedead</color>
     <color name="yellow_100">#FFBE5D</color>
     <color name="yellow_50">#FFB445</color>
     <color name="yellow_10">#FFA624</color>
     <color name="yellow_5">#EE9109</color>
 
+    <color name="green_700">#F7FFFC</color>
+    <color name="green_600">#EDFAF6</color>
     <color name="green_500">#77f4c7</color>
     <color name="green_100">#24CC8F</color>
     <color name="green_50">#20B780</color>
     <color name="green_10">#1CA372</color>
     <color name="green_5">#168059</color>
 
+    <color name="teal_700">#F5FEFF</color>
+    <color name="teal_600">#EDFBFC</color>
     <color name="teal_500">#8eedf6</color>
     <color name="teal_100">#3BCAD7</color>
     <color name="teal_50">#34B5C1</color>
     <color name="teal_10">#26A0AB</color>
     <color name="teal_5">#1A7078</color>
 
+    <color name="blue_700">#FAFDFF</color>
+    <color name="blue_600">#EEF5F9</color>
     <color name="blue_500">#a9dcf6</color>
     <color name="blue_100">#50B5E9</color>
     <color name="blue_50">#46A7D9</color>
@@ -73,6 +88,8 @@
     <color name="gray_600">#edecee</color>
     <color name="gray_700">#f9f9f9</color>
 
+    <color name="gray_1_30">#4D1A181D</color>
+
     <color name="blue_1">#033f5e</color>
     <color name="teal_1">#005158</color>
     <color name="green_1">#005737</color>
@@ -83,7 +100,7 @@
     <color name="xpColor">@color/yellow_100</color>
     <color name="mpColor">@color/blue_100</color>
 
-    <color name="text_primary">@color/gray_10</color>
+    <color name="text_primary">@color/gray_50</color>
     <color name="text_secondary">@color/gray_100</color>
     <color name="text_ternary">@color/gray_200</color>
     <color name="text_quad">@color/gray_300</color>
diff --git a/detekt_baseline.xml b/detekt_baseline.xml
index ecff1cc8e..2c43e4deb 100644
--- a/detekt_baseline.xml
+++ b/detekt_baseline.xml
@@ -192,7 +192,7 @@
     <ID>UnusedPrivateMember:GuildFragment.kt$GuildFragment$group: Group?</ID>
     <ID>UnusedPrivateMember:LoginActivity.kt$LoginActivity$user: User</ID>
     <ID>UnusedPrivateMember:NotificationOpenHandler.kt$NotificationOpenHandler.Companion$private fun openQuestDetailSCreen()</ID>
-    <ID>UnusedPrivateMember:PurchaseDialog.kt$PurchaseDialog$val sub = maybe.flatMap { for (thisItem in it) { if (thisItem.key == item.key) { ownedCount += thisItem.numberOwned } } inventoryRepository.getOwnedMounts().firstElement() }.flatMap { for (mount in it) { if (mount.key?.contains(item.key) == true) { ownedCount += if (mount.owned) 1 else 0 } } inventoryRepository.getOwnedPets().firstElement() }.subscribe( { for (pet in it) { if (pet.key?.contains(item.key) == true) { ownedCount += if (pet.trained > 0) 1 else 0 } } if (calledResult) return@subscribe calledResult = true if (!shouldWarn) { onResult(-1) return@subscribe } val remaining = totalCount - ownedCount onResult(max(0, remaining)) }, RxErrorHandler.handleEmptyError(), { if (calledResult) return@subscribe calledResult = true if (!shouldWarn) { onResult(-1) return@subscribe } val remaining = totalCount - ownedCount onResult(max(0, remaining)) } )</ID>
+    <ID>UnusedPrivateMember:PurchaseDialog.kt$PurchaseDialog$val sub = maybe.flatMap { for (thisItem in it) { if (thisItem.key == item.key) { ownedCount += thisItem.numberOwned } } inventoryRepository.getOwnedMounts().firstElement() }.flatMap { for (mount in it) { if (mount.key?.contains(item.key) == true) { ownedCount += if (mount.owned) 1 else 0 } } inventoryRepository.getOwnedPets().firstElement() }.subscribe( { for (pet in it) { if (pet.key?.contains(item.key) == true) { ownedCount += if (pet.trained > 0) 1 else 0 } } if (calledResult) return@subscribe calledResult = true if (!shouldWarn) { onResult(-1) return@subscribe } val remaining = totalCount - ownedCount onResult(max(0, remaining)) }, ExceptionHandler.rx(), { if (calledResult) return@subscribe calledResult = true if (!shouldWarn) { onResult(-1) return@subscribe } val remaining = totalCount - ownedCount onResult(max(0, remaining)) } )</ID>
     <ID>UnusedPrivateMember:PurchaseDialog.kt$PurchaseDialog$val subscription = observable .doOnNext { val text = if (snackbarText[0].isNotEmpty()) { snackbarText[0] } else { context.getString(R.string.successful_purchase, shopItem.text) } val rightTextColor = when (item.currency) { "gold" -> ContextCompat.getColor(context, R.color.text_yellow) "gems" -> ContextCompat.getColor(context, R.color.text_green) "hourglasses" -> ContextCompat.getColor(context, R.color.text_brand) else -> 0 } ((application?.currentActivity?.get() ?: getActivity() ?: ownerActivity) as? SnackbarActivity)?.showSnackbar( content = text, rightIcon = priceLabel.compoundDrawables[0], rightTextColor = rightTextColor, rightText = "-" + priceLabel.text ) } .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) } .flatMap { inventoryRepository.retrieveInAppRewards() } .subscribe({ if (item.isTypeGear || item.currency == "hourglasses") { onGearPurchased?.invoke(item) } }) { throwable -> if (throwable.javaClass.isAssignableFrom(retrofit2.HttpException::class.java)) { val error = throwable as retrofit2.HttpException if (error.code() == 401 &amp;&amp; shopItem.currency == "gems") { MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", false))) } } }</ID>
     <ID>UnusedPrivateMember:PurchaseHandler.kt$PurchaseHandler$purchase: Purchase</ID>
     <ID>UnusedPrivateMember:ScoreTaskLocallyInteractor.kt$ScoreTaskLocallyInteractor.Companion$direction: TaskDirection</ID>
diff --git a/fastlane/README.md b/fastlane/README.md
index 9db559d7a..f57928b5d 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -23,6 +23,14 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 Runs all the tests
 
+### android staffapk
+
+```sh
+[bundle exec] fastlane android staffapk
+```
+
+Build Staff APK
+
 ### android staff
 
 ```sh
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index 3eb9c4730..45b8abcd3 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,11 +1,10 @@
-New in 4.0.2:
+New in 4.0.3:
 -Habitica has a brand new WearOS app for smart watches!
+-Reminders for tasks done the previous day will show again
 -Group Plan subscribers can switch on displaying shared tasks from Settings
--Past To Do reminders will not constantly show anymore
 -Pet category labels show again
 -Newly designed Backgrounds section
 -Ability to filter, preview, and pin Backgrounds
 -New bottom sheet designs in Items, Pets & Mounts, and Filters
 -New Day Start Adjustment interface
 -Improvements to payment and subscription handling
-
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 5eb9e78bf..5ac5eb01e 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
                 implementation("io.realm.kotlin:library-base:1.0.2")
             }
         }
@@ -54,10 +54,11 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 33
     }
+    namespace = "com.habitrpg.shared.habitica"
 }
\ No newline at end of file
diff --git a/shared/src/androidMain/AndroidManifest.xml b/shared/src/androidMain/AndroidManifest.xml
index b7e9ba4e0..568741e54 100644
--- a/shared/src/androidMain/AndroidManifest.xml
+++ b/shared/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.habitrpg.shared.habitica" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/shared/src/androidMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt b/shared/src/androidMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
index eaaa0c50a..fa2589ee1 100644
--- a/shared/src/androidMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
+++ b/shared/src/androidMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
@@ -14,6 +14,10 @@ actual class PlatformLogger actual constructor() {
         Log.i(tag, message)
     }
 
+    actual fun logWarning(tag: String, message: String) {
+        Log.w(tag, message)
+    }
+
     actual fun logError(tag: String, message: String) {
         Log.e(tag, message)
     }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt
index b79f07723..da6de266c 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt
@@ -5,12 +5,13 @@ expect class PlatformLogger() {
 
     fun logDebug(tag: String, message: String)
     fun logInfo(tag: String, message: String)
+    fun logWarning(tag: String, message: String)
     fun logError(tag: String, message: String)
     fun logError(tag: String, message: String, exception: Throwable)
 }
 
 enum class LogLevel {
-    ERROR, INFO, DEBUG
+    ERROR, INFO, WARNING, DEBUG
 }
 
 class HLogger {
@@ -26,6 +27,7 @@ class HLogger {
             when (level) {
                 LogLevel.ERROR -> platformLogger.logError(tag, message)
                 LogLevel.INFO -> platformLogger.logInfo(tag, message)
+                LogLevel.WARNING -> platformLogger.logWarning(tag, message)
                 LogLevel.DEBUG -> platformLogger.logDebug(tag, message)
             }
         }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
index ca6279bc6..7b30af6dd 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
@@ -27,11 +27,12 @@ interface Avatar {
 
     val hasClass: Boolean
         get() {
-            return preferences?.disableClasses != true && flags?.classSelected == true && stats?.habitClass?.isNotEmpty() == true
+            return preferences?.disableClasses != true && flags?.classSelected ?: true == true && stats?.habitClass?.isNotEmpty() == true
         }
 
     val currentMount: String?
         get() = items?.currentMount ?: ""
+
     val currentPet: String?
         get() = items?.currentPet ?: ""
 
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskDifficulty.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskDifficulty.kt
index fe8bf909c..5f650cafc 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskDifficulty.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskDifficulty.kt
@@ -4,5 +4,17 @@ enum class TaskDifficulty(val value: Float) {
     TRIVIAL(0.1f),
     EASY(1f),
     MEDIUM(1.5f),
-    HARD(2f)
+    HARD(2f);
+
+    companion object {
+        fun valueOf(float: Float): TaskDifficulty {
+            return when(float) {
+                0.1f -> TRIVIAL
+                1.0f -> EASY
+                1.5f -> MEDIUM
+                2f -> HARD
+                else -> MEDIUM
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/shared/src/iosMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt b/shared/src/iosMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
index 84871b48d..e30cc6c03 100644
--- a/shared/src/iosMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
+++ b/shared/src/iosMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
@@ -5,18 +5,22 @@ actual class PlatformLogger {
         get() = true
 
     actual fun logDebug(tag: String, message: String) {
-        println("[DEBUG] $tag: $message")
+        println("[🟢] $tag: $message")
     }
 
     actual fun logInfo(tag: String, message: String) {
-        println("[INFO] $tag: $message")
+        println("[🟡] $tag: $message")
+    }
+
+    actual fun logWarning(tag: String, message: String) {
+        println("[🟠] $tag: $message")
     }
 
     actual fun logError(tag: String, message: String) {
-        println("[ERROR] $tag: $message")
+        println("[🔴] $tag: $message")
     }
 
     actual fun logError(tag: String, message: String, exception: Throwable) {
-        println("[ERROR] $tag: $message\n${exception.getStackTrace().joinToString("\n")}")
+        println("[🔴] $tag: $message\n${exception.getStackTrace().joinToString("\n")}")
     }
 }
\ No newline at end of file
diff --git a/version.properties b/version.properties
index 91578a429..eca0c163d 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-NAME=4.0.2
-CODE=4510
+NAME=4.1
+CODE=4771
\ No newline at end of file
diff --git a/wearos/build.gradle b/wearos/build.gradle
index de91fee40..e3cb89504 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -88,6 +88,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'com.habitrpg.android.habitica'
 }
 
 dependencies {
diff --git a/wearos/src/main/AndroidManifest.xml b/wearos/src/main/AndroidManifest.xml
index 09f409142..69db7d18d 100644
--- a/wearos/src/main/AndroidManifest.xml
+++ b/wearos/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.habitrpg.android.habitica">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
index 6cef6d48a..1e995e122 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.widget.LinearLayout
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
+import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityRyaBinding
@@ -26,15 +27,21 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
         binding = ActivityRyaBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
 
-        viewModel.tasks.observe(this) {
-            if (!viewModel.hasTaskData) return@observe
-            if (it.isEmpty()) {
-                runCron()
-                return@observe
+        viewModel.tasks.observe(
+            this,
+            object : Observer<List<Task>> {
+                override fun onChanged(list: List<Task>) {
+                    if (list.isEmpty()) {
+                        runCron()
+                        viewModel.tasks.removeObserver(this)
+                    } else {
+                        binding.scrollView.isVisible = true
+                        createTaskListViews(list)
+                        viewModel.tasks.removeObserver(this)
+                    }
+                }
             }
-            binding.scrollView.isVisible = true
-            createTaskListViews(it)
-        }
+        )
 
         binding.ryaButton.setOnClickListener {
             binding.titleView.text = getString(R.string.check_off_yesterday)
@@ -58,9 +65,9 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
         if (!viewModel.hasRunCron) {
             startActivity(
                 Intent(this, RYAActivity::class.java)
-                .apply {
-                    addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-                })
+                    .apply {
+                        addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+                    })
         }
         super.onDestroy()
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
index 2a9e07572..6d4876865 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
@@ -26,7 +26,6 @@ class RYAViewModel @Inject constructor(
 ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     var hasRunCron: Boolean = false
     val tasks = MutableLiveData<List<Task>>()
-    var hasTaskData = false
 
     private val tasksToComplete = mutableListOf<Task>()
 
@@ -36,7 +35,6 @@ class RYAViewModel @Inject constructor(
                 .map { it.filter { task -> task.isDue == true && !task.completed } }
                 .first()
             tasks.value = taskList
-            hasTaskData = true
         }
     }