From e80389cffbb67f5be7afcd5cbc332650b709765f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 6 Oct 2020 09:29:45 +0200
Subject: [PATCH] Update dependencies

---
 Habitica/build.gradle                         | 73 +++++++---------
 Habitica/res/layout/daily_item_card.xml       | 20 ++---
 .../layout/dialog_completed_quest_content.xml |  2 +-
 Habitica/res/layout/drawer_main.xml           |  4 +-
 Habitica/res/layout/edit_tag_item.xml         |  5 +-
 Habitica/res/layout/task_main_content.xml     |  5 +-
 Habitica/res/layout/todo_item_card.xml        | 17 ++--
 .../habitica/HabiticaBaseApplication.kt       | 13 +--
 .../android/habitica/api/ApiService.kt        |  2 +-
 .../habitica/api/MaintenanceApiService.java   |  2 +-
 .../android/habitica/data/ApiClient.kt        | 22 ++---
 .../habitica/data/ChallengeRepository.kt      |  2 +-
 .../habitica/data/ContentRepository.kt        |  2 +-
 .../habitica/data/CustomizationRepository.kt  |  2 +-
 .../android/habitica/data/FAQRepository.kt    |  2 +-
 .../habitica/data/InventoryRepository.kt      | 12 +--
 .../android/habitica/data/SocialRepository.kt |  4 +-
 .../android/habitica/data/TagRepository.kt    |  4 +-
 .../android/habitica/data/TaskRepository.kt   |  6 +-
 .../habitica/data/TutorialRepository.kt       |  2 +-
 .../android/habitica/data/UserRepository.kt   | 10 +--
 .../data/implementation/ApiClientImpl.kt      | 40 ++++-----
 .../implementation/ChallengeRepositoryImpl.kt |  2 +-
 .../implementation/ContentRepositoryImpl.kt   |  2 +-
 .../CustomizationRepositoryImpl.kt            |  2 +-
 .../data/implementation/FAQRepositoryImpl.kt  |  2 +-
 .../implementation/InventoryRepositoryImpl.kt | 12 +--
 .../implementation/SocialRepositoryImpl.kt    |  4 +-
 .../data/implementation/TagRepositoryImpl.kt  |  4 +-
 .../data/implementation/TaskRepositoryImpl.kt |  6 +-
 .../implementation/TutorialRepositoryImpl.kt  |  2 +-
 .../data/implementation/UserRepositoryImpl.kt | 10 +--
 .../data/local/ChallengeLocalRepository.kt    |  2 +-
 .../local/CustomizationLocalRepository.kt     |  2 +-
 .../habitica/data/local/FAQLocalRepository.kt |  2 +-
 .../data/local/InventoryLocalRepository.kt    |  2 +-
 .../data/local/SocialLocalRepository.kt       |  2 +-
 .../habitica/data/local/TagLocalRepository.kt |  2 +-
 .../data/local/TaskLocalRepository.kt         |  4 +-
 .../data/local/TutorialLocalRepository.kt     |  2 +-
 .../data/local/UserLocalRepository.kt         |  2 +-
 .../RealmChallengeLocalRepository.kt          | 37 ++++----
 .../RealmCustomizationLocalRepository.kt      |  7 +-
 .../implementation/RealmFAQLocalRepository.kt | 11 +--
 .../RealmInventoryLocalRepository.kt          | 87 ++++++++++---------
 .../RealmSocialLocalRepository.kt             | 65 +++++++-------
 .../implementation/RealmTagLocalRepository.kt |  5 +-
 .../RealmTaskLocalRepository.kt               | 39 ++++-----
 .../RealmTutorialLocalRepository.kt           | 13 +--
 .../RealmUserLocalRepository.kt               | 42 ++++-----
 .../executors/PostExecutionThread.java        |  2 +-
 .../android/habitica/executors/UIThread.java  |  4 +-
 .../habitica/extensions/Base-Extensions.kt    |  2 +-
 .../extensions/Flowable-Extensions.kt         |  6 +-
 .../habitica/extensions/RxJava-Extensions.kt  | 12 +--
 .../habitica/helpers/NotificationsManager.kt  | 11 ++-
 .../habitica/helpers/RxErrorHandler.kt        |  2 +-
 .../habitica/helpers/SoundFileLoader.kt       | 13 +--
 .../android/habitica/helpers/SoundManager.kt  |  4 +-
 .../habitica/helpers/TaskAlarmManager.kt      |  2 +-
 .../habitica/interactors/BuyRewardUseCase.kt  |  2 +-
 .../interactors/CheckClassSelectionUseCase.kt |  2 +-
 .../interactors/DisplayItemDropUseCase.kt     |  2 +-
 .../habitica/interactors/LevelUpUseCase.kt    |  2 +-
 .../habitica/interactors/NotifyUserUseCase.kt |  2 +-
 .../android/habitica/interactors/UseCase.java |  2 +-
 .../android/habitica/models/tasks/Task.kt     | 12 +--
 .../android/habitica/modules/ApiModule.java   |  4 +-
 .../receivers/NotificationPublisher.kt        |  2 +-
 .../habitica/receivers/TaskReceiver.kt        |  2 +-
 .../android/habitica/ui/AvatarView.kt         |  2 +-
 .../habitica/ui/AvatarWithBarsViewModel.kt    |  2 +-
 .../habitica/ui/activities/BaseActivity.kt    | 13 +--
 .../ui/activities/ChallengeFormActivity.kt    |  5 +-
 .../ui/activities/ClassSelectionActivity.kt   |  2 +-
 .../ui/activities/FullProfileActivity.kt      |  4 +-
 .../ui/activities/GuidelinesActivity.kt       |  4 +-
 .../habitica/ui/activities/LoginActivity.kt   |  8 +-
 .../habitica/ui/activities/MainActivity.kt    | 12 +--
 .../ui/activities/MaintenanceActivity.kt      |  4 +-
 .../habitica/ui/activities/SetupActivity.kt   |  2 +-
 .../ui/activities/TaskFormActivity.kt         |  5 +-
 .../ui/activities/VerifyUsernameActivity.kt   |  6 +-
 ...stomizationEquipmentRecyclerViewAdapter.kt |  6 +-
 .../CustomizationRecyclerViewAdapter.kt       |  6 +-
 .../ui/adapter/NavigationDrawerAdapter.kt     |  6 +-
 .../adapter/SkillTasksRecyclerViewAdapter.kt  |  6 +-
 .../ui/adapter/SkillsRecyclerViewAdapter.kt   |  6 +-
 .../inventory/EquipmentRecyclerViewAdapter.kt |  2 +-
 .../adapter/inventory/ItemRecyclerAdapter.kt  |  6 +-
 .../inventory/MountDetailRecyclerAdapter.kt   |  6 +-
 .../inventory/PetDetailRecyclerAdapter.kt     |  6 +-
 .../inventory/StableRecyclerAdapter.kt        |  6 +-
 .../setup/CustomizationSetupAdapter.kt        |  6 +-
 .../social/ChallengesListViewAdapter.kt       |  6 +-
 .../adapter/social/ChatRecyclerViewAdapter.kt |  6 +-
 .../ui/adapter/social/InboxAdapter.kt         |  6 +-
 .../social/PartyMemberRecyclerViewAdapter.kt  |  6 +-
 .../ChallengeTasksRecyclerViewAdapter.kt      |  6 +-
 .../tasks/BaseTasksRecyclerViewAdapter.kt     |  6 +-
 .../RealmBaseTasksRecyclerViewAdapter.kt      | 12 +--
 .../tasks/RewardsRecyclerViewAdapter.kt       |  6 +-
 .../adapter/tasks/TaskRecyclerViewAdapter.kt  |  2 +-
 .../ui/fragments/AchievementsFragment.kt      |  5 +-
 .../habitica/ui/fragments/BaseFragment.kt     | 10 +--
 .../ui/fragments/NavigationDrawerFragment.kt  |  7 +-
 .../habitica/ui/fragments/StatsFragment.kt    |  2 +-
 .../AvatarCustomizationFragment.kt            |  2 +-
 .../customization/AvatarEquipmentFragment.kt  |  2 +-
 .../stable/PetDetailRecyclerFragment.kt       |  4 +-
 .../stable/StableRecyclerFragment.kt          |  2 +-
 .../preferences/BasePreferencesFragment.kt    |  2 +-
 .../preferences/ProfilePreferencesFragment.kt |  2 +-
 .../ui/fragments/setup/WelcomeFragment.kt     |  4 +-
 .../skills/SkillTasksRecyclerViewFragment.kt  |  6 +-
 .../ui/fragments/skills/SkillsFragment.kt     |  4 +-
 .../ui/fragments/social/ChatFragment.kt       |  6 +-
 .../social/InboxMessageListFragment.kt        |  6 +-
 .../social/NoPartyFragmentFragment.kt         |  4 +-
 .../challenges/ChallengeListFragment.kt       |  6 +-
 .../ui/fragments/support/BugFixFragment.kt    |  2 +-
 .../fragments/support/FAQOverviewFragment.kt  |  2 +-
 .../fragments/support/SupportMainFragment.kt  |  2 +-
 .../tasks/RewardsRecyclerviewFragment.kt      |  2 +-
 .../tasks/TaskRecyclerViewFragment.kt         |  2 +-
 .../ui/fragments/tasks/TasksFragment.kt       |  2 +-
 .../habitica/ui/helpers/DataBindingUtils.kt   |  8 +-
 .../habitica/ui/helpers/MarkdownParser.kt     |  8 +-
 .../ui/viewHolders/ChatRecyclerViewHolder.kt  |  6 +-
 .../ui/viewHolders/MountViewHolder.kt         |  6 +-
 .../habitica/ui/viewHolders/PetViewHolder.kt  |  6 +-
 .../viewHolders/tasks/BaseTaskViewHolder.kt   |  8 +-
 .../tasks/ChecklistedViewHolder.kt            | 45 ++++++----
 .../ui/viewHolders/tasks/DailyViewHolder.kt   |  4 +-
 .../ui/viewHolders/tasks/HabitViewHolder.kt   | 12 +++
 .../ui/viewHolders/tasks/RewardViewHolder.kt  |  8 +-
 .../ui/viewHolders/tasks/TodoViewHolder.kt    |  6 +-
 .../habitica/ui/viewmodels/BaseViewModel.kt   |  4 +-
 .../habitica/ui/viewmodels/GroupViewModel.kt  |  8 +-
 .../habitica/ui/viewmodels/InboxViewModel.kt  |  8 +-
 .../ui/viewmodels/NotificationsViewModel.kt   | 10 +--
 .../habitica/ui/viewmodels/PartyViewModel.kt  |  4 +-
 .../habitica/ui/views/NPCBannerView.kt        |  4 +-
 .../ui/views/dialogs/PetSuggestHatchDialog.kt |  6 +-
 .../habitica/ui/views/shops/PurchaseDialog.kt | 14 +--
 .../ui/views/social/QuestProgressView.kt      |  4 +-
 .../ui/views/stats/BulkAllocateStatsDialog.kt |  2 +-
 .../ui/views/tasks/TaskFilterDialog.kt        |  2 +-
 .../views/yesterdailies/YesterdailyDialog.kt  | 26 ++++--
 .../habitica/utils/TaskListDeserializer.kt    |  6 +-
 .../habitica/utils/WorldStateSerialization.kt | 12 +--
 .../habitica/widget/TaskListFactory.kt        |  4 +-
 Habitica/staff/release/output-metadata.json   |  4 +-
 build.gradle                                  |  8 +-
 fastlane/changelog.txt                        |  4 +-
 gradle.properties                             |  1 -
 156 files changed, 625 insertions(+), 609 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index d20bd9224..8009a2b33 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -42,20 +42,20 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //Networking
-    implementation 'com.squareup.okhttp3:okhttp:3.14.6'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.6'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
     //REST API handling
