diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index bdbd44483..e40c70062 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -113,15 +113,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.activities.MainActivity" />
         </activity>
-        <activity
-            android:name=".ui.activities.OldTaskFormActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
-            android:parentActivityName=".ui.activities.MainActivity"
-            tools:ignore="UnusedAttribute">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.activities.MainActivity" />
-        </activity>
         <activity
             android:name=".ui.activities.GroupFormActivity"
             android:theme="@style/AppTheme.NoActionBar.Transparent"
diff --git a/Habitica/res/layout/activity_task_form_old.xml b/Habitica/res/layout/activity_task_form_old.xml
deleted file mode 100644
index 685c1a873..000000000
--- a/Habitica/res/layout/activity_task_form_old.xml
+++ /dev/null
@@ -1,390 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:id="@+id/task_main_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="@dimen/abc_action_bar_content_inset_material">
-
-        <LinearLayout
-            android:id="@+id/task_task_wrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/abc_action_bar_content_inset_material"
-            android:orientation="vertical">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:hintTextAppearance="@style/TextAppearance.AppCompat">
-
-                    <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
-                        android:id="@+id/task_text_edittext"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:hint="@string/text"
-                        android:textColor="@android:color/black"
-                        android:inputType="textCapSentences|textMultiLine"
-                        android:maxLines="3"/>
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:hintTextAppearance="@style/TextAppearance.AppCompat">
-
-                    <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
-                        android:id="@+id/task_notes_edittext"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:hint="@string/notes"
-                        android:textColor="@android:color/black"
-                        android:inputType="textCapSentences|textMultiLine" />
-                </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/task_value_layout"
-                android:layout_width="match_parent"
-                android:layout_height="72dp"
-                app:hintTextAppearance="@style/TextAppearance.AppCompat">
-
-                <EditText
-                    android:id="@+id/task_value_edittext"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:hint="@string/task_value"
-                    android:textColor="@android:color/black"
-                    android:inputType="numberDecimal" />
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:id="@+id/task_difficulty_wrapper">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/difficulty"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <Spinner
-                    android:id="@+id/task_difficulty_spinner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginTop="20dp"
-                android:id="@+id/task_attribute_wrapper">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/attributes"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <Spinner
-                    android:id="@+id/task_attribute_spinner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:id="@+id/task_reset_frequency_wrapper"
-                android:layout_marginTop="20dp">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/reset_streak"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <Spinner
-                    android:id="@+id/task_reset_frequency_spinner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/task_actions_wrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/actions"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-
-            <CheckBox
-                android:id="@+id/task_positive_checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="11dp"
-                android:text="@string/positive_habit_form"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <CheckBox
-                android:id="@+id/task_negative_checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="11dp"
-                android:text="@string/negative_habit_form"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/task_checklist_wrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="30dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="@string/checklist"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/checklist_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal">
-
-                <ImageButton
-                    android:id="@+id/emoji.toggle.btn2"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:src="@drawable/ic_emoticon_grey600_24dp"
-                    android:background="@drawable/md_transparent"
-                    android:contentDescription="Toogle Emoji" />
-
-                <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
-                    android:id="@+id/new_checklist"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:hint="@string/new_checklist_item"
-                    android:inputType="textCapSentences" />
-
-                <Button
-                    android:id="@+id/add_checklist_button"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/add_checklist_item" />
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/task_duedate_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:orientation="vertical">
-
-            <include layout="@layout/tasks_duedate" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/repeatables"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/frequency"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/start_date"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <EditText
-                android:id="@+id/repeatables_startdate_text_edittext"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:hint="@string/start_date"
-                android:textColor="@android:color/black"
-                android:focusable="false" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/repeatables_title"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <Spinner
-                android:id="@+id/task_repeatables_frequency_spinner"
-                android:layout_width="match_parent"
-                android:layout_height="72dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/repeatables_on_title"
-                android:id="@+id/repeatables_on_title"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <Spinner
-                android:id="@+id/task_repeatables_on_spinner"
-                android:layout_width="match_parent"
-                android:layout_height="72dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/repeatEvery"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <NumberPicker
-                android:id="@+id/task_repeatables_every_x_spinner"
-                android:layout_width="match_parent"
-                android:layout_height="72dp" />
-
-            <LinearLayout
-                android:id="@+id/task_repeatables_frequency_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-            </LinearLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:id="@+id/summaryTitle"
-                android:text="@string/repeatables_summary_title"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:id="@+id/summary"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/task_reminders_wrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="@string/reminders"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/reminders_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <EditText
-                android:id="@+id/new_reminder_edittext"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:hint="@string/add_reminder"
-                android:textColor="@android:color/black"
-                android:focusable="false" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="20dp"
-            android:id="@+id/task_tags_wrapper">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tags"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:id="@+id/task_tags_checklist">
-            </LinearLayout>
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:id="@+id/task_delete_wrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/abc_action_bar_content_inset_material"
-            android:orientation="vertical">
-
-            <Button
-                android:id="@+id/btn.delete.task"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:drawableRight="@drawable/ic_action_delete_white_24"
-                android:drawableEnd="@drawable/ic_action_delete_white_24"
-                android:text="@string/action_delete"
-                android:textColor="@color/white" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-</ScrollView>
diff --git a/Habitica/res/layout/task_form_checklist_item.xml b/Habitica/res/layout/task_form_checklist_item.xml
index dd52b519a..3543dcc6e 100644
--- a/Habitica/res/layout/task_form_checklist_item.xml
+++ b/Habitica/res/layout/task_form_checklist_item.xml
@@ -22,7 +22,7 @@
         android:src="@drawable/plus_taskform"
         android:scaleType="center"
         android:layout_marginEnd="@dimen/spacing_large"/>
-    <EditText
+    <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/edit_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/menu/menu_save.xml b/Habitica/res/menu/menu_save.xml
index 219973e01..ac030c672 100644
--- a/Habitica/res/menu/menu_save.xml
+++ b/Habitica/res/menu/menu_save.xml
@@ -1,7 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.activities.OldTaskFormActivity">
+    xmlns:tools="http://schemas.android.com/tools">
     <item android:id="@+id/action_save_changes" android:title="@string/save_changes"
         android:orderInCategory="100" app:showAsAction="always" />
 </menu>
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index ed9ff4fb7..e72ee6438 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -245,10 +245,6 @@
             android:name="challengeID"
             app:argType="string" />
     </fragment>
-    <activity
-        android:id="@+id/taskFormActivity"
-        android:name="com.habitrpg.android.habitica.ui.activities.OldTaskFormActivity"
-        android:label="TaskFormActivity" />
     <activity
         android:id="@+id/fullProfileActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.FullProfileActivity"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
index e7e9653d0..67bc882ae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
@@ -34,7 +34,6 @@ import com.habitrpg.android.habitica.ui.activities.ReportMessageActivity;
 import com.habitrpg.android.habitica.ui.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
-import com.habitrpg.android.habitica.ui.activities.OldTaskFormActivity;
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
 import com.habitrpg.android.habitica.ui.activities.VerifyUsernameActivity;
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter;
@@ -140,8 +139,6 @@ public interface AppComponent {
 
     void inject(SkillMemberActivity skillMembersActivity);
 
-    void inject(OldTaskFormActivity taskFormActivity);
-
     void inject(TasksFragment tasksFragment);
 
     void inject(FAQDetailFragment faqDetailFragment);
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 df8b14938..347ed367a 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
@@ -156,7 +156,7 @@ class ChallengeFormActivity : BaseActivity() {
 
         if (requestCode == 1000) {
             if (resultCode == Activity.RESULT_OK) {
-                val task = data?.getParcelableExtra<Task>(OldTaskFormActivity.PARCELABLE_TASK)
+                val task = data?.getParcelableExtra<Task>(TaskFormActivity.PARCELABLE_TASK)
                 if (task != null) {
                     addOrUpdateTaskInList(task)
                 }
@@ -186,7 +186,7 @@ class ChallengeFormActivity : BaseActivity() {
 
         val prizeError = checkPrizeAndMinimumForTavern()
 
-        if (!prizeError.isEmpty()) {
+        if (prizeError.isNotEmpty()) {
             errorMessages.add(prizeError)
         }
 
@@ -413,22 +413,16 @@ class ChallengeFormActivity : BaseActivity() {
     private fun openNewTaskActivity(type: String?, task: Task?) {
         val bundle = Bundle()
 
-        bundle.putString(OldTaskFormActivity.TASK_TYPE_KEY, type)
+        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type)
         if (task != null) {
-            bundle.putParcelable(OldTaskFormActivity.PARCELABLE_TASK, task)
+            bundle.putParcelable(TaskFormActivity.PARCELABLE_TASK, task)
         }
 
-        bundle.putBoolean(OldTaskFormActivity.SAVE_TO_DB, false)
-        bundle.putBoolean(OldTaskFormActivity.SET_IGNORE_FLAG, true)
-        bundle.putBoolean(OldTaskFormActivity.SHOW_TAG_SELECTION, false)
-        bundle.putBoolean(OldTaskFormActivity.SHOW_CHECKLIST, false)
+        bundle.putBoolean(TaskFormActivity.SET_IGNORE_FLAG, true)
+        bundle.putBoolean(TaskFormActivity.IS_CHALLENGE_TASK, true)
+        bundle.putString(TaskFormActivity.USER_ID_KEY, user?.id)
 
-        val allocationMode = user?.preferences?.hasTaskBasedAllocation()
-
-        bundle.putString(OldTaskFormActivity.USER_ID_KEY, user?.id)
-        bundle.putBoolean(OldTaskFormActivity.ALLOCATION_MODE_KEY, allocationMode ?: false)
-
-        val intent = Intent(this, OldTaskFormActivity::class.java)
+        val intent = Intent(this, TaskFormActivity::class.java)
         intent.putExtras(bundle)
 
         startActivityForResult(intent, 1000)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/OldTaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/OldTaskFormActivity.kt
deleted file mode 100644
index c9041e5c6..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/OldTaskFormActivity.kt
+++ /dev/null
@@ -1,1014 +0,0 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.app.Activity
-import android.app.DatePickerDialog
-import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
-import android.os.Bundle
-import android.os.Handler
-import com.google.android.material.textfield.TextInputLayout
-import androidx.core.content.ContextCompat
-import androidx.appcompat.app.AlertDialog
-import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.ItemTouchHelper
-import android.text.TextUtils
-import android.util.TypedValue
-import android.view.*
-import android.view.inputmethod.InputMethodManager
-import android.widget.*
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.AppComponent
-import com.habitrpg.android.habitica.data.TagRepository
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.extensions.notNull
-import com.habitrpg.android.habitica.helpers.*
-import com.habitrpg.android.habitica.models.Tag
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem
-import com.habitrpg.android.habitica.models.tasks.Days
-import com.habitrpg.android.habitica.models.tasks.RemindersItem
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager
-import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter
-import com.habitrpg.android.habitica.ui.adapter.tasks.RemindersAdapter
-import com.habitrpg.android.habitica.ui.helpers.*
-import com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
-import io.reactivex.functions.Consumer
-import io.realm.Realm
-import io.realm.RealmList
-import java.text.DateFormat
-import java.text.DecimalFormat
-import java.text.ParseException
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Named
-
-class OldTaskFormActivity : BaseActivity() {
-    private val taskValue: EditText by bindView(R.id.task_value_edittext)
-    private val taskValueLayout: TextInputLayout by bindView(R.id.task_value_layout)
-    private val checklistWrapper: LinearLayout by bindView(R.id.task_checklist_wrapper)
-    private val difficultyWrapper: LinearLayout by bindView(R.id.task_difficulty_wrapper)
-    private val attributeWrapper: LinearLayout by bindView(R.id.task_attribute_wrapper)
-    private val mainWrapper: LinearLayout by bindView(R.id.task_main_wrapper)
-    private val taskText: HabiticaAutocompleteTextView by bindView(R.id.task_text_edittext)
-    private val taskNotes: HabiticaAutocompleteTextView by bindView(R.id.task_notes_edittext)
-    private val taskDifficultySpinner: Spinner by bindView(R.id.task_difficulty_spinner)
-    private val taskAttributeSpinner: Spinner by bindView(R.id.task_attribute_spinner)
-    private val btnDelete: Button by bindView(R.id.btn_delete_task)
-    private val positiveCheckBox: CheckBox by bindView(R.id.task_positive_checkbox)
-    private val negativeCheckBox: CheckBox by bindView(R.id.task_negative_checkbox)
-    private val actionsLayout: LinearLayout by bindView(R.id.task_actions_wrapper)
-    private val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.checklist_recycler_view)
-    private val newCheckListEditText: HabiticaAutocompleteTextView? by bindOptionalView(R.id.new_checklist)
-    private val addChecklistItemButton: Button by bindView(R.id.add_checklist_button)
-    private val remindersWrapper: LinearLayout by bindView(R.id.task_reminders_wrapper)
-    private val newRemindersEditText: EditText by bindView(R.id.new_reminder_edittext)
-    private val remindersRecyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.reminders_recycler_view)
-    private val dueDateLayout: LinearLayout by bindView(R.id.task_duedate_layout)
-    private val dueDatePickerLayout: LinearLayout by bindView(R.id.task_duedate_picker_layout)
-    private val dueDateCheckBox: CheckBox by bindView(R.id.duedate_checkbox)
-    private val repeatablesStartDatePickerText: EditText by bindView(R.id.repeatables_startdate_text_edittext)
-    private var startDateListener: DateEditTextListener? = null
-    private val repeatablesLayout: LinearLayout by bindView(R.id.repeatables)
-    private val reapeatablesOnTextView: TextView by bindView(R.id.repeatables_on_title)
-    private val repeatablesOnSpinner: Spinner by bindView(R.id.task_repeatables_on_spinner)
-    private val repeatablesEveryXSpinner: NumberPicker by bindView(R.id.task_repeatables_every_x_spinner)
-    private val repeatablesFrequencyContainer: LinearLayout by bindView(R.id.task_repeatables_frequency_container)
-    private val summaryTextView: TextView by bindView(R.id.summary)
-    private val dueDatePickerText: EditText by bindView(R.id.duedate_text_edittext)
-    private var dueDateListener: DateEditTextListener? = null
-    private val tagsWrapper: LinearLayout by bindView(R.id.task_tags_wrapper)
-    private val tagsContainerLinearLayout: LinearLayout by bindView(R.id.task_tags_checklist)
-    private val repeatablesFrequencySpinner: Spinner by bindView(R.id.task_repeatables_frequency_spinner)
-    private val taskResetFrequencyWrapper: ViewGroup by bindView(R.id.task_reset_frequency_wrapper)
-    private val taskResetFrequencySpinner: Spinner by bindView(R.id.task_reset_frequency_spinner)
-
-    @Inject
-    internal lateinit var taskFilterHelper: TaskFilterHelper
-    @Inject
-    internal lateinit var taskRepository: TaskRepository
-    @Inject
-    internal lateinit var tagRepository: TagRepository
-    @field:[Inject Named(AppModule.NAMED_USER_ID)]
-    internal lateinit var userId: String
-    @Inject
-    internal lateinit var appConfigManager: AppConfigManager
-    @Inject
-    internal lateinit var taskAlarmManager: TaskAlarmManager
-
-    private var task: Task? = null
-    private var taskBasedAllocation: Boolean = false
-    private val repeatablesWeekDayCheckboxes = ArrayList<CheckBox>()
-    private var tags: List<Tag>? = null
-    private var checklistAdapter: CheckListAdapter? = null
-    private var remindersAdapter: RemindersAdapter? = null
-    private var tagCheckBoxList: MutableList<CheckBox>? = null
-    private var selectedTags: MutableList<Tag>? = null
-
-    private lateinit var remindersManager: RemindersManager
-    private var firstDayOfTheWeekHelper: FirstDayOfTheWeekHelper? = null
-
-    private var taskType: String? = null
-    private var taskId: String? = null
-
-    private var shouldSaveTask = true
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_task_form
-    }
-
-    @Suppress("ReturnCount")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val bundle = intent.extras ?: return
-
-        taskType = bundle.getString(TASK_TYPE_KEY)
-        task = bundle.getParcelable(PARCELABLE_TASK) as? Task
-        taskId = bundle.getString(TASK_ID_KEY)
-        taskBasedAllocation = bundle.getBoolean(ALLOCATION_MODE_KEY)
-        shouldSaveTask = bundle.getBoolean(SAVE_TO_DB)
-        val showTagSelection = bundle.getBoolean(SHOW_TAG_SELECTION, true)
-        tagCheckBoxList = ArrayList()
-
-        tagsWrapper.visibility = if (showTagSelection) View.VISIBLE else View.GONE
-
-        if (bundle.containsKey(PARCELABLE_TASK)) {
-            task = bundle.getParcelable(PARCELABLE_TASK)
-            taskType = task?.type
-        }
-
-        tagCheckBoxList = ArrayList()
-        selectedTags = ArrayList()
-        if (taskType == null) {
-            return
-        }
-
-        remindersManager = RemindersManager(taskType)
-
-        dueDateListener = DateEditTextListener(dueDatePickerText)
-
-        btnDelete.isEnabled = false
-        ViewHelper.SetBackgroundTint(btnDelete, ContextCompat.getColor(this, R.color.red_10))
-        btnDelete.setOnClickListener { view ->
-            AlertDialog.Builder(view.context)
-                    .setTitle(getString(R.string.taskform_delete_title))
-                    .setMessage(getString(R.string.taskform_delete_message)).setPositiveButton(getString(R.string.yes)) { _, _ ->
-
-                        finish()
-                        dismissKeyboard()
-
-                        taskId.notNull { taskID -> taskRepository.deleteTask(taskID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
-                    }.setNegativeButton(getString(R.string.no)) { dialog, _ -> dialog.dismiss() }.show()
-        }
-
-        val difficultyAdapter = ArrayAdapter.createFromResource(this,
-                R.array.task_difficulties, android.R.layout.simple_spinner_item)
-        difficultyAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        taskDifficultySpinner.adapter = difficultyAdapter
-        taskDifficultySpinner.setSelection(1)
-
-        val attributeAdapter = ArrayAdapter.createFromResource(this,
-                R.array.task_attributes, android.R.layout.simple_spinner_item)
-        attributeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        taskAttributeSpinner.adapter = attributeAdapter
-        taskAttributeSpinner.setSelection(0)
-
-        if (!taskBasedAllocation) {
-            attributeWrapper.visibility = View.GONE
-        }
-
-        if (taskType == Task.TYPE_HABIT) {
-            mainWrapper.removeView(checklistWrapper)
-            mainWrapper.removeView(remindersWrapper)
-
-            positiveCheckBox.isChecked = true
-            negativeCheckBox.isChecked = true
-
-            val resetFrequencyAdapter = ArrayAdapter.createFromResource(this,
-                    R.array.task_reset_frequencies, android.R.layout.simple_spinner_item)
-            resetFrequencyAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-            taskResetFrequencySpinner.adapter = resetFrequencyAdapter
-            taskResetFrequencySpinner.setSelection(0)
-            taskResetFrequencyWrapper.visibility = View.VISIBLE
-        } else {
-            mainWrapper.removeView(actionsLayout)
-            taskResetFrequencyWrapper.visibility = View.GONE
-        }
-
-        if (taskType == Task.TYPE_TODO) {
-            dueDatePickerLayout.removeView(dueDatePickerText)
-            //Allows user to decide if they want to add a due date or not
-            dueDateCheckBox.setOnCheckedChangeListener { buttonView, _ ->
-                if (buttonView.isChecked) {
-                    dueDatePickerLayout.addView(dueDatePickerText)
-                } else {
-                    dueDatePickerLayout.removeView(dueDatePickerText)
-                }
-            }
-        } else {
-            mainWrapper.removeView(dueDateLayout)
-        }
-
-        if (taskType != Task.TYPE_REWARD) {
-            taskValueLayout.visibility = View.GONE
-        } else {
-
-            mainWrapper.removeView(checklistWrapper)
-            mainWrapper.removeView(remindersWrapper)
-
-            difficultyWrapper.visibility = View.GONE
-            attributeWrapper.visibility = View.GONE
-        }
-
-        if (taskType == Task.TYPE_TODO || taskType == Task.TYPE_DAILY) {
-            createCheckListRecyclerView()
-            createRemindersRecyclerView()
-        }
-
-        val textAutocompleteAdapter = AutocompleteAdapter(this)
-        val tokenizer = AutocompleteTokenizer(listOf(':'))
-        taskText.setAdapter(textAutocompleteAdapter)
-        taskText.threshold = 2
-        taskText.setTokenizer(tokenizer)
-        val notesAutocompleteAdapter = AutocompleteAdapter(this)
-        taskNotes.setAdapter(notesAutocompleteAdapter)
-        taskNotes.threshold = 2
-        taskNotes.setTokenizer(tokenizer)
-
-        val checklistAutocompleteAdapter = AutocompleteAdapter(this)
-        newCheckListEditText?.setAdapter(checklistAutocompleteAdapter)
-        newCheckListEditText?.threshold = 2
-        newCheckListEditText?.setTokenizer(tokenizer)
-
-        enableRepeatables()
-
-        compositeSubscription.add(tagRepository.getTags(userId)
-                .firstElement()
-                .subscribe(Consumer { loadedTags ->
-                    tags = loadedTags
-                    createTagsCheckBoxes()
-                }, RxErrorHandler.handleEmptyError()))
-
-        if (taskId != null) {
-            compositeSubscription.add(taskRepository.getTask(taskId ?: "")
-                    .firstElement()
-                    .subscribe(Consumer { task ->
-                        this.task = task
-                        if (task != null) {
-                            populate(task)
-
-                            setTaskTitle(task)
-                            if (taskType == Task.TYPE_TODO || taskType == Task.TYPE_DAILY) {
-                                populateChecklistRecyclerView()
-                                populateRemindersRecyclerView()
-                            }
-                        }
-
-                        setTaskTitle(task)
-                    }, RxErrorHandler.handleEmptyError()))
-
-            btnDelete.isEnabled = true
-        } else if (task != null) {
-            val thisTask = task
-            if (thisTask != null) {
-                populate(thisTask)
-
-                setTaskTitle(thisTask)
-                if (taskType == Task.TYPE_TODO || taskType == Task.TYPE_DAILY) {
-                    populateChecklistRecyclerView()
-                    populateRemindersRecyclerView()
-                }
-            }
-        } else {
-            setTaskTitle(null)
-            taskText.requestFocus()
-        }
-
-    }
-
-    override fun onDestroy() {
-        tagRepository.close()
-        super.onDestroy()
-    }
-
-    override fun injectActivity(component: AppComponent?) {
-        component?.inject(this)
-    }
-
-    fun hideMonthOptions() {
-        val repeatablesOnSpinnerParams = repeatablesOnSpinner.layoutParams
-        repeatablesOnSpinnerParams.height = 0
-        repeatablesOnSpinner.layoutParams = repeatablesOnSpinnerParams
-
-        val repeatablesOnTitleParams = reapeatablesOnTextView.layoutParams
-        repeatablesOnTitleParams.height = 0
-        reapeatablesOnTextView.layoutParams = repeatablesOnTitleParams
-    }
-
-    fun hideWeekOptions() {
-        val repeatablesFrequencyContainerParams = repeatablesFrequencyContainer.layoutParams
-        repeatablesFrequencyContainerParams.height = 0
-        repeatablesFrequencyContainer.layoutParams = repeatablesFrequencyContainerParams
-    }
-
-    private fun enableRepeatables() {
-        if (!appConfigManager.repeatablesAreEnabled() || taskType != Task.TYPE_DAILY) {
-            repeatablesLayout.visibility = View.INVISIBLE
-            val repeatablesLayoutParams = repeatablesLayout.layoutParams
-            repeatablesLayoutParams.height = 0
-            repeatablesLayout.layoutParams = repeatablesLayoutParams
-            return
-        }
-
-        // Start Date
-        startDateListener = DateEditTextListener(repeatablesStartDatePickerText)
-
-        // Frequency
-        val frequencyAdapter = ArrayAdapter.createFromResource(this,
-                R.array.repeatables_frequencies, android.R.layout.simple_spinner_item)
-        frequencyAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        this.repeatablesFrequencySpinner.adapter = frequencyAdapter
-        repeatablesFrequencySpinner.setSelection(1)
-        this.repeatablesFrequencySpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
-                generateSummary()
-                val r = resources
-
-                when (position) {
-                    2 -> {
-                        hideWeekOptions()
-
-                        val repeatablesOnSpinnerParams = repeatablesOnSpinner.layoutParams
-                        repeatablesOnSpinnerParams.height = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 72f, r.displayMetrics).toInt()
-                        repeatablesOnSpinner.layoutParams = repeatablesOnSpinnerParams
-
-                        val repeatablesOnTitleParams = reapeatablesOnTextView.layoutParams
-                        repeatablesOnTitleParams.height = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, r.displayMetrics).toInt()
-                        reapeatablesOnTextView.layoutParams = repeatablesOnTitleParams
-                    }
-                    1 -> {
-                        hideMonthOptions()
-
-                        val repeatablesFrequencyContainerParams = repeatablesFrequencyContainer.layoutParams
-                        repeatablesFrequencyContainerParams.height = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 220f, r.displayMetrics).toInt()
-                        repeatablesFrequencyContainer.layoutParams = repeatablesFrequencyContainerParams
-                    }
-                    else -> {
-                        hideWeekOptions()
-                        hideMonthOptions()
-                    }
-                }
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>) {
-
-            }
-        }
-
-        // Repeat On
-        val repeatablesOnAdapter = ArrayAdapter.createFromResource(this,
-                R.array.repeatables_on, android.R.layout.simple_spinner_item)
-        repeatablesOnAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        this.repeatablesOnSpinner.adapter = repeatablesOnAdapter
-        this.repeatablesOnSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
-                generateSummary()
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>) {
-
-            }
-        }
-
-        // Every X
-        setupEveryXSpinner(repeatablesEveryXSpinner)
-        repeatablesEveryXSpinner.setOnValueChangedListener { _, _, _ -> generateSummary() }
-
-        // WeekDays
-        this.repeatablesFrequencyContainer.removeAllViews()
-        var weekdays = resources.getStringArray(R.array.weekdays)
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-        val dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
-                Integer.toString(Calendar.getInstance().firstDayOfWeek))
-        firstDayOfTheWeekHelper = FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek ?: "0"))
-        val weekdaysTemp = weekdays.asList()
-        Collections.rotate(weekdaysTemp, firstDayOfTheWeekHelper?.dailyTaskFormOffset ?: 0)
-        weekdays = weekdaysTemp.toTypedArray()
-
-        for (i in 0..6) {
-            val weekdayRow = layoutInflater.inflate(R.layout.row_checklist, this.repeatablesFrequencyContainer, false)
-            val checkbox = weekdayRow.findViewById<View>(R.id.checkbox) as? CheckBox
-            checkbox?.text = weekdays[i]
-            checkbox?.isChecked = true
-            checkbox?.setOnClickListener { generateSummary() }
-            checkbox.notNull { repeatablesWeekDayCheckboxes.add(it) }
-            repeatablesFrequencyContainer.addView(weekdayRow)
-        }
-
-        generateSummary()
-    }
-
-    override fun onRestoreInstanceState(savedInstanceState: Bundle) {}
-
-    private fun generateSummary() {
-        val frequency = repeatablesFrequencySpinner.selectedItem.toString()
-        val everyX = repeatablesEveryXSpinner.value.toString()
-        var frequencyQualifier = ""
-
-        when (frequency) {
-            "Daily" -> frequencyQualifier = "day(s)"
-            "Weekly" -> frequencyQualifier = "week(s)"
-            "Monthly" -> frequencyQualifier = "month(s)"
-            "Yearly" -> frequencyQualifier = "year(s)"
-        }
-
-        var weekdays: String
-        val weekdayStrings = ArrayList<String>()
-        val offset = firstDayOfTheWeekHelper?.dailyTaskFormOffset ?: 0
-        if (this.repeatablesWeekDayCheckboxes[offset].isChecked) {
-            weekdayStrings.add("Monday")
-        }
-        if (this.repeatablesWeekDayCheckboxes[(offset + 1) % 7].isChecked) {
-            weekdayStrings.add("Tuesday")
-        }
-        if (this.repeatablesWeekDayCheckboxes[(offset + 2) % 7].isChecked) {
-            weekdayStrings.add("Wednesday")
-        }
-        if (this.repeatablesWeekDayCheckboxes[(offset + 3) % 7].isChecked) {
-            weekdayStrings.add("Thursday")
-        }
-        if (this.repeatablesWeekDayCheckboxes[(offset + 4) % 7].isChecked) {
-            weekdayStrings.add("Friday")
-        }
-        if (this.repeatablesWeekDayCheckboxes[(offset + 5) % 7].isChecked) {
-            weekdayStrings.add("Saturday")
-        }
-        if (this.repeatablesWeekDayCheckboxes[(offset + 6) % 7].isChecked) {
-            weekdayStrings.add("Sunday")
-        }
-        weekdays = " on " + TextUtils.join(", ", weekdayStrings)
-        if (frequency != "Weekly") {
-            weekdays = ""
-        }
-
-        if (frequency == "Monthly") {
-            val calendar = startDateListener?.getCalendar()
-            val monthlyFreq = repeatablesOnSpinner.selectedItem.toString()
-            weekdays = if (monthlyFreq == "Day of Month") {
-                val date = calendar?.get(Calendar.DATE)
-                " on the " + date.toString()
-            } else {
-                val week = calendar?.get(Calendar.WEEK_OF_MONTH)
-                val dayLongName = calendar?.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG, Locale.getDefault())
-                " on the " + week.toString() + " week on " + dayLongName
-            }
-        }
-
-        val summary = resources.getString(R.string.repeat_summary, frequency, everyX, frequencyQualifier, weekdays)
-        summaryTextView.text = summary
-    }
-
-    private fun populateRepeatables(task: Task) {
-        // Frequency
-        var frequencySelection = 0
-        when {
-            task.frequency == "weekly" -> frequencySelection = 1
-            task.frequency == "monthly" -> frequencySelection = 2
-            task.frequency == "yearly" -> frequencySelection = 3
-        }
-        this.repeatablesFrequencySpinner.setSelection(frequencySelection)
-        this.repeatablesEveryXSpinner.value = task.everyX ?: 0
-
-        if (task.frequency == "weekly") {
-            if (repeatablesWeekDayCheckboxes.size == 7) {
-                val offset = firstDayOfTheWeekHelper?.dailyTaskFormOffset ?: 0
-                this.repeatablesWeekDayCheckboxes[offset].isChecked = this.task?.repeat?.m ?: false
-                this.repeatablesWeekDayCheckboxes[(offset + 1) % 7].isChecked = this.task?.repeat?.t ?: false
-                this.repeatablesWeekDayCheckboxes[(offset + 2) % 7].isChecked = this.task?.repeat?.w ?: false
-                this.repeatablesWeekDayCheckboxes[(offset + 3) % 7].isChecked = this.task?.repeat?.th ?: false
-                this.repeatablesWeekDayCheckboxes[(offset + 4) % 7].isChecked = this.task?.repeat?.f ?: false
-                this.repeatablesWeekDayCheckboxes[(offset + 5) % 7].isChecked = this.task?.repeat?.s ?: false
-                this.repeatablesWeekDayCheckboxes[(offset + 6) % 7].isChecked = this.task?.repeat?.su ?: false
-            }
-        }
-
-        setUpRepeatsOn(task)
-    }
-
-    private fun setUpRepeatsOn(task: Task) {
-        this.repeatablesOnSpinner.setSelection(0)
-        if (task.getWeeksOfMonth()?.isNotEmpty() == true) {
-            this.repeatablesOnSpinner.setSelection(1)
-        }
-    }
-
-    private fun setupEveryXSpinner(frequencyPicker: NumberPicker) {
-        frequencyPicker.minValue = 0
-        frequencyPicker.maxValue = 366
-        frequencyPicker.value = 1
-    }
-
-    private fun createCheckListRecyclerView() {
-        checklistAdapter = CheckListAdapter()
-
-        val llm = LinearLayoutManager(this)
-        llm.orientation = RecyclerView.VERTICAL
-
-        recyclerView.layoutManager = llm
-        recyclerView.adapter = checklistAdapter
-
-        recyclerView.layoutManager = WrapContentRecyclerViewLayoutManager(this)
-
-        val callback = SimpleItemTouchHelperCallback(checklistAdapter)
-        val mItemTouchHelper = ItemTouchHelper(callback)
-        mItemTouchHelper.attachToRecyclerView(recyclerView)
-        addChecklistItemButton.setOnClickListener { addChecklistItem() }
-    }
-
-    private fun populateChecklistRecyclerView() {
-        var checklistItems: List<ChecklistItem> = ArrayList()
-        if (task?.isManaged == true) {
-            task?.checklist.notNull {
-                checklistItems = taskRepository.getUnmanagedCopy(it)
-            }
-        }
-        checklistAdapter?.setItems(checklistItems)
-    }
-
-    private fun addChecklistItem() {
-        val text = newCheckListEditText?.text?.toString() ?: ""
-        val item = ChecklistItem(null, text)
-        checklistAdapter?.addItem(item)
-        newCheckListEditText?.setText("")
-    }
-
-    private fun createRemindersRecyclerView() {
-        taskType.notNull { remindersAdapter = RemindersAdapter(it) }
-
-        val llm = LinearLayoutManager(this)
-        llm.orientation = RecyclerView.VERTICAL
-
-        remindersRecyclerView.layoutManager = llm
-        remindersRecyclerView.adapter = remindersAdapter
-
-        remindersRecyclerView.layoutManager = WrapContentRecyclerViewLayoutManager(this)
-
-
-        val callback = SimpleItemTouchHelperCallback(remindersAdapter)
-        val mItemTouchHelper = ItemTouchHelper(callback)
-        mItemTouchHelper.attachToRecyclerView(remindersRecyclerView)
-        newRemindersEditText.setOnClickListener { selectNewReminderTime() }
-    }
-
-    private fun populateRemindersRecyclerView() {
-        var reminders: List<RemindersItem> = ArrayList()
-        task?.reminders.notNull {
-            reminders = taskRepository.getUnmanagedCopy(it)
-        }
-
-        remindersAdapter?.setReminders(reminders)
-    }
-
-    private fun addNewReminder(remindersItem: RemindersItem) {
-        remindersAdapter?.addItem(remindersItem)
-    }
-
-    private fun selectNewReminderTime() {
-        remindersManager.createReminderTimeDialog({ item -> item.notNull { this.addNewReminder(it) } }, taskType, this, null)
-    }
-
-    private fun createTagsCheckBoxes() {
-        this.tagsContainerLinearLayout.removeAllViews()
-        for ((position, tag) in (tags ?: emptyList()).withIndex()) {
-            val row = layoutInflater.inflate(R.layout.row_checklist, this.tagsContainerLinearLayout, false) as? TableRow
-            val checkbox = row?.findViewById<View>(R.id.checkbox) as? CheckBox
-            row?.id = position
-            checkbox?.text = tag.name // set text Name
-            checkbox?.id = position
-            //This is to check if the tag was selected by the user. Similar to onClickListener
-            checkbox?.setOnCheckedChangeListener { buttonView, _ ->
-                if (buttonView.isChecked) {
-                    if (selectedTags?.contains(tag) == false) {
-                        selectedTags?.add(tag)
-                    }
-                } else {
-                    if (selectedTags?.contains(tag) == true) {
-                        selectedTags?.remove(tag)
-                    }
-                }
-            }
-            checkbox?.isChecked = taskFilterHelper.isTagChecked(tag.getId())
-            tagsContainerLinearLayout.addView(row)
-            checkbox.notNull { tagCheckBoxList?.add(it) }
-        }
-
-        if (task != null) {
-            fillTagCheckboxes()
-        }
-    }
-
-    private fun setTaskTitle(task: Task?) {
-        val actionBar = supportActionBar
-
-        if (actionBar != null) {
-
-            var title = ""
-
-            if (task != null && task.isValid) {
-                title = resources.getString(R.string.action_edit) + " " + task.text
-            } else {
-                when (taskType) {
-                    Task.TYPE_TODO -> title = resources.getString(R.string.new_todo)
-                    Task.TYPE_DAILY -> title = resources.getString(R.string.new_daily)
-                    Task.TYPE_HABIT -> title = resources.getString(R.string.new_habit)
-                    Task.TYPE_REWARD -> title = resources.getString(R.string.new_reward)
-                }
-            }
-
-            actionBar.title = title
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater.inflate(R.menu.menu_save, menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        val id = item.itemId
-
-
-        if (id == R.id.action_save_changes) {
-            finishActivitySuccessfully()
-            return true
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun populate(task: Task) {
-        if (!task.isValid) {
-            return
-        }
-        taskText.setText(task.text)
-        taskNotes.setText(task.notes)
-        taskValue.setText(String.format(Locale.getDefault(), "%.2f", task.value))
-
-        for (tag in task.tags ?: emptyList<Tag>()) {
-            selectedTags?.add(tag)
-        }
-
-        if (tags != null) {
-            fillTagCheckboxes()
-        }
-
-        val priority = task.priority
-        when {
-            Math.abs(priority - 0.1) < 0.000001 -> this.taskDifficultySpinner.setSelection(0)
-            Math.abs(priority - 1.0) < 0.000001 -> this.taskDifficultySpinner.setSelection(1)
-            Math.abs(priority - 1.5) < 0.000001 -> this.taskDifficultySpinner.setSelection(2)
-            Math.abs(priority - 2.0) < 0.000001 -> this.taskDifficultySpinner.setSelection(3)
-        }
-
-        val attribute = task.attribute
-        if (attribute != null) {
-            when (attribute) {
-                Stats.STRENGTH -> taskAttributeSpinner.setSelection(0)
-                Stats.INTELLIGENCE -> taskAttributeSpinner.setSelection(1)
-                Stats.CONSTITUTION -> taskAttributeSpinner.setSelection(2)
-                Stats.PERCEPTION -> taskAttributeSpinner.setSelection(3)
-            }
-        }
-
-        if (task.type == Task.TYPE_HABIT) {
-            positiveCheckBox.isChecked = task.up ?: false
-            negativeCheckBox.isChecked = task.down ?: false
-
-            val resetFrequency = task.frequency
-            if (resetFrequency != null) {
-                when (resetFrequency) {
-                    Task.FREQUENCY_DAILY -> taskResetFrequencySpinner.setSelection(0)
-                    Task.FREQUENCY_WEEKLY -> taskResetFrequencySpinner.setSelection(1)
-                    Task.FREQUENCY_MONTHLY -> taskResetFrequencySpinner.setSelection(2)
-                }
-            }
-        }
-
-        if (task.type == Task.TYPE_DAILY) {
-
-            if (task.startDate != null) {
-                startDateListener?.setCalendar(task.startDate)
-            }
-
-            populateRepeatables(task)
-        }
-
-        if (task.type == Task.TYPE_TODO) {
-            if (task.dueDate != null) {
-                dueDateCheckBox.isChecked = true
-                dueDateListener?.setCalendar(task.dueDate)
-            }
-        }
-
-        if (task.isGroupTask) {
-            AlertDialog.Builder(this)
-                    .setTitle(R.string.group_tasks_edit_title)
-                    .setMessage(R.string.group_tasks_edit_description)
-                    .setPositiveButton(android.R.string.ok) { _, _ -> finish() }
-                    .show()
-        }
-    }
-
-    private fun fillTagCheckboxes() {
-        for (tag in task?.tags ?: emptyList<Tag>()) {
-            val position = tags?.indexOf(tag) ?: 0
-            if (tagCheckBoxList?.size ?: 0 > position && position >= 0) {
-                tagCheckBoxList?.get(position)?.isChecked = true
-            }
-        }
-    }
-
-    @Suppress("ReturnCount")
-    private fun saveTask(task: Task): Boolean {
-
-        val text = MarkdownParser.parseCompiled(taskText.text)
-        if (text == null || text.isEmpty()) {
-            return false
-        }
-
-        if (!task.isValid) {
-            return true
-        }
-
-        taskRepository.executeTransaction(Realm.Transaction { realm ->
-            try {
-                task.text = text
-                task.notes = MarkdownParser.parseCompiled(taskNotes.text)
-            } catch (ignored: IllegalArgumentException) {
-
-            }
-
-            if (checklistAdapter != null) {
-                val newChecklist = RealmList<ChecklistItem>()
-                checklistAdapter?.checkListItems.notNull { newChecklist.addAll(realm.copyToRealmOrUpdate(it)) }
-                task.checklist = newChecklist
-            }
-            if (remindersAdapter != null) {
-                val newReminders = RealmList<RemindersItem>()
-                remindersAdapter?.remindersItems.notNull { newReminders.addAll(realm.copyToRealmOrUpdate(it)) }
-                task.reminders = newReminders
-            }
-
-
-            val taskTags = RealmList<Tag>()
-            selectedTags.notNull { taskTags.addAll(it) }
-            task.tags = taskTags
-
-
-            task.priority = when {
-                taskDifficultySpinner.selectedItemPosition == 0 -> 0.1
-                taskDifficultySpinner.selectedItemPosition == 1 -> 1.0
-                taskDifficultySpinner.selectedItemPosition == 2 -> 1.5
-                taskDifficultySpinner.selectedItemPosition == 3 -> 2.0
-                else -> { 1.0 }
-            }.toFloat()
-
-            if (!taskBasedAllocation) {
-                task.attribute = Stats.STRENGTH
-            } else {
-                when (taskAttributeSpinner.selectedItemPosition) {
-                    0 -> task.attribute = Stats.STRENGTH
-                    1 -> task.attribute = Stats.INTELLIGENCE
-                    2 -> task.attribute = Stats.CONSTITUTION
-                    3 -> task.attribute = Stats.PERCEPTION
-                }
-            }
-
-            when (task.type) {
-                Task.TYPE_HABIT -> {
-                    task.up = positiveCheckBox.isChecked
-                    task.down = negativeCheckBox.isChecked
-
-                    task.frequency = when (taskResetFrequencySpinner.selectedItemPosition) {
-                        0 -> Task.FREQUENCY_DAILY
-                        1 -> Task.FREQUENCY_WEEKLY
-                        2 -> Task.FREQUENCY_MONTHLY
-                        else -> ""
-                    }
-                }
-
-                Task.TYPE_DAILY -> {
-                    task.startDate = Date(startDateListener?.getCalendar()?.timeInMillis ?: Date().time)
-
-                    val frequency = this.repeatablesFrequencySpinner.selectedItemPosition
-                    var frequencyString = ""
-                    when (frequency) {
-                        0 -> frequencyString = "daily"
-                        1 -> frequencyString = "weekly"
-                        2 -> frequencyString = "monthly"
-                        3 -> frequencyString = "yearly"
-                    }
-                    task.frequency = frequencyString
-
-                    task.everyX = this.repeatablesEveryXSpinner.value
-
-                    var repeat = task.repeat
-                    if (repeat == null) {
-                        repeat = Days()
-                        task.repeat = repeat
-                    }
-
-                    if ("weekly" == frequencyString) {
-                        val offset = firstDayOfTheWeekHelper?.dailyTaskFormOffset ?: 0
-                        repeat.m = this.repeatablesWeekDayCheckboxes[offset].isChecked
-                        repeat.t = this.repeatablesWeekDayCheckboxes[(offset + 1) % 7].isChecked
-                        repeat.w = this.repeatablesWeekDayCheckboxes[(offset + 2) % 7].isChecked
-                        repeat.th = this.repeatablesWeekDayCheckboxes[(offset + 3) % 7].isChecked
-                        repeat.f = this.repeatablesWeekDayCheckboxes[(offset + 4) % 7].isChecked
-                        repeat.s = this.repeatablesWeekDayCheckboxes[(offset + 5) % 7].isChecked
-                        repeat.su = this.repeatablesWeekDayCheckboxes[(offset + 6) % 7].isChecked
-                    }
-
-                    if ("monthly" == frequencyString) {
-                        val calendar = startDateListener?.getCalendar()
-                        val monthlyFreq = repeatablesOnSpinner.selectedItem.toString()
-
-                        if (monthlyFreq == "Day of Month") {
-                            val date = calendar?.get(Calendar.DATE)
-                            val daysOfMonth = ArrayList<Int>()
-                            date.notNull { daysOfMonth.add(it) }
-                            task.setDaysOfMonth(daysOfMonth)
-                            task.setWeeksOfMonth(ArrayList())
-                        } else {
-                            val week = calendar?.get(Calendar.WEEK_OF_MONTH)
-                            val weeksOfMonth = ArrayList<Int>()
-                            week.notNull { weeksOfMonth.add(it) }
-                            task.setWeeksOfMonth(weeksOfMonth)
-                            task.setDaysOfMonth(ArrayList())
-                        }
-                    }
-                }
-
-                Task.TYPE_TODO -> {
-                    if (dueDateCheckBox.isChecked) {
-                        task.dueDate = Date(dueDateListener?.getCalendar()?.timeInMillis ?: Date().time)
-                    } else {
-                        task.dueDate = null
-                    }
-                }
-
-                Task.TYPE_REWARD -> {
-                    val value = taskValue.text.toString()
-                    if (!value.isEmpty()) {
-                        val localFormat = DecimalFormat.getInstance(Locale.getDefault())
-                        try {
-                            task.value = localFormat.parse(value).toDouble()
-                        } catch (ignored: ParseException) {
-                        }
-
-                    } else {
-                        task.value = 0.0
-                    }
-
-                }
-            }
-        })
-        return true
-    }
-
-    private fun prepareSave() {
-        var thisTask = task
-        if (thisTask == null) {
-            thisTask = Task()
-            thisTask.type = taskType ?: "habit"
-        }
-
-        if (this.saveTask(thisTask) && thisTask.isValid) {
-            if (!shouldSaveTask) {
-                task = thisTask
-                return
-            }
-            //send back to other elements.
-            if (thisTask.id == null || thisTask.id?.isEmpty() == true) {
-                taskRepository.createTaskInBackground(thisTask)
-            } else {
-                taskRepository.updateTaskInBackground(thisTask)
-            }
-            val unmanagedTask = taskRepository.getUnmanagedCopy(thisTask)
-            taskAlarmManager.scheduleAlarmsForTask(unmanagedTask)
-        }
-    }
-
-    override fun onSupportNavigateUp(): Boolean {
-        finish()
-        dismissKeyboard()
-        return true
-    }
-
-    override fun onBackPressed() {
-        finish()
-        dismissKeyboard()
-    }
-
-    private fun finishActivitySuccessfully() {
-        this.prepareSave()
-        finishWithSuccess()
-        dismissKeyboard()
-    }
-
-    private fun finishWithSuccess() {
-        val mainHandler = Handler(this.mainLooper)
-        mainHandler.postDelayed({
-            val resultIntent = Intent()
-            resultIntent.putExtra(OldTaskFormActivity.TASK_TYPE_KEY, taskType)
-            if (!shouldSaveTask) {
-                resultIntent.putExtra(OldTaskFormActivity.PARCELABLE_TASK, task)
-            }
-            setResult(Activity.RESULT_OK, resultIntent)
-            finish()
-        }, 500)
-    }
-
-    private fun dismissKeyboard() {
-        val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
-        val currentFocus = currentFocus
-        if (currentFocus != null) {
-            imm?.hideSoftInputFromWindow(currentFocus.windowToken, 0)
-        }
-    }
-
-    private inner class DateEditTextListener internal constructor(internal var datePickerText: EditText) : View.OnClickListener, DatePickerDialog.OnDateSetListener {
-        internal var calendar: Calendar = Calendar.getInstance()
-        internal var datePickerDialog: DatePickerDialog
-        internal var dateFormatter: DateFormat
-
-        init {
-            this.datePickerText.setOnClickListener(this)
-            this.dateFormatter = DateFormat.getDateInstance()
-            this.datePickerDialog = DatePickerDialog(datePickerText.context, this,
-                    calendar.get(Calendar.YEAR),
-                    calendar.get(Calendar.MONTH),
-                    calendar.get(Calendar.DAY_OF_MONTH))
-
-            val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext)
-            val dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
-                    Integer.toString(Calendar.getInstance().firstDayOfWeek))
-            val firstDayOfTheWeekHelper = FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek ?: "0"))
-            datePickerDialog.datePicker.firstDayOfWeek = firstDayOfTheWeekHelper
-                        .firstDayOfTheWeek
-
-            this.datePickerDialog.setButton(DialogInterface.BUTTON_NEUTRAL, resources.getString(R.string.today)) { _, _ -> setCalendar(Calendar.getInstance().time) }
-            updateDateText()
-        }
-
-        override fun onClick(view: View) {
-            datePickerDialog.show()
-        }
-
-        override fun onDateSet(view: DatePicker, year: Int, monthOfYear: Int, dayOfMonth: Int) {
-            calendar.set(year, monthOfYear, dayOfMonth)
-            updateDateText()
-        }
-
-        @Suppress("UnsafeCast")
-        fun getCalendar(): Calendar {
-            return calendar.clone() as Calendar
-        }
-
-        fun setCalendar(date: Date?) {
-            calendar.time = date
-            datePickerDialog.updateDate(calendar.get(Calendar.YEAR),
-                    calendar.get(Calendar.MONTH),
-                    calendar.get(Calendar.DAY_OF_MONTH))
-            updateDateText()
-        }
-
-        private fun updateDateText() {
-            datePickerText.setText(dateFormatter.format(calendar.time))
-        }
-    }
-
-    companion object {
-        const val TASK_ID_KEY = "taskId"
-        const val USER_ID_KEY = "userId"
-        const val TASK_TYPE_KEY = "type"
-        const val SHOW_TAG_SELECTION = "show_tag_selection"
-        const val ALLOCATION_MODE_KEY = "allocationModeKey"
-        const val SHOW_CHECKLIST = "show_checklist"
-
-        const val PARCELABLE_TASK = "parcelable_task"
-        const val SAVE_TO_DB = "saveToDb"
-
-        // in order to disable the event handler in MainActivity
-        const val SET_IGNORE_FLAG = "ignoreFlag"
-    }
-}
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 1fd4deb8a..8ad2e0697 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -1,6 +1,8 @@
 package com.habitrpg.android.habitica.ui.activities
 
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.View
@@ -27,6 +29,7 @@ import io.reactivex.functions.Consumer
 import javax.inject.Inject
 import android.content.res.ColorStateList
 import android.graphics.drawable.ColorDrawable