-    implementation('com.squareup.retrofit2:retrofit:2.7.1') {
+    implementation('com.squareup.retrofit2:retrofit:2.9.0') {
         exclude module: 'okhttp'
     }
-    implementation 'com.squareup.retrofit2:converter-gson:2.7.1'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.7.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
     //Crash Logging
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
 
     //Dependency Injection
-    implementation 'com.google.dagger:dagger:2.27'
-    kapt 'com.google.dagger:dagger-compiler:2.25.4'
+    implementation 'com.google.dagger:dagger:2.29.1'
+    kapt 'com.google.dagger:dagger-compiler:2.29.1'
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
     compileOnly 'com.github.pengrad:jdk9-deps:1.0'
     //App Compatibility and Material Design
@@ -64,36 +64,34 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     // Markdown
-    implementation "io.noties.markwon:core:4.2.0"
-    implementation "io.noties.markwon:ext-strikethrough:4.2.0"
-    implementation "io.noties.markwon:image:4.2.0"
-    implementation "io.noties.markwon:recycler:4.2.0"
-    implementation "io.noties.markwon:html:4.2.0"
-    // About View for all dependent Libraries, we are using
-    implementation('com.mikepenz:aboutlibraries:5.9.4@aar') {
-        transitive = true
-    }
+    implementation "io.noties.markwon:core:4.6.0"
+    implementation "io.noties.markwon:ext-strikethrough:4.6.0"
+    implementation "io.noties.markwon:image:4.6.0"
+    implementation "io.noties.markwon:recycler:4.6.0"
+    implementation "io.noties.markwon:html:4.6.0"
     //Eventbus
-    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'org.greenrobot:eventbus:3.2.0'
     // IAP Handling / Verification
-    implementation 'org.solovyev.android:checkout:1.2.1'
+    implementation 'org.solovyev.android:checkout:1.2.2'
     //Facebook
-    implementation('com.facebook.android:facebook-android-sdk:4.40.0') {
+    implementation('com.facebook.android:facebook-android-sdk:7.1.0') {
         transitive = true
     }
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
     //RxJava
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
-    implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    implementation 'io.reactivex.rxjava3:rxjava:3.0.6'
+    implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
+    implementation "com.github.akarnokd:rxjava3-bridge:3.0.0"
 
     //Analytics
-    implementation 'com.amplitude:android-sdk:2.23.2'
+    implementation 'com.amplitude:android-sdk:2.25.2'
     // Fresco Image Management Library
-    implementation('com.facebook.fresco:fresco:2.0.0') {
+    implementation('com.facebook.fresco:fresco:2.3.0') {
         exclude module: 'bolts-android'
     }
-    implementation('com.facebook.fresco:animated-gif:2.0.0') {
+    implementation('com.facebook.fresco:animated-gif:2.3.0') {
         exclude module: 'bolts-android'
     }
     //Tests
@@ -110,20 +108,18 @@ dependencies {
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.0'
     testImplementation 'org.powermock:powermock-module-junit4:1.7.0'
     //Leak Detection
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
-    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
     //Push Notifications
     implementation 'com.google.firebase:firebase-core:17.5.0'
-    implementation 'com.google.firebase:firebase-messaging:20.2.4'
+    implementation 'com.google.firebase:firebase-messaging:20.3.0'
     implementation 'com.google.firebase:firebase-config:19.2.0'
-    implementation 'com.google.firebase:firebase-perf:19.0.8'
+    implementation 'com.google.firebase:firebase-perf:19.0.9'
     implementation 'com.google.android.gms:play-services-auth:18.1.0'
-    implementation 'io.realm:android-adapters:3.1.0'
+    implementation 'io.realm:android-adapters:4.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.nex3z:flow-layout:1.2.2'
 
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
@@ -153,15 +149,14 @@ android {
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "STORE", "\"google\""
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
-        multiDexEnabled true
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2571
-        versionName "3.0.1"
+        versionCode 2587
+        versionName "3.1"
     }
 
-    viewBinding {
-        enabled = true
+    buildFeatures {
+        viewBinding true
     }
 
     lintOptions {
@@ -177,7 +172,6 @@ android {
         debug {
             applicationIdSuffix ".debug"
             debuggable true
-            multiDexEnabled true
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             // Disable fabric build ID generation for debug builds
@@ -189,7 +183,6 @@ android {
         release {
             signingConfig signingConfigs.release
             debuggable false
-            multiDexEnabled true
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 3262d8cf0..650fa0526 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/colorContentBackground"
-    android:foreground="?selectableItemBackground"
-    android:orientation="vertical">
+    android:foreground="?selectableItemBackground">
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/main_task_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -16,11 +14,8 @@
         android:layout_marginVertical="@dimen/task_spacing_vertical"
         android:background="@drawable/task_background"
         android:clipChildren="true"
-        android:minHeight="@dimen/task_min_height">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+        android:minHeight="@dimen/task_min_height"
+        android:orientation="vertical">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -73,6 +68,5 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
-        </LinearLayout>
-    </FrameLayout>
-</LinearLayout>
+    </LinearLayout>
+</FrameLayout>
diff --git a/Habitica/res/layout/dialog_completed_quest_content.xml b/Habitica/res/layout/dialog_completed_quest_content.xml
index 4ed9d410c..988277709 100644
--- a/Habitica/res/layout/dialog_completed_quest_content.xml
+++ b/Habitica/res/layout/dialog_completed_quest_content.xml
@@ -59,7 +59,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
-        android:textColor="@color/black_50_alpha"
+        android:textColor="@color/text_secondary"
         tools:text="These are the notes"
         android:gravity="center"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml
index c2c4dda27..894696a72 100644
--- a/Habitica/res/layout/drawer_main.xml
+++ b/Habitica/res/layout/drawer_main.xml
@@ -83,7 +83,7 @@
                 android:gravity="center"
                 android:minWidth="20dp"
                 android:paddingTop="0dp"
-                android:textColor="@color/text_inverted"
+                android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:text="1"
@@ -116,7 +116,7 @@
                 android:gravity="center"
                 android:minWidth="20dp"
                 android:paddingTop="0dp"
-                android:textColor="#FFF"
+                android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:text="1"
diff --git a/Habitica/res/layout/edit_tag_item.xml b/Habitica/res/layout/edit_tag_item.xml
index 0267fcd3b..b6c060b06 100644
--- a/Habitica/res/layout/edit_tag_item.xml
+++ b/Habitica/res/layout/edit_tag_item.xml
@@ -11,9 +11,8 @@
         android:layout_height="wrap_content"
         android:padding="0dp"
         android:src="@drawable/ic_close_purple_300_36dp"
-        android:tint="?colorPrimary"
-        android:tintMode="src_atop"
-        style="@style/Base.Widget.AppCompat.Button.Borderless"/>
+        android:tint="@color/color_accent"
+        android:background="@color/transparent"/>
     <EditText
         android:id="@+id/edit_text"
         android:layout_width="0dp"
diff --git a/Habitica/res/layout/task_main_content.xml b/Habitica/res/layout/task_main_content.xml
index 4adcf93d6..3b9393af1 100644
--- a/Habitica/res/layout/task_main_content.xml
+++ b/Habitica/res/layout/task_main_content.xml
@@ -9,8 +9,8 @@
     android:layout_gravity="center_vertical"
     android:paddingTop="@dimen/task_top_bottom_padding"
     android:paddingBottom="@dimen/task_top_bottom_padding"
-    android:paddingEnd="@dimen/task_text_padding"
-    android:paddingStart="@dimen/task_text_padding">
+    android:layout_marginEnd="@dimen/task_text_padding"
+    android:layout_marginStart="@dimen/task_text_padding">
         <com.habitrpg.android.habitica.ui.views.EllipsisTextView
             android:id="@+id/checkedTextView"
             style="@style/Subheader3"
@@ -32,6 +32,7 @@
             android:ellipsize="end"
             android:textSize="13sp"
             tools:text="Notes"
+            android:layout_marginTop="1dp"
             android:layout_marginBottom="7dp"/>
 
         <Button
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 023ed60ba..214872687 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,7 +7,7 @@
     android:foreground="?selectableItemBackground"
     android:orientation="vertical">
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/main_task_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -15,12 +15,8 @@
         android:layout_marginVertical="@dimen/task_spacing_vertical"
         android:background="@drawable/task_background"
         android:clipChildren="true"
-        android:minHeight="@dimen/task_min_height">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+        android:minHeight="@dimen/task_min_height"
+        android:orientation="vertical">
             <LinearLayout
                 android:id="@+id/card_view"
                 android:layout_width="match_parent"
@@ -76,6 +72,5 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
-        </LinearLayout>
-    </FrameLayout>
-</LinearLayout>
+    </LinearLayout>
+</FrameLayout>
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 5ca6d41cd..9deca9f11 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica
 
+import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -11,7 +12,6 @@ import android.database.sqlite.SQLiteDatabase
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
-import androidx.multidex.MultiDexApplication
 import androidx.preference.PreferenceManager
 import com.amplitude.api.Amplitude
 import com.amplitude.api.Identify
@@ -33,8 +33,6 @@ import com.habitrpg.android.habitica.ui.activities.IntroActivity
 import com.habitrpg.android.habitica.ui.activities.LoginActivity
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.squareup.leakcanary.LeakCanary
-import com.squareup.leakcanary.RefWatcher
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import org.solovyev.android.checkout.Billing
@@ -44,8 +42,7 @@ import org.solovyev.android.checkout.PurchaseVerifier
 import javax.inject.Inject
 
 //contains all HabiticaApplicationLogic except dagger componentInitialisation
-abstract class HabiticaBaseApplication : MultiDexApplication() {
-    var refWatcher: RefWatcher? = null
+abstract class HabiticaBaseApplication : Application() {
     @Inject
     internal lateinit var lazyApiHelper: ApiClient
     @Inject
@@ -69,16 +66,10 @@ abstract class HabiticaBaseApplication : MultiDexApplication() {
 
     override fun onCreate() {
         super.onCreate()
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return
-        }
         setupRealm()
         setupDagger()
         setupRemoteConfig()
         setupNotifications()
-        refWatcher = LeakCanary.install(this)
         createBillingAndCheckout()
         HabiticaIconsHelper.init(this)
         MarkdownParser.setup(this)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index e2c649df5..f148d779c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import retrofit2.http.*
 
 @JvmSuppressWildcards
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
index e5a1c55b4..dd330d02d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.api;
 
 import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 import retrofit2.http.GET;
 
 public interface MaintenanceApiService {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index b1b5b65f6..e91954c39 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -15,8 +15,8 @@ import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.FlowableTransformer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.FlowableTransformer
 import retrofit2.HttpException
 
 
@@ -54,17 +54,17 @@ interface ApiClient {
 
     fun buyItem(itemKey: String, purchaseQuantity: Int): Flowable<BuyResponse>
 
-    fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Any>
+    fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Void>
 
-    fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Any>
+    fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Void>
 
-    fun purchaseMysterySet(itemKey: String): Flowable<Any>
+    fun purchaseMysterySet(itemKey: String): Flowable<Void>
 
-    fun purchaseQuest(key: String): Flowable<Any>
-    fun purchaseSpecialSpell(key: String): Flowable<Any>
+    fun purchaseQuest(key: String): Flowable<Void>
+    fun purchaseSpecialSpell(key: String): Flowable<Void>
     fun validateSubscription(request: SubscriptionValidationRequest): Flowable<Any>
     fun validateNoRenewSubscription(request: PurchaseValidationRequest): Flowable<Any>
-    fun cancelSubscription(): Flowable<Any>
+    fun cancelSubscription(): Flowable<Void>
 
     fun sellItem(itemType: String, itemKey: String): Flowable<User>
 
@@ -214,9 +214,9 @@ interface ApiClient {
     fun debugAddTenGems(): Flowable<Void>
 
     // Notifications
-    fun readNotification(notificationId: String): Flowable<List<*>>
-    fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>>
-    fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>>
+    fun readNotification(notificationId: String): Flowable<List<Any>>
+    fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
+    fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
 
     fun getErrorResponse(throwable: HttpException): ErrorResponse
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
index 893c13449..1a0ad4a4f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface ChallengeRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
index 19fa5a2fc..f72a0aa83 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 interface ContentRepository {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
index 2e47c0c25..8f946aaf6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.inventory.Customization
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface CustomizationRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
index 878bdaf22..ce59effda 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.FAQArticle
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface FAQRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
index b75880b2a..d64964f95 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.models.responses.FeedResponse
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.*
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 
@@ -65,14 +65,14 @@ interface InventoryRepository : BaseRepository {
     fun retrieveShopInventory(identifier: String): Flowable<Shop>
     fun retrieveMarketGear(): Flowable<Shop>
 
-    fun purchaseMysterySet(categoryIdentifier: String): Flowable<Any>
+    fun purchaseMysterySet(categoryIdentifier: String): Flowable<Void>
 
-    fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Any>
+    fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Void>
 
-    fun purchaseQuest(key: String): Flowable<Any>
-    fun purchaseSpecialSpell(key: String): Flowable<Any>
+    fun purchaseQuest(key: String): Flowable<Void>
+    fun purchaseSpecialSpell(key: String): Flowable<Void>
 
-    fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Any>
+    fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Void>
 
     fun togglePinnedItem(item: ShopItem): Flowable<List<ShopItem>>
     fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flowable<out RealmResults<out Item>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
index 5f4d7ff9c..951ced677 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
@@ -6,8 +6,8 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
 import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 import java.util.*
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
index 519e2dba5..b93950bb8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
@@ -2,8 +2,8 @@ package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.Tag
 
-import io.reactivex.Flowable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 
 interface TagRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
index 05447f8ef..463ed091d 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
@@ -6,9 +6,9 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.Single
 import io.realm.Realm
 import io.realm.RealmResults
 import java.util.*
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
index 3bf5b3dfc..0703472e8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.data
 
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface TutorialRepository : BaseRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
index 0bf5f7339..0630fbfca 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
@@ -12,8 +12,8 @@ import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.RealmResults
 
 interface UserRepository : BaseRepository {
@@ -52,9 +52,9 @@ interface UserRepository : BaseRepository {
     fun runCron(tasks: MutableList<Task>)
     fun runCron()
 
-    fun readNotification(id: String): Flowable<List<*>>
-    fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>>
-    fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>>
+    fun readNotification(id: String): Flowable<List<Any>>
+    fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
+    fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
 
     fun changeCustomDayStart(dayStartTime: Int): Flowable<User>
 
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 df04a0c4b..4d458d503 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -32,11 +32,11 @@ import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
-import io.reactivex.Flowable
-import io.reactivex.FlowableTransformer
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.FlowableTransformer
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -44,7 +44,7 @@ import okhttp3.logging.HttpLoggingInterceptor
 import org.greenrobot.eventbus.EventBus
 import retrofit2.HttpException
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import java.io.IOException
 import java.net.SocketException
@@ -125,9 +125,9 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
                     if (BuildConfig.STAGING_KEY.isNotEmpty()) {
                         builder = builder.header("Authorization", "Basic " + BuildConfig.STAGING_KEY)
                     }
-                    val request = builder.method(original.method(), original.body())
+                    val request = builder.method(original.method, original.body)
                             .build()
-                    lastAPICallURL = original.url().toString()
+                    lastAPICallURL = original.url.toString()
                     chain.proceed(request)
                 }
                 .readTimeout(2400, TimeUnit.SECONDS)
@@ -138,7 +138,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         retrofitAdapter = Retrofit.Builder()
                 .client(client)
                 .baseUrl(server.toString())
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .addConverterFactory(gsonConverter)
                 .build()
 
@@ -193,12 +193,12 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
             this.showConnectionProblemDialog(R.string.internal_error_api)
         } else if (throwableClass == SocketTimeoutException::class.java || UnknownHostException::class.java == throwableClass) {
             this.showConnectionProblemDialog(R.string.network_error_no_network_body)
-        } else if (throwableClass == retrofit2.adapter.rxjava2.HttpException::class.java) {
+        } else if (throwableClass == retrofit2.adapter.rxjava3.HttpException::class.java) {
             val error = throwable as HttpException
             val res = getErrorResponse(error)
             val status = error.code()
 
-            if (status == 404 || error.response()?.raw()?.request()?.url()?.toString()?.endsWith("/user/push-devices") == true) {
+            if (status == 404 || error.response()?.raw()?.request?.url?.toString()?.endsWith("/user/push-devices") == true) {
                 //workaround for an error that sometimes displays that the user already has this push device
                 return
             }
@@ -337,7 +337,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.blockMember(userID).compose(configureApiCallObserver())
     }
 
-    override fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Any> {
+    override fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Void> {
         return apiService.purchaseItem(type, itemKey, mapOf(Pair("quantity", purchaseQuantity))).compose(configureApiCallObserver())
     }
 
@@ -359,23 +359,23 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         }
     }
 
-    override fun cancelSubscription(): Flowable<Any> {
+    override fun cancelSubscription(): Flowable<Void> {
         return apiService.cancelSubscription().compose(configureApiCallObserver())
     }
 
-    override fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Any> {
+    override fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Void> {
         return apiService.purchaseHourglassItem(type, itemKey).compose(configureApiCallObserver())
     }
 
-    override fun purchaseMysterySet(itemKey: String): Flowable<Any> {
+    override fun purchaseMysterySet(itemKey: String): Flowable<Void> {
         return apiService.purchaseMysterySet(itemKey).compose(configureApiCallObserver())
     }
 
-    override fun purchaseQuest(key: String): Flowable<Any> {
+    override fun purchaseQuest(key: String): Flowable<Void> {
         return apiService.purchaseQuest(key).compose(configureApiCallObserver())
     }
 
-    override fun purchaseSpecialSpell(key: String): Flowable<Any> {
+    override fun purchaseSpecialSpell(key: String): Flowable<Void> {
         return apiService.purchaseSpecialSpell(key).compose(configureApiCallObserver())
     }
 
@@ -690,15 +690,15 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.debugAddTenGems().compose(configureApiCallObserver())
     }
 
-    override fun readNotification(notificationId: String): Flowable<List<*>> {
+    override fun readNotification(notificationId: String): Flowable<List<Any>> {
         return apiService.readNotification(notificationId).compose(configureApiCallObserver())
     }
 
-    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>> {
+    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> {
         return apiService.readNotifications(notificationIds).compose(configureApiCallObserver())
     }
 
-    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>> {
+    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> {
         return apiService.seeNotifications(notificationIds).compose(configureApiCallObserver())
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
index 32db15bf1..effa4d57b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
index 23ac8c658..e2e6c0707 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,7 @@ import com.habitrpg.android.habitica.data.local.ContentLocalRepository
 import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
 import com.habitrpg.android.habitica.models.inventory.SpecialItem
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmList
 import java.util.*
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
index ecbaf8021..2b68b5a51 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.data.CustomizationRepository
 import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository
 import com.habitrpg.android.habitica.models.inventory.Customization
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 class CustomizationRepositoryImpl(localRepository: CustomizationLocalRepository, apiClient: ApiClient, userID: String) : BaseRepositoryImpl<CustomizationLocalRepository>(localRepository, apiClient, userID), CustomizationRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
index 0425a8558..8f9127a7a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.data.FAQRepository
 import com.habitrpg.android.habitica.data.local.FAQLocalRepository
 import com.habitrpg.android.habitica.models.FAQArticle
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index a43f03908..8ac058c1f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.models.responses.FeedResponse
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.*
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClient: ApiClient, userID: String, var appConfigManager: AppConfigManager) : BaseRepositoryImpl<InventoryLocalRepository>(localRepository, apiClient, userID), InventoryRepository {
@@ -276,23 +276,23 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
         return apiClient.retrieveMarketGear()
     }
 
-    override fun purchaseMysterySet(categoryIdentifier: String): Flowable<Any> {
+    override fun purchaseMysterySet(categoryIdentifier: String): Flowable<Void> {
         return apiClient.purchaseMysterySet(categoryIdentifier)
     }
 
-    override fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Any> {
+    override fun purchaseHourglassItem(purchaseType: String, key: String): Flowable<Void> {
         return apiClient.purchaseHourglassItem(purchaseType, key)
     }
 
-    override fun purchaseQuest(key: String): Flowable<Any> {
+    override fun purchaseQuest(key: String): Flowable<Void> {
         return apiClient.purchaseQuest(key)
     }
 
-    override fun purchaseSpecialSpell(key: String): Flowable<Any> {
+    override fun purchaseSpecialSpell(key: String): Flowable<Void> {
         return apiClient.purchaseSpecialSpell(key)
     }
 
-    override fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Any> {
+    override fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Void> {
         return apiClient.purchaseItem(purchaseType, key, purchaseQuantity)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index ab50c5c84..073091c35 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -11,8 +11,8 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
 import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 import java.util.*
 import kotlin.collections.HashMap
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 b2981fa00..1ec15344d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt
@@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.TagRepository
 import com.habitrpg.android.habitica.data.local.TagLocalRepository
 import com.habitrpg.android.habitica.models.Tag
-import io.reactivex.Flowable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
 import io.realm.RealmResults
 
 
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 7bc59e2ed..357151380 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
@@ -12,9 +12,9 @@ import com.habitrpg.android.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.tasks.*
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.Single
 import io.realm.Realm
 import io.realm.RealmResults
 import java.text.SimpleDateFormat
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
index 5c18f53a0..3aa383e4d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.TutorialRepository
 import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index e8abf485e..943eda265 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
@@ -18,8 +18,8 @@ import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.RealmResults
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -171,15 +171,15 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         runCron(ArrayList())
     }
 
-    override fun readNotification(id: String): Flowable<List<*>> = apiClient.readNotification(id)
+    override fun readNotification(id: String): Flowable<List<Any>> = apiClient.readNotification(id)
     override fun getUserQuestStatus(): Flowable<UserQuestStatus> {
         return localRepository.getUserQuestStatus(userID)
     }
 
-    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>> =
+    override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> =
             apiClient.readNotifications(notificationIds)
 
-    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<*>> =
+    override fun seeNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> =
             apiClient.seeNotifications(notificationIds)
 
     override fun changeCustomDayStart(dayStartTime: Int): Flowable<User> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
index 83c5b5917..167ef514f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface ChallengeLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
index f1dc16cd9..156e1358c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.inventory.Customization
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface CustomizationLocalRepository : ContentLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.kt
index d6d56dd16..07168e870 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.FAQArticle
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface FAQLocalRepository : ContentLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
index 861e20023..8cf45bd44 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface InventoryLocalRepository : ContentLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
index 7494528c6..ed1eec176 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.social.InboxConversation
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface SocialLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.kt
index a3776a719..e16c85263 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.kt
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.Tag
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface TagLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
index 02a96642c..593ec2aef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
@@ -5,8 +5,8 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.RealmResults
 
 interface TaskLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
index 15b690c02..36338a24e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.data.local
 
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 interface TutorialLocalRepository : BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
index 8193a221b..c5f0330f7 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
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.TutorialStep
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 
 enum class UserQuestStatus {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
index 42954e3d7..552d84fc8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
@@ -4,7 +4,8 @@ import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 import io.realm.Sort
@@ -12,60 +13,58 @@ import java.util.*
 
 class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), ChallengeLocalRepository {
 
-    override fun isChallengeMember(userID: String, challengeID: String): Flowable<Boolean> = realm.where(ChallengeMembership::class.java)
+    override fun isChallengeMember(userID: String, challengeID: String): Flowable<Boolean> = RxJavaBridge.toV3Flowable(realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userID)
             .equalTo("challengeID", challengeID)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
-            .map { it.count() > 0 }
+            .filter { it.isLoaded }).map { it.count() > 0 }
 
-    override fun getChallengeMembership(userId: String, id: String): Flowable<ChallengeMembership> = realm.where(ChallengeMembership::class.java)
+    override fun getChallengeMembership(userId: String, id: String): Flowable<ChallengeMembership> = RxJavaBridge.toV3Flowable(realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userId)
             .equalTo("challengeID", id)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
-            .map { it.first() }
+            .filter { it.isLoaded }).map { it.first() }
 
-    override fun getChallengeMemberships(userId: String): Flowable<RealmResults<ChallengeMembership>> = realm.where(ChallengeMembership::class.java)
+    override fun getChallengeMemberships(userId: String): Flowable<RealmResults<ChallengeMembership>> = RxJavaBridge.toV3Flowable(realm.where(ChallengeMembership::class.java)
             .equalTo("userID", userId)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
+            .filter { it.isLoaded })
 
     override fun getChallenge(id: String): Flowable<Challenge> {
-        return realm.where(Challenge::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Challenge::class.java)
                 .equalTo("id", id)
                 .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
-                .map { it.first() }
+                .map { it.first() })
     }
 
     override fun getTasks(challengeID: String): Flowable<RealmResults<Task>> {
-        return realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
                 .equalTo("userId", challengeID)
                 .findAll()
                 .asFlowable()
-                .filter { realmObject -> realmObject.isLoaded }
+                .filter { realmObject -> realmObject.isLoaded })
     }
 
     override val challenges: Flowable<RealmResults<Challenge>>
-        get() = realm.where(Challenge::class.java)
+        get() = RxJavaBridge.toV3Flowable(realm.where(Challenge::class.java)
                 .isNotNull("name")
                 .sort("official", Sort.DESCENDING, "createdAt", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
 
     override fun getUserChallenges(userId: String): Flowable<RealmResults<Challenge>> {
-        return realm.where(ChallengeMembership::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(ChallengeMembership::class.java)
                 .equalTo("userID", userId)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-                .flatMap {
+                .filter { it.isLoaded })
+.flatMap {
                     val ids = it.map {
                         return@map it.challengeID
                     }.toTypedArray()
@@ -80,7 +79,7 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
                             .findAll()
                             .asFlowable()
                             .filter { it.isLoaded }
-                }
+}
     }
 
     override fun setParticipating(userID: String, challengeID: String, isParticipating: Boolean) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
index 786ff3480..d9a21167f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
@@ -2,7 +2,8 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository
 import com.habitrpg.android.habitica.models.inventory.Customization
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 import java.util.*
@@ -29,10 +30,10 @@ class RealmCustomizationLocalRepository(realm: Realm) : RealmContentLocalReposit
                     .endGroup()
                     .endGroup()
         }
-        return query
+        return RxJavaBridge.toV3Flowable(query
                 .sort("customizationSetName")
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
index d31acc42b..fd99f0a93 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
@@ -2,23 +2,24 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.FAQLocalRepository
 import com.habitrpg.android.habitica.models.FAQArticle
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 
 class RealmFAQLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), FAQLocalRepository {
     override fun getArticle(position: Int): Flowable<FAQArticle> {
-        return realm.where(FAQArticle::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(FAQArticle::class.java)
                 .equalTo("position", position)
                 .findAll()
                 .asFlowable()
                 .filter{ it.isLoaded && it.count() > 0 }
-                .map { it.first() }
+                .map { it.first() })
     }
 
     override val articles: Flowable<RealmResults<FAQArticle>>
-        get() =  realm.where(FAQArticle::class.java)
+        get() =  RxJavaBridge.toV3Flowable(realm.where(FAQArticle::class.java)
                 .findAll()
                 .asFlowable()
-                .filter{ it.isLoaded }
+                .filter{ it.isLoaded })
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index 08f8c0ee0..4a7806ff6 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
@@ -8,7 +8,8 @@ import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.RealmResults
@@ -17,27 +18,27 @@ import io.realm.Sort
 
 class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), InventoryLocalRepository {
     override fun getQuestContent(keys: List<String>): Flowable<RealmResults<QuestContent>> {
-        return realm.where(QuestContent::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(QuestContent::class.java)
                 .`in`("key", keys.toTypedArray())
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getQuestContent(key: String): Flowable<QuestContent> {
-        return realm.where(QuestContent::class.java).equalTo("key", key)
+        return RxJavaBridge.toV3Flowable(realm.where(QuestContent::class.java).equalTo("key", key)
                 .findAll()
                 .asFlowable()
                 .filter { content -> content.isLoaded && content.isValid && !content.isEmpty() }
-                .map { content -> content.first() }
+                .map { content -> content.first() })
     }
 
     override fun getEquipment(searchedKeys: List<String>): Flowable<RealmResults<Equipment>> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .`in`("key", searchedKeys.toTypedArray())
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getArmoireRemainingCount(): Long {
@@ -52,29 +53,29 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
     }
 
     override fun getOwnedEquipment(type: String): Flowable<RealmResults<Equipment>> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .equalTo("type", type)
                 .equalTo("owned", true)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedEquipment(): Flowable<RealmResults<Equipment>> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .equalTo("owned", true)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getEquipmentType(type: String, set: String): Flowable<RealmResults<Equipment>> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .equalTo("type", type)
                 .equalTo("gearSet", set)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedItems(itemType: String, userID: String, includeZero: Boolean): Flowable<RealmResults<OwnedItem>> {
@@ -82,22 +83,22 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         if (!includeZero) {
             query = query.greaterThan("numberOwned", 0)
         }
-        return query.equalTo("itemType", itemType)
+        return RxJavaBridge.toV3Flowable(query.equalTo("itemType", itemType)
                 .equalTo("userID", userID)
                 .sort("key")
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flowable<out RealmResults<out Item>> {
-        return realm.where(itemClass).`in`("key", keys).findAll().asFlowable()
-                .filter { it.isLoaded }
+        return RxJavaBridge.toV3Flowable(realm.where(itemClass).`in`("key", keys).findAll().asFlowable()
+                .filter { it.isLoaded })
     }
 
     override fun getItems(itemClass: Class<out Item>): Flowable<out RealmResults<out Item>> {
-        return realm.where(itemClass).findAll().asFlowable()
-                .filter { it.isLoaded }
+        return RxJavaBridge.toV3Flowable(realm.where(itemClass).findAll().asFlowable()
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedItems(userID: String, includeZero: Boolean): Flowable<Map<String, OwnedItem>> {
@@ -105,7 +106,7 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         if (!includeZero) {
             query = query.greaterThan("numberOwned", 0)
         }
-        return query.equalTo("userID", userID)
+        return RxJavaBridge.toV3Flowable(query.equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
                 .map {
@@ -114,25 +115,25 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
                         items[item.key + "-" + item.itemType] = item
                     }
                     items
-                }
+                })
     }
 
     override fun getEquipment(key: String): Flowable<Equipment> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .sort("text")
                 .equalTo("key", key)
                 .findFirstAsync()
                 .asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
-                .cast(Equipment::class.java)
+                .cast(Equipment::class.java))
     }
 
     override fun getMounts(): Flowable<RealmResults<Mount>> {
-        return realm.where(Mount::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Mount::class.java)
                 .sort("type", Sort.ASCENDING, "animal", Sort.ASCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getMounts(type: String?, group: String?, color: String?): Flowable<RealmResults<Mount>> {
@@ -147,26 +148,26 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         if (color != null) {
             query = query.equalTo("color", color)
         }
-        return query.findAll()
+        return RxJavaBridge.toV3Flowable(query.findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedMounts(userID: String): Flowable<RealmResults<OwnedMount>> {
-        return realm.where(OwnedMount::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(OwnedMount::class.java)
                 .equalTo("owned", true)
                 .equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getPets(): Flowable<RealmResults<Pet>> {
-        return realm.where(Pet::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Pet::class.java)
                 .sort("type", Sort.ASCENDING, "animal", Sort.ASCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getPets(type: String?, group: String?, color: String?): Flowable<RealmResults<Pet>> {
@@ -181,18 +182,18 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         if (color != null) {
             query = query.equalTo("color", color)
         }
-        return query.findAll()
+        return RxJavaBridge.toV3Flowable(query.findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getOwnedPets(userID: String): Flowable<RealmResults<OwnedPet>> {
-        return realm.where(OwnedPet::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(OwnedPet::class.java)
                 .greaterThan("trained", 0)
                 .equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun updateOwnedEquipment(user: User) {
@@ -217,9 +218,9 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
         if (!includeZero) {
             query = query.greaterThan("numberOwned", 0)
         }
-        return query.findFirstAsync()
+        return RxJavaBridge.toV3Flowable(query.findFirstAsync()
                 .asFlowable<OwnedItem>()
-                .filter { realmObject -> realmObject.isLoaded }
+                .filter { realmObject -> realmObject.isLoaded })
     }
 
     override fun getItem(type: String, key: String): Flowable<Item> {
@@ -230,9 +231,9 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
             "quests" -> QuestContent::class.java
             else -> Egg::class.java
         }
-        return realm.where(itemClass).equalTo("key", key).findFirstAsync().asFlowable<RealmObject>()
+        return RxJavaBridge.toV3Flowable(realm.where(itemClass).equalTo("key", key).findFirstAsync().asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
-                .cast(Item::class.java)
+                .cast(Item::class.java))
     }
 
     override fun decrementMysteryItemCount(user: User?) {
@@ -251,10 +252,10 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
     }
 
     override fun getInAppRewards(): Flowable<RealmResults<ShopItem>> {
-        return realm.where(ShopItem::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(ShopItem::class.java)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun saveInAppRewards(onlineItems: List<ShopItem>) {
@@ -340,12 +341,12 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
     }
 
     override fun getLatestMysteryItem(): Flowable<Equipment> {
-        return realm.where(Equipment::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Equipment::class.java)
                 .contains("key", "mystery_2")
                 .sort("mystery", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded && it.size > 0}
-                .map { it.first() }
+                .map { it.first() })
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
index 865d001d0..2c255e75c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
@@ -5,7 +5,8 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.user.ContributorInfo
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 import io.realm.Sort
@@ -13,26 +14,26 @@ import java.util.*
 
 
 class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), SocialLocalRepository {
-    override fun getChatMessage(messageID: String): Flowable<ChatMessage> = realm.where(ChatMessage::class.java)
+    override fun getChatMessage(messageID: String): Flowable<ChatMessage> = RxJavaBridge.toV3Flowable(realm.where(ChatMessage::class.java)
             .equalTo("id", messageID)
             .findAll()
             .asFlowable()
             .filter { it.isLoaded && it.isNotEmpty() }
-            .map { it.first() }
+            .map { it.first() })
 
-    override fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership> = realm.where(GroupMembership::class.java)
+    override fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership> = RxJavaBridge.toV3Flowable(realm.where(GroupMembership::class.java)
             .equalTo("userID", userId)
             .equalTo("groupID", id)
             .findAll()
             .asFlowable()
             .filter { it.isLoaded && it.isNotEmpty() }
-            .map { it.first() }
+            .map { it.first() })
 
-    override fun getGroupMemberships(userId: String): Flowable<RealmResults<GroupMembership>> = realm.where(GroupMembership::class.java)
+    override fun getGroupMemberships(userId: String): Flowable<RealmResults<GroupMembership>> = RxJavaBridge.toV3Flowable(realm.where(GroupMembership::class.java)
             .equalTo("userID", userId)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
+            .filter { it.isLoaded })
 
     override fun updateMembership(userId: String, id: String, isMember: Boolean) {
         if (isMember) {
@@ -97,22 +98,22 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun getPublicGuilds(): Flowable<RealmResults<Group>> = realm.where(Group::class.java)
+    override fun getPublicGuilds(): Flowable<RealmResults<Group>> = RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
             .equalTo("type", "guild")
             .equalTo("privacy", "public")
             .notEqualTo("id", Group.TAVERN_ID)
             .sort("memberCount", Sort.DESCENDING)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
+            .filter { it.isLoaded })
 
-    override fun getUserGroups(userID: String, type: String?): Flowable<RealmResults<Group>> = realm.where(GroupMembership::class.java)
+    override fun getUserGroups(userID: String, type: String?): Flowable<RealmResults<Group>> = RxJavaBridge.toV3Flowable(realm.where(GroupMembership::class.java)
             .equalTo("userID", userID)
             .findAll()
             .asFlowable()
-            .filter { it.isLoaded }
-            .flatMap {memberships ->
-                realm.where(Group::class.java)
+            .filter { it.isLoaded })
+.flatMap {memberships ->
+                RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
                         .equalTo("type", type ?: "guild")
                         .notEqualTo("id", Group.TAVERN_ID)
                         .`in`("id", memberships.map {
@@ -121,48 +122,48 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
                         .sort("memberCount", Sort.DESCENDING)
                         .findAll()
                         .asFlowable()
-                        .filter { it.isLoaded }
+                        .filter { it.isLoaded })
             }
 
 
 
     override fun getGroups(type: String): Flowable<RealmResults<Group>> {
-        return realm.where(Group::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
                 .equalTo("type", type)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getGroup(id: String): Flowable<Group> {
-        return realm.where(Group::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
                 .equalTo("id", id)
                 .findAll()
                 .asFlowable()
                 .filter { group -> group.isLoaded && group.isValid && !group.isEmpty() }
-                .map { groups -> groups.first() }
+                .map { groups -> groups.first() })
     }
 
     override fun getGroupChat(groupId: String): Flowable<RealmResults<ChatMessage>> {
-        return realm.where(ChatMessage::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(ChatMessage::class.java)
                 .equalTo("groupId", groupId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
     override fun deleteMessage(id: String) {
         getMessage(id).firstElement().subscribe { chatMessage -> executeTransaction { chatMessage.deleteFromRealm() } }
     }
 
     override fun getGroupMembers(partyId: String): Flowable<RealmResults<Member>> {
-        return realm.where(Member::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Member::class.java)
                 .equalTo("party.id", partyId)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
     override fun updateRSVPNeeded(user: User?, newValue: Boolean) {
         executeTransaction { user?.party?.quest?.RSVPNeeded = newValue }
@@ -242,11 +243,11 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
 
 
     private fun getMessage(id: String): Flowable<ChatMessage> {
-        return realm.where(ChatMessage::class.java).equalTo("id", id)
+        return RxJavaBridge.toV3Flowable(realm.where(ChatMessage::class.java).equalTo("id", id)
                 .findAll()
                 .asFlowable()
                 .filter { messages -> messages.isLoaded && messages.isValid && !messages.isEmpty() }
-                .map { messages -> messages.first() }
+                .map { messages -> messages.first() })
     }
 
     override fun doesGroupExist(id: String): Boolean {
@@ -255,22 +256,22 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
     }
 
     override fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<RealmResults<ChatMessage>> {
-        return realm.where(ChatMessage::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(ChatMessage::class.java)
                 .equalTo("isInboxMessage", true)
                 .equalTo("uuid", replyToUserID)
                 .equalTo("userID", userId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
     override fun getInboxConversation(userId: String): Flowable<RealmResults<InboxConversation>> {
-        return realm.where(InboxConversation::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(InboxConversation::class.java)
                 .equalTo("userID", userId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
index f0da06d7b..ce95e38af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
@@ -2,7 +2,8 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.TagLocalRepository
 import com.habitrpg.android.habitica.models.Tag
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 
@@ -14,7 +15,7 @@ class RealmTagLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), T
     }
 
     override fun getTags(userId: String): Flowable<RealmResults<Tag>> {
-        return realm.where(Tag::class.java).equalTo("userId", userId).findAll().asFlowable()
+        return RxJavaBridge.toV3Flowable(realm.where(Tag::class.java).equalTo("userId", userId).findAll().asFlowable())
     }
 
     override fun removeOldTags(onlineTags: List<Tag>, userID: String) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
index 007c0d2bf..1f2fcda77 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
@@ -3,8 +3,9 @@ package com.habitrpg.android.habitica.data.local.implementation
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository
 import com.habitrpg.android.habitica.models.tasks.*
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
-import io.reactivex.Maybe
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.RealmResults
@@ -16,26 +17,25 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         if (realm.isClosed) {
             return Flowable.empty()
         }
-        return realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
                 .equalTo("type", taskType)
                 .equalTo("userId", userID)
                 .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-                .retry(1)
+                .filter { it.isLoaded }).retry(1)
     }
 
     override fun getTasks(userId: String): Flowable<RealmResults<Task>> {
         if (realm.isClosed) {
             return Flowable.empty()
         }
-        return realm.where(Task::class.java).equalTo("userId", userId)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java).equalTo("userId", userId)
                 .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
     override fun saveTasks(userId: String, tasksOrder: TasksOrder, tasks: TaskList) {
         val sortedTasks = ArrayList<Task>()
@@ -155,9 +155,9 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         if (realm.isClosed) {
             return Flowable.empty()
         }
-        return realm.where(Task::class.java).equalTo("id", taskId).findFirstAsync().asFlowable<RealmObject>()
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java).equalTo("id", taskId).findFirstAsync().asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
-                .cast(Task::class.java)
+                .cast(Task::class.java))
     }
 
     override fun getTaskCopy(taskId: String): Flowable<Task> {
@@ -192,9 +192,9 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun getTaskAtPosition(taskType: String, position: Int): Flowable<Task> {
-        return realm.where(Task::class.java).equalTo("type", taskType).equalTo("position", position).findFirstAsync().asFlowable<RealmObject>()
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java).equalTo("type", taskType).equalTo("position", position).findFirstAsync().asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
-                .cast(Task::class.java)
+                .cast(Task::class.java))
     }
 
     override fun updateIsdue(daily: TaskList): Maybe<TaskList> {
@@ -218,32 +218,31 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun getErroredTasks(userID: String): Flowable<RealmResults<Task>> {
-        return realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
                 .equalTo("userId", userID)
                 .equalTo("hasErrored", true)
                 .sort("position")
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-                .retry(1)
+                .filter { it.isLoaded }).retry(1)
     }
 
     override fun getUser(userID: String): Flowable<User> {
-        return realm.where(User::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(User::class.java)
                 .equalTo("id", userID)
                 .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
-                .map { users -> users.first() }
+                .map { users -> users.first() })
     }
 
     override fun getTasksForChallenge(challengeID: String?, userID: String?): Flowable<RealmResults<Task>> {
-        return realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
                 .equalTo("challengeID", challengeID)
                 .equalTo("userId", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-                .retry(1)
+                .filter { it.isLoaded })
+.retry(1)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
index e7a1f2883..e4661fd54 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
@@ -2,7 +2,8 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
 import com.habitrpg.android.habitica.models.TutorialStep
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 
@@ -11,7 +12,7 @@ class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(real
 
     override fun getTutorialStep(key: String): Flowable<TutorialStep> {
         if (realm.isClosed) return Flowable.empty()
-        return realm.where(TutorialStep::class.java).equalTo("identifier", key)
+        return RxJavaBridge.toV3Flowable(realm.where(TutorialStep::class.java).equalTo("identifier", key)
                 .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && realmObject.isNotEmpty() }
@@ -27,15 +28,15 @@ class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(real
                     }
                 }
                 .map { steps -> steps.first() }
-                .cast(TutorialStep::class.java)
+                .cast(TutorialStep::class.java))
     }
 
     override fun getTutorialSteps(keys: List<String>): Flowable<RealmResults<TutorialStep>> {
         if (realm.isClosed) return Flowable.empty()
-        return realm.where(TutorialStep::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(TutorialStep::class.java)
                 .`in`("identifier", keys.toTypedArray())
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
index 67e911f19..f6320cf17 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
@@ -9,7 +9,8 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import hu.akarnokd.rxjava3.bridge.RxJavaBridge
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.RealmResults
 
@@ -19,15 +20,15 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
                 .map { it.party?.id ?: "" }
                 .filter { it.isNotBlank() }
                 .flatMap {
-                    realm.where(Group::class.java)
+                    RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
                             .equalTo("id", it)
                             .findAll()
                             .asFlowable()
                             .filter { groups -> groups.size > 0 }
-                            .map { groups -> groups.first() }
+                            .map { groups -> groups.first() })
                 }
                 .map { when {
-                    it.quest?.members?.find { questMember -> questMember.key == userID } === null -> UserQuestStatus.NO_QUEST
+                    it?.quest?.members?.find { questMember -> questMember.key == userID } === null -> UserQuestStatus.NO_QUEST
                     it.quest?.progress?.collect?.isNotEmpty() ?: false -> UserQuestStatus.QUEST_COLLECT
                     it.quest?.progress?.hp ?: 0.0 > 0.0 -> UserQuestStatus.QUEST_BOSS
                     else -> UserQuestStatus.QUEST_UNKNOWN
@@ -35,32 +36,31 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun getAchievements(): Flowable<RealmResults<Achievement>> {
-        return realm.where(Achievement::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Achievement::class.java)
                 .sort("index")
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
+                .filter { it.isLoaded })
     }
 
     override fun getQuestAchievements(userID: String): Flowable<RealmResults<QuestAchievement>> {
-        return realm.where(QuestAchievement::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(QuestAchievement::class.java)
                 .equalTo("userID", userID)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
-    override fun getTutorialSteps(): Flowable<RealmResults<TutorialStep>> = realm.where(TutorialStep::class.java).findAll().asFlowable()
-                .filter { it.isLoaded }
-
-    override fun getUser(userID: String): Flowable<User> {
+    override fun getTutorialSteps(): Flowable<RealmResults<TutorialStep>> = RxJavaBridge.toV3Flowable(realm.where(TutorialStep::class.java).findAll().asFlowable()
+                .filter { it.isLoaded })
+override fun getUser(userID: String): Flowable<User> {
         if (realm.isClosed) return Flowable.empty()
-        return realm.where(User::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(User::class.java)
                 .equalTo("id", userID)
                 .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
-                .map { users -> users.first() }
+                .map { users -> users.first() })
     }
 
     override fun saveUser(user: User) {
@@ -136,12 +136,12 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
 
     override fun getSkills(user: User): Flowable<RealmResults<Skill>> {
         val habitClass = if (user.preferences?.disableClasses == true) "none" else user.stats?.habitClass
-        return realm.where(Skill::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Skill::class.java)
                 .equalTo("habitClass", habitClass)
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 
     override fun getSpecialItems(user: User): Flowable<RealmResults<Skill>> {
         val specialItems = user.items?.special
@@ -163,10 +163,10 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         if (ownedItems.size == 0) {
             ownedItems.add("")
         }
-        return realm.where(Skill::class.java)
+        return RxJavaBridge.toV3Flowable(realm.where(Skill::class.java)
                 .`in`("key", ownedItems.toTypedArray())
                 .findAll()
                 .asFlowable()
-                .filter { it.isLoaded }
-    }
+                .filter { it.isLoaded })
+}
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
index 234fdb1c8..a8b6b9ba5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.executors;
 
 
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 public interface PostExecutionThread {
     Scheduler getScheduler();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
index b3d7cf4ea..3a3419758 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
@@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.executors;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Scheduler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 
 @Singleton
 public class UIThread implements PostExecutionThread {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt
index c4b21c2c6..317115778 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.extensions
 
-import io.reactivex.Completable
+import io.reactivex.rxjava3.core.Completable
 import java.util.concurrent.TimeUnit
 
 /**
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
index cd47e6615..ab67bc6db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
@@ -1,9 +1,9 @@
 package com.habitrpg.android.habitica.extensions
 
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import io.reactivex.Flowable
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.functions.Consumer
 
 fun <T> Flowable<T>.subscribeWithErrorHandler(function: Consumer<T>): Disposable {
     return subscribe(function, RxErrorHandler.handleEmptyError())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
index e07b58243..b9faab911 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
@@ -1,9 +1,9 @@
 package com.habitrpg.android.habitica.extensions
 
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.Observable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
 
 
 fun <S, T : Optional<S>> Flowable<T>.filterOptionalDoOnEmpty(function: () -> Unit): Flowable<S> {
@@ -29,7 +29,7 @@ fun <S, T : Optional<S>> Observable<T>.filterMapEmpty(): Observable<S> {
 }
 
 fun <S, T : Optional<S>> Single<T>.filterOptionalDoOnEmpty(function: () -> Unit): Maybe<S> {
-    return this.doAfterSuccess { if (it.isEmpty) function() }
+    return this.doOnSuccess { if (it.isEmpty) function() }
             .filter { !it.isEmpty }
             .map { it.value }
 }
@@ -40,7 +40,7 @@ fun <S, T : Optional<S>> Single<T>.filterMapEmpty(): Maybe<S> {
 }
 
 fun <S, T : Optional<S>> Maybe<T>.filterOptionalDoOnEmpty(function: () -> Unit): Maybe<S> {
-    return this.doAfterSuccess { if (it.isEmpty) function() }
+    return this.doOnSuccess { if (it.isEmpty) function() }
             .filter { !it.isEmpty }
             .map { it.value }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
index 1475dd55c..ee88b2c4c 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
@@ -14,10 +14,10 @@ import com.habitrpg.android.habitica.models.notifications.FirstDropData
 import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Completable
-import io.reactivex.Flowable
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import org.greenrobot.eventbus.EventBus
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -42,8 +42,7 @@ class NotificationsManager (private val context: Context) {
     }
 
     fun getNotifications(): Flowable<List<Notification>> {
-        return this.notifications
-                .startWith(emptyList<Notification>())
+        return this.notifications.startWithArray(emptyList())
                 .toFlowable(BackpressureStrategy.LATEST)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
index dc51b50ba..8902fd7f2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.helpers
 import android.util.Log
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import okhttp3.internal.http2.ConnectionShutdownException
 import retrofit2.HttpException
 import java.io.EOFException
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
index 8ffe59438..8274f054a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
@@ -4,13 +4,14 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Environment
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okio.Okio
+import okio.buffer
+import okio.sink
 import java.io.File
 import java.io.IOException
 
@@ -52,8 +53,8 @@ class SoundFileLoader(private val context: Context) {
 
                         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
                             try {
-                                val sink = Okio.buffer(Okio.sink(file))
-                                sink.writeAll(response.body()!!.source())
+                                val sink = file.sink().buffer()
+                                sink.writeAll(response.body!!.source())
                                 sink.flush()
                                 sink.close()
                             } catch (io: IOException) {
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 85c5c2e8a..235822d1a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.helpers
 
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import io.reactivex.Maybe
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.schedulers.Schedulers
 import javax.inject.Inject
 
 class SoundManager {
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 002227421..4ed31ac13 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
@@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.receivers.NotificationPublisher
 import com.habitrpg.android.habitica.receivers.TaskReceiver
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import java.util.*
 
 class TaskAlarmManager(private var context: Context, private var taskRepository: TaskRepository, private var userId: String) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
index 4b8d590d0..c78f9bcea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.models.user.User
 
 import javax.inject.Inject
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 class BuyRewardUseCase @Inject
 constructor(private val taskRepository: TaskRepository, private val soundManager: SoundManager,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
index 70cea0804..d581f7382 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
 
 import javax.inject.Inject
 
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 import com.habitrpg.android.habitica.ui.activities.MainActivity.Companion.SELECT_CLASS_RESULT
 
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 5369513e8..eb7ebf3bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.executors.ThreadExecutor
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import java.lang.StringBuilder
 import javax.inject.Inject
 
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 48bd42369..b71977db3 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
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
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 32a386ba8..a2098cf6f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
@@ -22,7 +22,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
 import kotlin.math.abs
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
index f08fb797c..9d6efe349 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.interactors;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 public abstract class UseCase<Q extends UseCase.RequestValues, T> {
 
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 0e19665b4..579c03e4d 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
@@ -156,10 +156,10 @@ open class Task : RealmObject, Parcelable {
         }
 
     val isDisplayedActive: Boolean
-        get() = isDue == true && !completed
+        get() = ((isDue == true && type == Task.TYPE_DAILY) || type == TYPE_TODO) && !completed
 
     val isChecklistDisplayActive: Boolean
-        get() = this.isDisplayedActive && this.checklist?.size != this.completedChecklistCount
+        get() = this.checklist?.size != this.completedChecklistCount
 
     val isGroupTask: Boolean
         get() = group?.approvalApproved == true
@@ -211,10 +211,10 @@ open class Task : RealmObject, Parcelable {
             return this.parsedText ?: ""
         }
 
-        MarkdownParser.parseMarkdownAsync(this.text, { parsedText ->
+        MarkdownParser.parseMarkdownAsync(this.text) { parsedText ->
             this.parsedText = parsedText
             callback(parsedText)
-        })
+        }
 
         return this.text
     }
@@ -225,10 +225,10 @@ open class Task : RealmObject, Parcelable {
         }
 
         if (notes?.isNotEmpty() == true) {
-            MarkdownParser.parseMarkdownAsync(notes, { parsedText ->
+            MarkdownParser.parseMarkdownAsync(notes) { parsedText ->
                 parsedNotes = parsedText
                 callback(parsedText)
-            })
+            }
         }
         return notes
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
index dd27d3921..4ee1129eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
@@ -17,7 +17,7 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 @Module
@@ -50,7 +50,7 @@ public class ApiModule {
     public MaintenanceApiService providesMaintenanceApiService(GsonConverterFactory gsonConverter, HostConfig hostConfig) {
         Retrofit adapter = new Retrofit.Builder()
                 .baseUrl("https://habitica-assets.s3.amazonaws.com/mobileApp/endpoint/")
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .addConverterFactory(gsonConverter)
                 .build();
         return adapter.create(MaintenanceApiService.class);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
index ed4dd1334..ff03da730 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
@@ -21,7 +21,7 @@ import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import io.reactivex.functions.BiFunction
+import io.reactivex.rxjava3.functions.BiFunction
 import io.realm.RealmResults
 import java.util.*
 import javax.inject.Inject
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
index d0ed936d1..af825dc1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import javax.inject.Inject
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
index ab6963a6a..0d6103084 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 
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 0789c334a..8f4fb5b2c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
 import kotlin.math.floor
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 3f5307571..98931c0b6 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
@@ -24,7 +24,7 @@ import com.habitrpg.android.habitica.extensions.updateStatusBarColor
 import com.habitrpg.android.habitica.helpers.LanguageHelper
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
@@ -35,6 +35,7 @@ abstract class BaseActivity : AppCompatActivity() {
     private var currentTheme: String? = null
     private var isNightMode: Boolean = false
     internal var forcedTheme: String? = null
+    internal var forcedIsNight: Boolean? = null
     private var destroyed: Boolean = false
 
     open var overrideModernHeader: Boolean? = null
@@ -105,7 +106,7 @@ abstract class BaseActivity : AppCompatActivity() {
         val theme = forcedTheme ?: sharedPreferences.getString("theme_name", "purple")
         val modernHeaderStyle = overrideModernHeader ?: sharedPreferences.getBoolean("modern_header_style", true)
         if (theme != currentTheme || forced) {
-            if (isNightMode) {
+            if (forcedIsNight ?: isNightMode) {
                 setTheme(when (theme) {
                     "maroon" -> R.style.MainAppTheme_Maroon_Dark
                     "red" -> R.style.MainAppTheme_Red_Dark
@@ -131,12 +132,12 @@ abstract class BaseActivity : AppCompatActivity() {
             }
         }
 
-        if (isNightMode) {
-            window.navigationBarColor = ContextCompat.getColor(this, R.color.system_bars)
+        window.navigationBarColor = if (forcedIsNight ?: isNightMode) {
+            ContextCompat.getColor(this, R.color.system_bars)
         } else {
-            window.navigationBarColor = getThemeColor(R.attr.colorPrimaryDark)
+            getThemeColor(R.attr.colorPrimaryDark)
         }
-        if (!isNightMode && modernHeaderStyle) {
+        if (!(forcedIsNight ?: isNightMode) && modernHeaderStyle) {
             window.updateStatusBarColor(getThemeColor(R.attr.headerBackgroundColor), true)
         } else {
             window.updateStatusBarColor(getThemeColor(R.attr.statusBarBackground), false)
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 b74ac56bb..6d1aaa5eb 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
@@ -30,8 +30,7 @@ import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasks
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Flowable
-import io.reactivex.rxkotlin.zipWith
+import io.reactivex.rxjava3.core.Flowable
 import java.lang.NumberFormatException
 import java.util.*
 import javax.inject.Inject
@@ -332,7 +331,7 @@ class ChallengeFormActivity : BaseActivity() {
                         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) {
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 523a18268..8fb6c78e1 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
@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.*
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 
 class ClassSelectionActivity : BaseActivity(), Consumer<User> {
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 143347109..30620d9e6 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
@@ -9,7 +9,6 @@ import android.widget.TableLayout
 import android.widget.TableRow
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatEditText
-import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import com.facebook.drawee.backends.pipeline.Fresco
@@ -36,14 +35,13 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
 import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter
-import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.helpers.loadImage
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.RealmResults
 import java.text.SimpleDateFormat
 import java.util.*
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
index a94ee1ea2..914f32a30 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
@@ -30,10 +30,10 @@ class GuidelinesActivity: BaseActivity() {
 
             @Throws(IOException::class)
             override fun onResponse(call: Call, response: Response) {
-                val `in` = response.body()?.byteStream()
+                val `in` = response.body?.byteStream()
                 val reader = BufferedReader(InputStreamReader(`in`))
                 val text = reader.readText()
-                response.body()?.close()
+                response.body?.close()
 
                 findViewById<TextView>(R.id.text_view).post {
                     findViewById<TextView>(R.id.text_view).setMarkdown(text)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
index 7632b47ed..5ee2f9742 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
@@ -52,10 +52,10 @@ import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.willowtreeapps.signinwithapplebutton.SignInWithAppleConfiguration
-import io.reactivex.Flowable
-import io.reactivex.exceptions.Exceptions
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.exceptions.Exceptions
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
 import java.io.IOException
 import javax.inject.Inject
 
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 b6a9681df..7baba64d1 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
@@ -73,11 +73,11 @@ import com.habitrpg.android.habitica.widget.AvatarStatsWidgetProvider
 import com.habitrpg.android.habitica.widget.DailiesWidgetProvider
 import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider
 import com.habitrpg.android.habitica.widget.TodoListWidgetProvider
-import io.reactivex.Completable
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
 import io.realm.kotlin.isValid
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -836,7 +836,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             val petWrapper = View.inflate(this, R.layout.pet_imageview, null) as? FrameLayout
             val petImageView = petWrapper?.findViewById(R.id.pet_imageview) as? SimpleDraweeView
 
-            DataBindingUtils.loadImage(petImageView, "social_Pet-" + egg.key + "-" + potion.key)
+            DataBindingUtils.loadImage(petImageView, "stable_Pet-" + egg.key + "-" + potion.key)
             val potionName = potion.text
             val eggName = egg.text
             val dialog = HabiticaAlertDialog(this)
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 1b87333f0..7471602d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
@@ -12,8 +12,8 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.databinding.ActivityMaintenanceBinding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import javax.inject.Inject
 
 class MaintenanceActivity : BaseActivity() {
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 dad195387..e410bbccb 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
@@ -31,7 +31,7 @@ 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.viewpagerindicator.IconPagerAdapter
-import io.reactivex.BackpressureStrategy
+import io.reactivex.rxjava3.core.BackpressureStrategy
 import java.util.*
 import javax.inject.Inject
 
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 599cb6b04..2856102c3 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
@@ -103,6 +103,7 @@ class TaskFormActivity : BaseActivity() {
         val bundle = intent.extras ?: return
 
         val taskId = bundle.getString(TASK_ID_KEY)
+        forcedIsNight = false
         forcedTheme = if (taskId != null) {
             val taskValue = bundle.getDouble(TASK_VALUE_KEY)
             when {
@@ -131,7 +132,7 @@ class TaskFormActivity : BaseActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
         tintColor = getThemeColor(R.attr.taskFormTint)
-        val upperTintColor = if (forcedTheme == "purple") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
+        val upperTintColor = if (forcedTheme == "taskform") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
         supportActionBar?.setBackgroundDrawable(ColorDrawable(upperTintColor))
         binding.upperTextWrapper.setBackgroundColor(upperTintColor)
 
@@ -212,7 +213,7 @@ class TaskFormActivity : BaseActivity() {
 
     override fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean) {
         super.loadTheme(sharedPreferences, forced)
-        val upperTintColor = if (forcedTheme == "purple") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
+        val upperTintColor = if (forcedTheme == "taskform") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
         window.statusBarColor = upperTintColor
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
index ba2a3647f..d48da01e2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
@@ -15,9 +15,9 @@ 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.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
index 64163e917..77f0bb048 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
@@ -17,9 +17,9 @@ import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.*
 
 class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
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 dd3a1e260..e391b060a 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
@@ -20,9 +20,9 @@ import com.habitrpg.android.habitica.models.inventory.CustomizationSet
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.*
 
 class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
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 13050b70a..6dfd8443e 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
@@ -16,9 +16,9 @@ import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
 import com.habitrpg.android.habitica.ui.views.promo.PromoMenuViewHolder
 import com.habitrpg.android.habitica.ui.views.promo.SubscriptionBuyGemsPromoView
 import com.habitrpg.android.habitica.ui.views.promo.SubscriptionBuyGemsPromoViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 
 class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
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 d5d7df52a..2dfac652f 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
@@ -7,9 +7,9 @@ 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.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 import io.realm.RealmRecyclerViewAdapter
 import java.util.*
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 ec7f3e8ff..689f4b79c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
@@ -15,9 +15,9 @@ import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.user.SpecialItems
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter.SkillViewHolder>() {
 
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 be2c77988..f19348ce4 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
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.databinding.GearListItemBinding
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 import io.realm.RealmRecyclerViewAdapter
 
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 5ed3a2405..8686e690e 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
@@ -17,9 +17,9 @@ import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
 import com.habitrpg.android.habitica.ui.views.dialogs.DetailDialog
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 import io.realm.RealmRecyclerViewAdapter
 import io.realm.RealmResults
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 20d973d92..61824d3c0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
@@ -6,9 +6,9 @@ import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.ui.viewHolders.MountViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 class MountDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
     private var ownedMounts: Map<String, OwnedMount>? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
index fe554d44b..df8d737b5 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
@@ -7,9 +7,9 @@ import com.habitrpg.android.habitica.models.user.OwnedMount
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.RealmResults
 
 class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
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 d895cb6aa..df8c38c3e 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
@@ -18,9 +18,9 @@ import com.habitrpg.android.habitica.ui.helpers.loadImage
 import com.habitrpg.android.habitica.ui.viewHolders.MountViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 
 class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
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 56b2fee09..0e9301c54 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt
@@ -12,9 +12,9 @@ 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.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 internal class CustomizationSetupAdapter : RecyclerView.Adapter<CustomizationSetupAdapter.CustomizationViewHolder>() {
 
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 a005d0ead..35087058d 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
@@ -10,9 +10,9 @@ import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 import io.realm.RealmRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.helpers.EmojiParser
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 7e4260e65..8e588cc5c 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
@@ -9,9 +9,9 @@ import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 import io.realm.RealmRecyclerViewAdapter
 
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 a8f031d07..394dd48d1 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
@@ -10,9 +10,9 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerIntroViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import com.habitrpg.android.habitica.models.members.Member
 
 class InboxAdapter(private var user: User?, private var replyToUser : Member) : PagedListAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
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 48010214b..ff137ca1f 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
@@ -5,9 +5,9 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 import io.realm.RealmRecyclerViewAdapter
 
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 e0dd65a01..2cb86dd6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
@@ -12,9 +12,9 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.*
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, layoutResource: Int,
                                         newContext: Context, userID: String,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
index 7c20cb90c..358ccf2c7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
@@ -13,9 +13,9 @@ import com.habitrpg.android.habitica.helpers.TaskFilterHelper
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import java.util.*
 import javax.inject.Inject
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
index 92e8926ae..099c5eb18 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
@@ -9,10 +9,10 @@ import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.functions.Action
-import io.reactivex.subjects.PublishSubject
+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.*
 
 abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
@@ -83,8 +83,8 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
     }
 
     override fun updateData(tasks: OrderedRealmCollection<Task>?) {
-        data?.takeIf { it.isValid }?.removeListener()
-        tasks?.takeIf { it.isValid }?.addListener()
+        data?.takeIf { it.isValid && !it.isFrozen }?.removeListener()
+        tasks?.takeIf { it.isValid && !it.isFrozen }?.addListener()
         super.updateData(tasks)
     }
 
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 a3c3c3919..d78f87b39 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
@@ -14,9 +14,9 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 
 class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollection<Task>?, private val layoutResource: Int, private val user: User?) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
index 1c2a0707e..112828971 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.adapter.tasks
 import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import io.realm.OrderedRealmCollection
 
 interface TaskRecyclerViewAdapter {
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 cbfe7ae56..e59ccf5c7 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
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.adapter.AchievementsAdapter
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
-import io.reactivex.rxkotlin.combineLatest
+import io.reactivex.rxjava3.kotlin.Flowables
 import javax.inject.Inject
 
 class AchievementsFragment: BaseMainFragment<FragmentRefreshRecyclerviewBinding>(), SwipeRefreshLayout.OnRefreshListener {
@@ -106,8 +106,7 @@ class AchievementsFragment: BaseMainFragment<FragmentRefreshRecyclerviewBinding>
             adapter.entries = entries
             adapter.notifyDataSetChanged()
         }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(userRepository.getQuestAchievements()
-                .combineLatest(userRepository.getQuestAchievements()
+        compositeSubscription.add(Flowables.combineLatest(userRepository.getQuestAchievements(), userRepository.getQuestAchievements()
                         .map { it.mapNotNull { achievement -> achievement.questKey } }
                         .flatMap { inventoryRepository.getQuestContent(it) })
                 .subscribeWithErrorHandler { result ->
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 23da66f3b..9cafc7679 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
@@ -12,9 +12,9 @@ import com.habitrpg.android.habitica.data.TutorialRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.functions.Consumer
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.EventBusException
 import java.util.*
@@ -102,10 +102,6 @@ abstract class BaseFragment<VB: ViewBinding> : DialogFragment() {
         }
 
         super.onDestroyView()
-        context?.let {
-            val refWatcher = HabiticaBaseApplication.getInstance(it)?.refWatcher
-            refWatcher?.watch(this)
-        }
     }
 
     override fun onDestroy() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index df5f7441b..2677801f8 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
@@ -39,7 +39,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.TavernDetailFragment
 import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -474,6 +474,11 @@ class NavigationDrawerFragment : DialogFragment() {
 
             val bg = binding?.notificationsBadge?.background as? GradientDrawable
             bg?.color = ColorStateList.valueOf(color)
+            binding?.notificationsBadge?.setTextColor(if (allSeen) {
+                ContextCompat.getColor(it, R.color.gray_10)
+            } else {
+                ContextCompat.getColor(it, R.color.white)
+            })
         }
     }
 
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 9d81ca85a..d021cef3f 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
@@ -22,7 +22,7 @@ import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.stats.BulkAllocateStatsDialog
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Named
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 ac00c11a2..759f65c37 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
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.ui.adapter.CustomizationRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
 
 class AvatarCustomizationFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
index 5339328eb..d635cb126 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.ui.adapter.CustomizationEquipmentRecyclerVi
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
 
 class AvatarEquipmentFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
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 4094d8d2f..3e00ca58b 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
@@ -22,7 +22,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import io.reactivex.rxkotlin.combineLatest
+import io.reactivex.rxjava3.kotlin.Flowables
 import org.greenrobot.eventbus.Subscribe
 import javax.inject.Inject
 
@@ -137,7 +137,7 @@ class PetDetailRecyclerFragment : BaseMainFragment<FragmentRecyclerviewBinding>(
                     }
                     .subscribe({ adapter.setOwnedMounts(it) }, RxErrorHandler.handleEmptyError()))
             compositeSubscription.add(inventoryRepository.getOwnedItems(true).subscribe({ adapter.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(inventoryRepository.getPets(animalType, animalGroup, animalColor).combineLatest(inventoryRepository.getOwnedPets()
+            compositeSubscription.add(Flowables.combineLatest(inventoryRepository.getPets(animalType, animalGroup, animalColor), 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/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
index afbdd7252..5b2fecdab 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
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Maybe
 import io.realm.RealmResults
 import java.util.*
 import javax.inject.Inject
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 375b5000c..800c5b6ca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
@@ -7,7 +7,7 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Named
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
index d7fd63236..25d2f0319 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
@@ -8,7 +8,7 @@ import androidx.preference.PreferenceCategory
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.Flowable
+import io.reactivex.rxjava3.core.Flowable
 
 class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
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 b83696da8..aefed5c54 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
@@ -16,8 +16,8 @@ import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.BackpressureStrategy
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
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 54a14702a..5850e76e2 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
@@ -13,9 +13,9 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import javax.inject.Inject
 import javax.inject.Named
 
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 b2465e544..3af0f5b3a 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
@@ -24,8 +24,8 @@ import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import io.reactivex.Flowable
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
 
 class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
 
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 239f03094..cd4997878 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
@@ -25,9 +25,9 @@ import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.Disposable
 import io.realm.RealmResults
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
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 a7274ae47..be11031c2 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
@@ -29,9 +29,9 @@ import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModelFactory
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Action
+import io.reactivex.rxjava3.functions.Consumer
 import java.lang.Exception
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
index 75b5a7940..9248c0660 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
@@ -29,8 +29,8 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
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 613c3688e..20516193a 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
@@ -20,8 +20,8 @@ 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.android.habitica.utils.Action1
-import io.reactivex.Flowable
-import io.reactivex.rxkotlin.combineLatest
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.kotlin.Flowables
 import io.realm.RealmResults
 import javax.inject.Inject
 import javax.inject.Named
@@ -79,7 +79,7 @@ class ChallengeListFragment : BaseFragment<FragmentChallengeslistBinding>(), and
             binding?.recyclerView?.setBackgroundResource(R.color.content_background)
         }
 
-        compositeSubscription.add(socialRepository.getGroup(Group.TAVERN_ID).combineLatest(socialRepository.getUserGroups("guild")).subscribe({
+        compositeSubscription.add(Flowables.combineLatest(socialRepository.getGroup(Group.TAVERN_ID), socialRepository.getUserGroups("guild")).subscribe({
             this.filterGroups = mutableListOf()
             filterGroups?.add(it.first)
             filterGroups?.addAll(it.second)
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 38e908186..fae3c0a27 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
@@ -21,7 +21,7 @@ import com.habitrpg.android.habitica.helpers.DeviceName
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import io.reactivex.Completable
+import io.reactivex.rxjava3.core.Completable
 import javax.inject.Inject
 import javax.inject.Named
 
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 96fef80f3..042641801 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 
 class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
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 7d972c725..9c4bfce81 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
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.helpers.DeviceName
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import io.reactivex.Completable
+import io.reactivex.rxjava3.core.Completable
 import javax.inject.Inject
 import javax.inject.Named
 
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 24ce93f84..8bca8bbf8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
 import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 
 class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
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 a53a892c3..e39c4866c 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
@@ -39,7 +39,7 @@ import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
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 1ab6c112d..514f90ddb 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
@@ -24,7 +24,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import java.util.*
 import javax.inject.Inject
 import kotlin.collections.ArrayList
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
index 8a972bde1..f37c21136 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
@@ -75,16 +75,16 @@ object DataBindingUtils {
         val dataSource = imagePipeline.fetchDecodedImage(imageRequest, this)
 
         dataSource.subscribe(object : BaseBitmapDataSubscriber() {
-            override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>?) {
-                dataSource?.close()
-            }
-
             public override fun onNewResultImpl(bitmap: Bitmap?) {
                 if (dataSource.isFinished && bitmap != null) {
                     imageResult(bitmap)
                     dataSource.close()
                 }
             }
+
+            override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
+                dataSource?.close()
+            }
         }, CallerThreadExecutor.getInstance())
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
index 64e3a378b..157e668fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
@@ -12,10 +12,10 @@ import io.noties.markwon.image.ImagesPlugin
 import io.noties.markwon.image.file.FileSchemeHandler
 import io.noties.markwon.image.network.OkHttpNetworkSchemeHandler
 import io.noties.markwon.movement.MovementMethodPlugin
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
 
 
 object MarkdownParser {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
index 9bc7dca61..2c99af530 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
@@ -19,9 +19,9 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.Maybe
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import com.habitrpg.android.habitica.models.members.Member
 
 open class ChatRecyclerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
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 48325f27a..9ceeae1c7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
@@ -12,9 +12,9 @@ import com.habitrpg.android.habitica.models.inventory.Mount
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<String>) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.mount_overview_item)), View.OnClickListener {
     private var binding: MountOverviewItemBinding = MountOverviewItemBinding.bind(itemView)
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 0cea784fd..882c81911 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
@@ -14,9 +14,9 @@ import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
 import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.subjects.PublishSubject
 import org.greenrobot.eventbus.EventBus
 
 class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<String>, private val animalIngredientsRetriever: ((Animal) -> Pair<Egg?, HatchingPotion?>)?) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.pet_detail_item)), View.OnClickListener {
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 dae714d9a..ba7fd3d64 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
@@ -17,10 +17,10 @@ import com.habitrpg.android.habitica.ui.helpers.*
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.android.habitica.ui.views.EllipsisTextView
 import io.noties.markwon.utils.NoCopySpannableFactory
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Action
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Action
+import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
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 3e928bc25..60b8ec71f 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
@@ -20,9 +20,9 @@ import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 
 abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), var scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit), openTaskFunc: ((Task) -> Unit), brokenTaskFunc: ((Task) -> Unit)) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
 
@@ -38,11 +38,6 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
     init {
         checklistIndicatorWrapper.isClickable = true
         checklistIndicatorWrapper.setOnClickListener { onChecklistIndicatorClicked() }
-        checkboxHolder.setOnClickListener {
-            if (task?.isValid == true) {
-                onCheckedChanged(!(task?.completed ?: false))
-            }
-        }
     }
 
     override fun bind(data: Task, position: Int, displayMode: String) {
@@ -51,6 +46,7 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
             completed = false
         }
         this.checkmarkView.visibility = if (completed) View.VISIBLE else View.GONE
+        checkmarkView.drawable.setTint(ContextCompat.getColor(context, R.color.gray_400))
         this.checklistCompletedTextView.text = data.completedChecklistCount.toString()
         this.checklistAllTextView.text = data.checklist?.size.toString()
 
@@ -80,7 +76,7 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
         }
     }
 
-    abstract fun shouldDisplayAsActive(newTask: Task): Boolean
+    abstract fun shouldDisplayAsActive(newTask: Task?): Boolean
 
     private fun updateChecklistDisplay() {
         //This needs to be a LinearLayout, as ListViews can not be inside other ListViews.
@@ -94,7 +90,15 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
                     if (task?.type == Task.TYPE_TODO) {
                         checkboxBackground?.setBackgroundResource(R.drawable.round_checklist_unchecked)
                     }
-                    checkboxBackground?.backgroundTintList = ContextCompat.getColorStateList(context, (if (context.isUsingNightModeResources()) task?.lightTaskColor else R.color.checkbox_fill) ?: R.color.checkbox_fill)
+                    checkboxBackground?.backgroundTintList = ContextCompat.getColorStateList(context, (if (context.isUsingNightModeResources()) {
+                        if (task?.completed == true || (task?.type == Task.TYPE_DAILY && task?.isDue == false)) {
+                            R.color.checkbox_fill
+                        } else {
+                            task?.lightTaskColor
+                        }
+                    } else {
+                        R.color.checkbox_fill
+                    }) ?: R.color.checkbox_fill)
                     val textView = itemView?.findViewById<HabiticaEmojiTextView>(R.id.checkedTextView)
                     // Populate the data into the template view using the data object
                     textView?.text = item.text
@@ -135,13 +139,9 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
     protected fun setChecklistIndicatorBackgroundActive(isActive: Boolean) {
         val drawable = ContextCompat.getDrawable(context, R.drawable.checklist_indicator_background)
         if (isActive) {
-            if (context.isUsingNightModeResources()) {
-                drawable?.setTint(ContextCompat.getColor(context, R.color.gray_100))
-            } else {
-                drawable?.setTint(ContextCompat.getColor(context, R.color.gray_200))
-            }
+            drawable?.setTint(ContextCompat.getColor(context, R.color.gray_200))
             val textColor = if (context.isUsingNightModeResources()) {
-                ContextCompat.getColor(context, R.color.gray_10)
+                ContextCompat.getColor(context, R.color.gray_600)
             } else {
                 ContextCompat.getColor(context, R.color.gray_500)
             }
@@ -150,7 +150,7 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
             checklistDivider.setBackgroundColor(textColor)
         } else {
             drawable?.setTint(ContextCompat.getColor(context, R.color.offset_background))
-            val textColor = ContextCompat.getColor(context, R.color.text_ternary)
+            val textColor = ContextCompat.getColor(context, R.color.text_quad)
             checklistCompletedTextView.setTextColor(textColor)
             checklistAllTextView.setTextColor(textColor)
             checklistDivider.setBackgroundColor(textColor)
@@ -167,7 +167,18 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
             layoutManager?.scrollToPositionWithOffset(this.adapterPosition, 15)
         }
         updateChecklistDisplay()
+    }
 
+    override fun onLeftActionTouched() {
+        super.onLeftActionTouched()
+        if (task?.isValid == true) {
+            onCheckedChanged(!(task?.completed ?: false))
+        }
+    }
+
+    override fun onRightActionTouched() {
+        super.onRightActionTouched()
+        onChecklistIndicatorClicked()
     }
 
     private fun shouldDisplayExpandedChecklist(): Boolean {
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 dc2b36bf7..f9e19956f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
@@ -47,8 +47,8 @@ class DailyViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         super.bind(newTask, position, displayMode)
     }
 
-    override fun shouldDisplayAsActive(newTask: Task): Boolean {
-        return newTask.isDisplayedActive
+    override fun shouldDisplayAsActive(newTask: Task?): Boolean {
+        return newTask?.isDisplayedActive ?: false
     }
 
     override fun configureSpecialTaskTextView(task: Task) {
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 5d8ad9891..d470a436e 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
@@ -101,11 +101,23 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         }
     }
 
+    override fun onLeftActionTouched() {
+        super.onLeftActionTouched()
+        onPlusButtonClicked()
+    }
+
+    override fun onRightActionTouched() {
+        super.onRightActionTouched()
+        onMinusButtonClicked()
+    }
+
     private fun onPlusButtonClicked() {
+        if (task?.up != true) return
         task?.let { scoreTaskFunc.invoke(it, TaskDirection.UP) }
     }
 
     private fun onMinusButtonClicked() {
+        if (task?.down != true) return
         task?.let { scoreTaskFunc.invoke(it, TaskDirection.DOWN) }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
index 84c99319c..88ec0750f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
+import android.view.MotionEvent
 import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
@@ -33,9 +34,9 @@ class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) ->
         task?.let { scoreTaskFunc(it, TaskDirection.DOWN) }
     }
 
-    override fun onClick(v: View) {
+    override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean {
         if (task?.isValid != true) {
-            return
+            return true
         }
         if (isItem) {
             val dialog = ItemDetailDialog(context)
@@ -47,8 +48,9 @@ class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) ->
             dialog.setBuyListener { _, _ -> this.buyReward() }
             dialog.show()
         } else {
-            super.onClick(v)
+            super.onTouch(view, motionEvent)
         }
+        return true
     }
 
     override fun setDisabled(openTaskDisabled: Boolean, taskActionsDisabled: Boolean) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
index a42eb5491..8dfbf14d3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
@@ -14,7 +14,7 @@ class TodoViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Un
 
     override fun bind(newTask: Task, position: Int, displayMode: String) {
         this.task = newTask
-        setChecklistIndicatorBackgroundActive(!newTask.completed)
+        setChecklistIndicatorBackgroundActive(newTask.isChecklistDisplayActive)
         reminderTextView.visibility = View.GONE
         this.streakTextView.visibility = View.GONE
         super.bind(newTask, position, displayMode)
@@ -31,7 +31,7 @@ class TodoViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Un
         }
     }
 
-    override fun shouldDisplayAsActive(newTask: Task): Boolean {
-        return !newTask.completed
+    override fun shouldDisplayAsActive(newTask: Task?): Boolean {
+        return newTask?.completed != true
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
index 770739e12..daca49fc6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
@@ -8,8 +8,8 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 
 abstract class BaseViewModel: ViewModel() {
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 2fc1ea93d..cec14d1bb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
@@ -15,10 +15,10 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.notifications.NewChatMessageData
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import io.realm.RealmResults
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
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 91b35dab5..3c769b8fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
@@ -16,10 +16,10 @@ import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
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 2fe2e80f2..f155c96a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
@@ -12,11 +12,11 @@ import com.habitrpg.android.habitica.models.Notification
 import com.habitrpg.android.habitica.models.notifications.*
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.BiFunction
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.BiFunction
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import java.util.*
 import javax.inject.Inject
 
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 ab4193319..8a8334eef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
@@ -8,8 +8,8 @@ import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import io.reactivex.BackpressureStrategy
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.realm.RealmResults
 import org.greenrobot.eventbus.EventBus
 
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 e8bc515b8..f61e834c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
@@ -12,8 +12,8 @@ import com.habitrpg.android.habitica.databinding.NpcBannerBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import kotlin.math.roundToInt
 
 class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
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 e318bef5c..48b81a10b 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
@@ -18,9 +18,9 @@ import com.habitrpg.android.habitica.models.inventory.Item
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.views.CurrencyView
-import io.reactivex.Flowable
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import java.util.*
 
 
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 415c9e7c8..0157a7fbe 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
@@ -35,9 +35,9 @@ import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientG
 import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientHourglassesDialog
 import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientSubscriberGemsDialog
 import com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.realm.RealmResults
 import org.greenrobot.eventbus.EventBus
 import java.util.*
@@ -292,12 +292,12 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         val observable: Flowable<Any>
         if (shopIdentifier != null && shopIdentifier == Shop.TIME_TRAVELERS_SHOP || "mystery_set" == shopItem.purchaseType || shopItem.currency == "hourglasses") {
             observable = if (shopItem.purchaseType == "gear") {
-                inventoryRepository.purchaseMysterySet(shopItem.key)
+                inventoryRepository.purchaseMysterySet(shopItem.key).cast(Any::class.java)
             } else {
-                inventoryRepository.purchaseHourglassItem(shopItem.purchaseType, shopItem.key)
+                inventoryRepository.purchaseHourglassItem(shopItem.purchaseType, shopItem.key).cast(Any::class.java)
             }
         } else if (shopItem.purchaseType == "quests" && shopItem.currency == "gold") {
-            observable = inventoryRepository.purchaseQuest(shopItem.key)
+            observable = inventoryRepository.purchaseQuest(shopItem.key).cast(Any::class.java)
         } else if (shopItem.purchaseType == "debuffPotion") {
             observable = userRepository.useSkill(user, shopItem.key, null).cast(Any::class.java)
         } else if (shopItem.purchaseType == "card") {
@@ -316,7 +316,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 buyResponse
             }
         } else {
-            observable = inventoryRepository.purchaseItem(shopItem.purchaseType, shopItem.key, quantity)
+            observable = inventoryRepository.purchaseItem(shopItem.purchaseType, shopItem.key, quantity).cast(Any::class.java)
         }
         val subscription = observable
                 .doOnNext {
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 a610af116..94981243b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
@@ -32,8 +32,8 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.NPCBannerView
 import com.habitrpg.android.habitica.ui.views.ValueBar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.realm.RealmList
 
 
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 9e265f8ef..735d79982 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import javax.inject.Inject
 
 class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : AlertDialog(context) {
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 91b4bf8a2..c6dda9c66 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
@@ -22,7 +22,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Observable
 import java.util.*
 import javax.inject.Inject
 
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 9b8532bce..4202c66ef 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,19 +9,21 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
@@ -96,7 +98,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
 
     private fun configureChecklistView(checklistView: ViewGroup, task: Task, item: ChecklistItem) {
         val checkmark = checklistView.findViewById<ImageView>(R.id.checkmark)
-        checkmark?.drawable?.setTintMode(PorterDuff.Mode.SRC_ATOP)
+        checkmark?.drawable?.setTint(task.darkestTaskColor)
         checkmark?.visibility = if (item.completed) View.VISIBLE else View.GONE
         val checkboxHolder = checklistView.findViewById<View>(R.id.checkBoxHolder) as? ViewGroup
         checkboxHolder?.setOnClickListener { _ ->
@@ -109,9 +111,23 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
             taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe({ }, RxErrorHandler.handleEmptyError())
             configureChecklistView(checklistView, task, item)
         }
-        checkboxHolder?.setBackgroundResource(task.extraLightTaskColor)
+        checkboxHolder?.setBackgroundResource(if (task.completed) {
+            R.color.offset_background
+        } else {
+            task.extraLightTaskColor
+        })
         val textView = checklistView.findViewById(R.id.checkedTextView) as? TextView
         textView?.text = item.text
+        val checkboxBackground = checklistView.findViewById<View>(R.id.checkBoxBackground)
+        checkboxBackground?.backgroundTintList = ContextCompat.getColorStateList(context, (if (context.isUsingNightModeResources()) {
+            if (task.completed) {
+                R.color.checkbox_fill
+            } else {
+                task.lightTaskColor
+            }
+        } else {
+            R.color.checkbox_fill
+        }))
     }
 
     private fun configureTaskView(taskView: View, task: Task) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
index 7a89a3d58..cd921776e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
@@ -123,9 +123,9 @@ class TaskListDeserializer : JsonDeserializer<TaskList> {
                         val group = TaskGroupPlan()
                         val groupObject = obj.getAsJsonObject("group")
                         val approvalObject = groupObject.getAsJsonObject("approval")
-                        group.approvalRequested = approvalObject.getAsJsonPrimitive("requested").asBoolean
-                        group.approvalApproved = approvalObject.getAsJsonPrimitive("approved").asBoolean
-                        group.approvalRequired = approvalObject.getAsJsonPrimitive("required").asBoolean
+                        if (approvalObject.has("requested")) group.approvalRequested = approvalObject.getAsJsonPrimitive("requested").asBoolean
+                        if (approvalObject.has("approved")) group.approvalApproved = approvalObject.getAsJsonPrimitive("approved").asBoolean
+                        if (approvalObject.has("required")) group.approvalRequired = approvalObject.getAsJsonPrimitive("required").asBoolean
                         task.group = group
                     }
                     // Work around since Realm does not support Arrays of ints
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
index 051ef40ac..d07076f6c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
@@ -46,11 +46,13 @@ class WorldStateSerialization: JsonDeserializer<WorldState> {
             }
         }
 
-        val event = json?.asJsonObject?.getAsJsonObject("currentEvent")
-        if (event != null) {
-            state.currentEventKey = event.getAsString("event")
-            state.currentEventStartDate = context?.deserialize(event.get("start"), Date::class.java)
-            state.currentEventEndDate = context?.deserialize(event.get("end"), Date::class.java)
+        if (json?.asJsonObject?.has("currentEvent") == true) {
+            val event = json.asJsonObject?.getAsJsonObject("currentEvent")
+            if (event != null) {
+                state.currentEventKey = event.getAsString("event")
+                state.currentEventStartDate = context?.deserialize(event.get("start"), Date::class.java)
+                state.currentEventEndDate = context?.deserialize(event.get("end"), Date::class.java)
+            }
         }
 
         return state
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 e9becf368..f94b36da2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
@@ -15,8 +15,8 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import java.util.*
 import javax.inject.Inject
 
diff --git a/Habitica/staff/release/output-metadata.json b/Habitica/staff/release/output-metadata.json
index 3e1bdd47a..41ec07ae8 100644
--- a/Habitica/staff/release/output-metadata.json
+++ b/Habitica/staff/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 2560,
-      "versionName": "3.0",
+      "versionCode": 2581,
+      "versionName": "3.0.1",
       "enabled": true,
       "outputFile": "Habitica-staff-release.apk"
     }
diff --git a/build.gradle b/build.gradle
index b19cb22e8..bf6f9d384 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.0'
+    ext.kotlin_version = '1.4.10'
     ext.build_tools_version = '29.0.0'
     ext.sdk_version = 28
 
@@ -13,9 +13,9 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.1'
-        classpath "io.realm:realm-gradle-plugin:6.0.2"
+        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
+        classpath "io.realm:realm-gradle-plugin:7.0.8"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.1.0"
         classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index 25826cb08..f87071a76 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,3 +1 @@
-Thank you for helping us with beta testing!
-
-Be sure to download this update now for a better Habitica experience!
+We’re back with a big update that brings a feature many have been waiting for: Dark Mode! Along with that comes a pretty big design refresh that helped us make Dark Mode a reality. We’ve also introduced a few privacy related updates including the ability to disable private messages and block from a player’s profile. There was lots of code cleanup and bug fixing behind the scenes that should help the app run more efficiently and make it easier for us to continue making Habitica the best it can be
diff --git a/gradle.properties b/gradle.properties
index c87c025fb..a90b57c59 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=true
 android.debug.obsoleteApi=true
 org.gradle.configureondemand=true
 org.gradle.daemon=true