+import android.os.Handler
 import android.view.MenuItem
 import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.widget.AppCompatCheckBox
@@ -81,6 +84,7 @@ class TaskFormActivity : BaseActivity() {
     private val tagsWrapper: LinearLayout by bindView(R.id.tags_wrapper)
 
     private var isCreating = true
+    private var isChallengeTask = false
     private var usesTaskAttributeStats = false
     private var task: Task? = null
     private var taskType: String = ""
@@ -120,16 +124,10 @@ class TaskFormActivity : BaseActivity() {
 
         val bundle = intent.extras ?: return
 
-        taskType = bundle.getString(OldTaskFormActivity.TASK_TYPE_KEY) ?: Task.TYPE_HABIT
-        val taskId = bundle.getString(OldTaskFormActivity.TASK_ID_KEY)
-        if (taskId != null) {
-            isCreating = false
-            compositeSubscription.add(taskRepository.getUnmanagedTask(taskId).firstElement().subscribe(Consumer {
-                task = it
-                //tintColor = ContextCompat.getColor(this, it.mediumTaskColor)
-                fillForm(it)
-            }, RxErrorHandler.handleEmptyError()))
-        }
+        isChallengeTask = bundle.getBoolean(IS_CHALLENGE_TASK, false)
+
+        taskType = bundle.getString(TASK_TYPE_KEY) ?: Task.TYPE_HABIT
+        val taskId = bundle.getString(TASK_ID_KEY)
 
         compositeSubscription.add(tagRepository.getTags()
                 .map { tagRepository.getUnmanagedCopy(it) }
@@ -148,6 +146,18 @@ class TaskFormActivity : BaseActivity() {
         statPerceptionButton.setOnClickListener { selectedStat = Stats.PERCEPTION }
 
         configureForm()
+
+        if (taskId != null) {
+            isCreating = false
+            compositeSubscription.add(taskRepository.getUnmanagedTask(taskId).firstElement().subscribe(Consumer {
+                task = it
+                //tintColor = ContextCompat.getColor(this, it.mediumTaskColor)
+                fillForm(it)
+            }, RxErrorHandler.handleEmptyError()))
+        } else if (bundle.containsKey(PARCELABLE_TASK)) {
+            task = bundle.getParcelable(PARCELABLE_TASK)
+            task?.let { fillForm(it) }
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -186,11 +196,11 @@ class TaskFormActivity : BaseActivity() {
 
         val todoDailyViewsVisibility = if (taskType == Task.TYPE_DAILY || taskType == Task.TYPE_TODO) View.VISIBLE else View.GONE
 
-        checklistTitleView.visibility = todoDailyViewsVisibility
-        checklistContainer.visibility = todoDailyViewsVisibility
+        checklistTitleView.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
+        checklistContainer.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
 
-        remindersTitleView.visibility = todoDailyViewsVisibility
-        remindersContainer.visibility = todoDailyViewsVisibility
+        remindersTitleView.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
+        remindersContainer.visibility = if (isChallengeTask) View.GONE else todoDailyViewsVisibility
 
         taskSchedulingTitleView.visibility = todoDailyViewsVisibility
         taskSchedulingControls.visibility = todoDailyViewsVisibility
@@ -204,6 +214,8 @@ class TaskFormActivity : BaseActivity() {
         rewardValueTitleView.visibility = rewardViewsVisibility
         rewardValueFormView.visibility = rewardViewsVisibility
 
+        tagsWrapper.visibility = if (isChallengeTask) View.GONE else View.VISIBLE
+
         statWrapper.visibility = if (usesTaskAttributeStats) View.VISIBLE else View.GONE
         if (isCreating) {
             adjustStreakTitleView.visibility = View.GONE
@@ -319,25 +331,36 @@ class TaskFormActivity : BaseActivity() {
             thisTask.value = rewardValueFormView.value
         }
 
-        if (taskType == Task.TYPE_DAILY || taskType == Task.TYPE_TODO) {
-            thisTask.checklist = checklistContainer.checklistItems
-            thisTask.reminders = remindersContainer.reminders
-        }
-        thisTask.tags = RealmList()
-        tagsWrapper.forEachIndexed { index, view ->
-            val tagView = view as? CheckBox
-            if (tagView?.isChecked == true) {
-                thisTask.tags?.add(tags[index])
+        val resultIntent = Intent()
+        resultIntent.putExtra(TASK_TYPE_KEY, taskType)
+        if (!isChallengeTask) {
+            if (taskType == Task.TYPE_DAILY || taskType == Task.TYPE_TODO) {
+                thisTask.checklist = checklistContainer.checklistItems
+                thisTask.reminders = remindersContainer.reminders
             }
+            thisTask.tags = RealmList()
+            tagsWrapper.forEachIndexed { index, view ->
+                val tagView = view as? CheckBox
+                if (tagView?.isChecked == true) {
+                    thisTask.tags?.add(tags[index])
+                }
+            }
+
+            if (isCreating) {
+                taskRepository.createTaskInBackground(thisTask)
+            } else {
+                taskRepository.updateTaskInBackground(thisTask)
+            }
+        } else {
+                resultIntent.putExtra(PARCELABLE_TASK, thisTask)
         }
 
-        if (isCreating) {
-            taskRepository.createTaskInBackground(thisTask)
-        } else {
-            taskRepository.updateTaskInBackground(thisTask)
-        }
-        dismissKeyboard()
-        finish()
+        val mainHandler = Handler(this.mainLooper)
+        mainHandler.postDelayed({
+            setResult(Activity.RESULT_OK, resultIntent)
+            dismissKeyboard()
+            finish()
+        }, 500)
     }
 
     private fun deleteTask() {
@@ -356,8 +379,11 @@ class TaskFormActivity : BaseActivity() {
 
     companion object {
         const val TASK_ID_KEY = "taskId"
+        const val USER_ID_KEY = "userId"
         const val TASK_TYPE_KEY = "type"
-        const val SHOW_TAG_SELECTION = "show_tag_selection"
+        const val IS_CHALLENGE_TASK = "isChallengeTask"
+
+        const val PARCELABLE_TASK = "parcelable_task"
 
         // in order to disable the event handler in MainActivity
         const val SET_IGNORE_FLAG = "ignoreFlag"
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 255e3f0b7..04359b1bb 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
@@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.extensions.notNull
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.activities.OldTaskFormActivity
 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
@@ -287,8 +286,7 @@ class TasksFragment : BaseMainFragment() {
         }
 
         val bundle = Bundle()
-        bundle.putString(OldTaskFormActivity.TASK_TYPE_KEY, type)
-        bundle.putBoolean(OldTaskFormActivity.SAVE_TO_DB, true)
+        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type)
 
         val intent = Intent(activity, TaskFormActivity::class.java)
         intent.putExtras(bundle)
@@ -306,8 +304,8 @@ class TasksFragment : BaseMainFragment() {
         }
 
         val bundle = Bundle()
-        bundle.putString(OldTaskFormActivity.TASK_TYPE_KEY, event.Task.type)
-        bundle.putString(OldTaskFormActivity.TASK_ID_KEY, event.Task.id)
+        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, event.Task.type)
+        bundle.putString(TaskFormActivity.TASK_ID_KEY, event.Task.id)
 
         val intent = Intent(activity, TaskFormActivity::class.java)
         intent.putExtras(bundle)
@@ -334,7 +332,7 @@ class TasksFragment : BaseMainFragment() {
 
     private fun onTaskCreatedResult(resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
-            val taskType = data?.getStringExtra(OldTaskFormActivity.TASK_TYPE_KEY)
+            val taskType = data?.getStringExtra(TaskFormActivity.TASK_TYPE_KEY)
             if (taskType != null) {
                 switchToTaskTab(taskType)
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistContainer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistContainer.kt
index 6085058e5..df841dcc2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistContainer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistContainer.kt
@@ -44,7 +44,7 @@ class ChecklistContainer @JvmOverloads constructor(
         }
 
     init {
-        orientation = LinearLayout.VERTICAL
+        orientation = VERTICAL
 
         addChecklistViewAt(0)
     }
@@ -77,7 +77,7 @@ class ChecklistContainer @JvmOverloads constructor(
         } else {
             addView(view, indexToUse)
         }
-        val layoutParams = view.layoutParams as? LinearLayout.LayoutParams
+        val layoutParams = view.layoutParams as? LayoutParams
         layoutParams?.updateMargins(bottom = 8.dpToPx(context))
         view.layoutParams = layoutParams
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
index 1956be9d3..6864b9015 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
@@ -1,26 +1,24 @@
 package com.habitrpg.android.habitica.ui.views.tasks.form
 
-import android.animation.ObjectAnimator
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.AttributeSet
 import android.view.Gravity
 import android.view.ViewGroup
+import android.view.animation.Animation
+import android.view.animation.LinearInterpolator
+import android.view.animation.RotateAnimation
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.LinearLayout
+import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.ui.helpers.bindView
-import android.view.animation.LinearInterpolator
-import android.view.animation.Animation
-import android.view.animation.RotateAnimation
-
-
 
 
 class ChecklistItemFormView @JvmOverloads constructor(
@@ -29,7 +27,7 @@ class ChecklistItemFormView @JvmOverloads constructor(
 
 
     private val button: ImageButton by bindView(R.id.button)
-    private val editText: EditText by bindView(R.id.edit_text)
+    private val editText: AppCompatEditText by bindView(R.id.edit_text)
 
     var item: ChecklistItem = ChecklistItem()
     set(value) {