diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index cb19540e8..52758b2ef 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="168"
-    android:versionName="1.0"
+    android:versionCode="181"
+    android:versionName="1.0.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
 
diff --git a/Habitica/assets/migrations/Habitica/36.sql b/Habitica/assets/migrations/Habitica/36.sql
new file mode 100644
index 000000000..fb0615344
--- /dev/null
+++ b/Habitica/assets/migrations/Habitica/36.sql
@@ -0,0 +1 @@
+ALTER TABLE Customization ADD COLUMN isBuyable bool;
\ No newline at end of file
diff --git a/Habitica/res/anim/fab_slide_in.xml b/Habitica/res/anim/fab_slide_in.xml
index 1675a9ae1..bac34df5b 100644
--- a/Habitica/res/anim/fab_slide_in.xml
+++ b/Habitica/res/anim/fab_slide_in.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromYDelta="100%" android:toYDelta="0%"/>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="200">
+	<translate
+		android:fromYDelta="100%"
+		android:toYDelta="0%"/>
 </set>
\ No newline at end of file
diff --git a/Habitica/res/anim/fab_slide_out.xml b/Habitica/res/anim/fab_slide_out.xml
index b82f4d744..6d97fbbe2 100644
--- a/Habitica/res/anim/fab_slide_out.xml
+++ b/Habitica/res/anim/fab_slide_out.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromYDelta="0%" android:toYDelta="100%"/>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="200">
+	<translate android:fromYDelta="0%"
+		android:toYDelta="100%"
+		/>
 </set>
\ No newline at end of file
diff --git a/Habitica/res/drawable-hdpi/add_daily.png b/Habitica/res/drawable-hdpi/add_daily.png
new file mode 100644
index 000000000..827707188
Binary files /dev/null and b/Habitica/res/drawable-hdpi/add_daily.png differ
diff --git a/Habitica/res/drawable-hdpi/add_habit.png b/Habitica/res/drawable-hdpi/add_habit.png
new file mode 100644
index 000000000..575ace093
Binary files /dev/null and b/Habitica/res/drawable-hdpi/add_habit.png differ
diff --git a/Habitica/res/drawable-hdpi/add_rewards.png b/Habitica/res/drawable-hdpi/add_rewards.png
new file mode 100644
index 000000000..98e497f00
Binary files /dev/null and b/Habitica/res/drawable-hdpi/add_rewards.png differ
diff --git a/Habitica/res/drawable-hdpi/add_todo.png b/Habitica/res/drawable-hdpi/add_todo.png
new file mode 100644
index 000000000..0f309e182
Binary files /dev/null and b/Habitica/res/drawable-hdpi/add_todo.png differ
diff --git a/Habitica/res/drawable-hdpi/custom_reward.png b/Habitica/res/drawable-hdpi/custom_reward.png
new file mode 100644
index 000000000..607da8168
Binary files /dev/null and b/Habitica/res/drawable-hdpi/custom_reward.png differ
diff --git a/Habitica/res/drawable-hdpi/fab_add_purple.png b/Habitica/res/drawable-hdpi/fab_add_purple.png
new file mode 100644
index 000000000..389296895
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fab_add_purple.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-hdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 000000000..e11b6deff
Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_add_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.png b/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.png
new file mode 100644
index 000000000..d19ca4a7d
Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-hdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 000000000..1edcf3bb1
Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_close_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-hdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 000000000..6d08e8f7f
Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_create_grey_400_18dp.png differ
diff --git a/Habitica/res/drawable-hdpi/justin_textbox.png b/Habitica/res/drawable-hdpi/justin_textbox.png
index ef95baee9..07db1dbf7 100644
Binary files a/Habitica/res/drawable-hdpi/justin_textbox.png and b/Habitica/res/drawable-hdpi/justin_textbox.png differ
diff --git a/Habitica/res/drawable-hdpi/speechbubble_caret.png b/Habitica/res/drawable-hdpi/speechbubble_caret.png
new file mode 100644
index 000000000..a74021cdd
Binary files /dev/null and b/Habitica/res/drawable-hdpi/speechbubble_caret.png differ
diff --git a/Habitica/res/drawable-mdpi/add_daily.png b/Habitica/res/drawable-mdpi/add_daily.png
new file mode 100644
index 000000000..51e2ed5cd
Binary files /dev/null and b/Habitica/res/drawable-mdpi/add_daily.png differ
diff --git a/Habitica/res/drawable-mdpi/add_habit.png b/Habitica/res/drawable-mdpi/add_habit.png
new file mode 100644
index 000000000..54bd1dc25
Binary files /dev/null and b/Habitica/res/drawable-mdpi/add_habit.png differ
diff --git a/Habitica/res/drawable-mdpi/add_rewards.png b/Habitica/res/drawable-mdpi/add_rewards.png
new file mode 100644
index 000000000..6d26f7a63
Binary files /dev/null and b/Habitica/res/drawable-mdpi/add_rewards.png differ
diff --git a/Habitica/res/drawable-mdpi/add_todo.png b/Habitica/res/drawable-mdpi/add_todo.png
new file mode 100644
index 000000000..f7fbc2f05
Binary files /dev/null and b/Habitica/res/drawable-mdpi/add_todo.png differ
diff --git a/Habitica/res/drawable-mdpi/custom_reward.png b/Habitica/res/drawable-mdpi/custom_reward.png
new file mode 100644
index 000000000..fd3b100f0
Binary files /dev/null and b/Habitica/res/drawable-mdpi/custom_reward.png differ
diff --git a/Habitica/res/drawable-mdpi/fab_add_purple.png b/Habitica/res/drawable-mdpi/fab_add_purple.png
new file mode 100644
index 000000000..dc57e3583
Binary files /dev/null and b/Habitica/res/drawable-mdpi/fab_add_purple.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-mdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 000000000..389296895
Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_add_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.png b/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.png
new file mode 100644
index 000000000..8629e9845
Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-mdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 000000000..d19ca4a7d
Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_close_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-mdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 000000000..98fb7cadc
Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_create_grey_400_18dp.png differ
diff --git a/Habitica/res/drawable-mdpi/justin_textbox.png b/Habitica/res/drawable-mdpi/justin_textbox.png
index d18a0a134..69d2fc879 100644
Binary files a/Habitica/res/drawable-mdpi/justin_textbox.png and b/Habitica/res/drawable-mdpi/justin_textbox.png differ
diff --git a/Habitica/res/drawable-mdpi/speechbubble_caret.png b/Habitica/res/drawable-mdpi/speechbubble_caret.png
new file mode 100644
index 000000000..201cc54d0
Binary files /dev/null and b/Habitica/res/drawable-mdpi/speechbubble_caret.png differ
diff --git a/Habitica/res/drawable-xhdpi/add_daily.png b/Habitica/res/drawable-xhdpi/add_daily.png
new file mode 100644
index 000000000..f4f873e41
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/add_daily.png differ
diff --git a/Habitica/res/drawable-xhdpi/add_habit.png b/Habitica/res/drawable-xhdpi/add_habit.png
new file mode 100644
index 000000000..f4959d029
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/add_habit.png differ
diff --git a/Habitica/res/drawable-xhdpi/add_rewards.png b/Habitica/res/drawable-xhdpi/add_rewards.png
new file mode 100644
index 000000000..08b316c7a
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/add_rewards.png differ
diff --git a/Habitica/res/drawable-xhdpi/add_todo.png b/Habitica/res/drawable-xhdpi/add_todo.png
new file mode 100644
index 000000000..6e4e4d411
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/add_todo.png differ
diff --git a/Habitica/res/drawable-xhdpi/custom_reward.png b/Habitica/res/drawable-xhdpi/custom_reward.png
new file mode 100644
index 000000000..96965ead2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/custom_reward.png differ
diff --git a/Habitica/res/drawable-xhdpi/fab_add_purple.png b/Habitica/res/drawable-xhdpi/fab_add_purple.png
new file mode 100644
index 000000000..fbc446892
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fab_add_purple.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-xhdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 000000000..9673011ec
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_add_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.png b/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.png
new file mode 100644
index 000000000..19335a7ce
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-xhdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 000000000..4a36f5d68
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_close_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-xhdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 000000000..4d91ce731
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_create_grey_400_18dp.png differ
diff --git a/Habitica/res/drawable-xhdpi/justin_textbox.png b/Habitica/res/drawable-xhdpi/justin_textbox.png
index c4f35553c..e1cb6b96b 100644
Binary files a/Habitica/res/drawable-xhdpi/justin_textbox.png and b/Habitica/res/drawable-xhdpi/justin_textbox.png differ
diff --git a/Habitica/res/drawable-xhdpi/speechbubble_caret.png b/Habitica/res/drawable-xhdpi/speechbubble_caret.png
new file mode 100644
index 000000000..60a434569
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/speechbubble_caret.png differ
diff --git a/Habitica/res/drawable-xxhdpi/add_daily.png b/Habitica/res/drawable-xxhdpi/add_daily.png
new file mode 100644
index 000000000..8f4bfdc86
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/add_daily.png differ
diff --git a/Habitica/res/drawable-xxhdpi/add_habit.png b/Habitica/res/drawable-xxhdpi/add_habit.png
new file mode 100644
index 000000000..7e2ea8cb4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/add_habit.png differ
diff --git a/Habitica/res/drawable-xxhdpi/add_rewards.png b/Habitica/res/drawable-xxhdpi/add_rewards.png
new file mode 100644
index 000000000..c85a15f65
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/add_rewards.png differ
diff --git a/Habitica/res/drawable-xxhdpi/add_todo.png b/Habitica/res/drawable-xxhdpi/add_todo.png
new file mode 100644
index 000000000..57294482f
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/add_todo.png differ
diff --git a/Habitica/res/drawable-xxhdpi/custom_reward.png b/Habitica/res/drawable-xxhdpi/custom_reward.png
new file mode 100644
index 000000000..70d565911
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/custom_reward.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_add_purple.png b/Habitica/res/drawable-xxhdpi/fab_add_purple.png
new file mode 100644
index 000000000..9673011ec
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fab_add_purple.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-xxhdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 000000000..3ad24c361
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_add_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.png b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.png
new file mode 100644
index 000000000..4a36f5d68
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 000000000..799d3a1c2
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-xxhdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 000000000..0a8ef022c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_create_grey_400_18dp.png differ
diff --git a/Habitica/res/drawable-xxhdpi/justin_textbox.png b/Habitica/res/drawable-xxhdpi/justin_textbox.png
index f8155a191..194e39505 100644
Binary files a/Habitica/res/drawable-xxhdpi/justin_textbox.png and b/Habitica/res/drawable-xxhdpi/justin_textbox.png differ
diff --git a/Habitica/res/drawable-xxhdpi/speechbubble_caret.png b/Habitica/res/drawable-xxhdpi/speechbubble_caret.png
new file mode 100644
index 000000000..d53063c90
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/speechbubble_caret.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_add_purple_300_36dp.png b/Habitica/res/drawable-xxxhdpi/ic_add_purple_300_36dp.png
new file mode 100644
index 000000000..0618f2550
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_add_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_close_purple_300_36dp.png b/Habitica/res/drawable-xxxhdpi/ic_close_purple_300_36dp.png
new file mode 100644
index 000000000..468665d42
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_close_purple_300_36dp.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_create_grey_400_18dp.png b/Habitica/res/drawable-xxxhdpi/ic_create_grey_400_18dp.png
new file mode 100644
index 000000000..29b12a15b
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_create_grey_400_18dp.png differ
diff --git a/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml b/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
new file mode 100644
index 000000000..5603a1da1
--- /dev/null
+++ b/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/black_10_alpha" />
+    <corners android:radius="@dimen/bar_radius"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index f31553375..dfcf91aef 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="@color/brand">
     <android.support.v4.view.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
@@ -45,6 +47,8 @@
             android:layout_marginBottom="6dp"
             android:background="@color/transparent"
             android:textColor="@android:color/white"
-            android:visibility="gone" />
+            android:textSize="16sp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
     </RelativeLayout>
 </FrameLayout>
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 77584f30d..bfdee9750 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -19,6 +19,7 @@
             android:background="@drawable/login_gradient"
             android:clipChildren="false"
             android:clipToPadding="false"
+            android:layout_marginRight="-2dp"
             >
             <ImageView
                 android:id="@+id/city_view"
@@ -33,7 +34,7 @@
                 android:layout_height="0dp"
                 android:layout_centerHorizontal="true"
                 android:visibility="invisible"
-                android:layout_below="@id/city_view" />
+                android:layout_above="@id/city_view" />
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -41,10 +42,9 @@
                 android:id="@+id/left_cloud_view"
                 android:layout_toLeftOf="@id/cloud_anchor"
                 android:layout_marginRight="150dp"
-                android:layout_below="@id/cloud_anchor"
-                android:layout_alignParentLeft="false"
+                android:layout_alignParentBottom="true"
                 android:scaleType="centerCrop"
-                android:layout_marginTop="150dp"
+                android:paddingBottom="460dp"
                 />
             <ImageView
                 android:layout_width="wrap_content"
@@ -53,10 +53,9 @@
                 android:id="@+id/right_cloud_view"
                 android:layout_toRightOf="@id/cloud_anchor"
                 android:layout_marginLeft="170dp"
-                android:layout_below="@id/cloud_anchor"
-                android:layout_alignParentLeft="false"
+                android:layout_alignParentBottom="true"
                 android:scaleType="centerCrop"
-                android:layout_marginTop="240dp"
+                android:paddingBottom="400dp"
                 />
 
 
@@ -72,7 +71,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="@dimen/spacing_large"
+            android:paddingTop="@dimen/spacing_large"
+            android:paddingLeft="@dimen/spacing_large"
+            android:paddingRight="@dimen/spacing_large"
             android:id="@+id/login_intro_view"
             android:orientation="vertical"
             android:background="@color/transparent"
@@ -92,7 +93,7 @@
                 android:id="@+id/new_game_button"
                 android:layout_width="@dimen/login_intro_button_size"
                 android:layout_height="@dimen/login_intro_button_size"
-                android:text="@string/new_game"
+                android:text="@string/register_btn"
                 android:layout_gravity="center_vertical|center_horizontal"
                 android:textColor="@color/white"
                 android:layout_marginTop="@dimen/spacing_large"
@@ -116,6 +117,7 @@
                 android:id="@+id/login_scrollview"
                 android:scrollIndicators="none"
                 tools:visibility="visible"
+                android:padding="0dp"
                 >
 
                 <LinearLayout
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index f21ea2c50..6342c53bc 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -1,107 +1,110 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <android.support.design.widget.CoordinatorLayout
-            android:id="@+id/coordinatorLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:context=".ui.activities.MainActivity"
-            android:fitsSystemWindows="false">
+        android:id="@+id/coordinatorLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.activities.MainActivity"
+        android:fitsSystemWindows="false">
 
         <FrameLayout
-                android:id="@+id/fragment_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
         <android.support.design.widget.AppBarLayout
-                android:id="@+id/appbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:id="@+id/appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <android.support.design.widget.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:titleEnabled="false"
-                    app:contentScrim="?attr/colorPrimary"
-                    app:expandedTitleMarginEnd="?attr/actionBarSize"
-                    app:expandedTitleMarginStart="0dp"
-                    app:layout_scrollFlags="scroll|exitUntilCollapsed">
+                android:id="@+id/collapsing_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:titleEnabled="false"
+                app:contentScrim="?attr/colorPrimary"
+                app:expandedTitleMarginEnd="?attr/actionBarSize"
+                app:expandedTitleMarginStart="0dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                 <include
-                        android:id="@+id/avatar_with_bars"
-                        layout="@layout/avatar_with_bars"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="?attr/actionBarSize"
-                        app:layout_collapseMode="parallax" />
+                    android:id="@+id/avatar_with_bars"
+                    layout="@layout/avatar_with_bars"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="?attr/actionBarSize"
+                    app:layout_collapseMode="parallax" />
 
                 <android.support.v7.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:minHeight="?attr/actionBarSize"
-                        android:theme="@style/Toolbar"
-                        app:layout_collapseMode="pin"
-                        app:popupTheme="@style/Theme.AppCompat.Light"
-                        android:fitsSystemWindows="true"/>
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="?attr/actionBarSize"
+                    android:theme="@style/Toolbar"
+                    app:layout_collapseMode="pin"
+                    app:popupTheme="@style/Theme.AppCompat.Light" />
             </android.support.design.widget.CollapsingToolbarLayout>
 
             <android.support.design.widget.TabLayout
-                    android:id="@+id/detail_tabs"
-                    android:layout_width="match_parent"
-                    android:layout_height="54dp"
-                    android:layout_gravity="bottom"
-                    android:background="@color/brand_200"
-                    android:elevation="0dp"
-                    android:fillViewport="false"
+                android:id="@+id/detail_tabs"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_gravity="bottom"
+                android:background="@color/brand_200"
+                android:elevation="0dp"
+                android:fillViewport="false"
 
-                    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                    app:layout_anchor="@+id/collapsing_toolbar"
-                    app:layout_anchorGravity="bottom"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                app:layout_anchor="@+id/collapsing_toolbar"
+                app:layout_anchorGravity="bottom"
 
-                    app:layout_collapseMode="pin"
-                    app:tabGravity="fill"
-                    app:tabIndicatorColor="@android:color/white"
-                    app:tabMode="fixed"
-                    android:fitsSystemWindows="true" />
+                app:layout_collapseMode="pin"
+                app:tabGravity="fill"
+                app:tabIndicatorColor="@android:color/white"
+                app:tabMode="fixed" />
         </android.support.design.widget.AppBarLayout>
 
         <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_alignParentBottom="true"
+            app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+            android:padding="0dp">
+            <android.support.design.widget.CoordinatorLayout
+                android:id="@+id/floating_menu_wrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="bottom|center"
-                android:layout_alignParentBottom="true">
-            <android.support.design.widget.CoordinatorLayout
-                    android:id="@+id/floating_menu_wrapper"
-                    app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|right"
-                    android:layout_marginBottom="-5dp"
-                    />
+                android:layout_gravity="bottom|right"
+                android:layout_marginBottom="-5dp"
+                />
             <com.roughike.bottombar.BottomBar
-                    android:id="@+id/bottom_navigation"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:background="@color/brand_100"
-                    app:bb_tabXmlResource="@xml/main_menu_tasks"
-                    app:bb_inActiveTabColor="@color/brand_500"
-                    app:bb_activeTabColor="@color/white"
-                    app:bb_behavior="underNavbar"
-                    />
+                android:id="@+id/bottom_navigation"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:background="@color/brand_100"
+                app:bb_tabXmlResource="@xml/main_menu_tasks"
+                app:bb_inActiveTabColor="@color/brand_500"
+                app:bb_activeTabColor="@color/white"
+                app:bb_behavior="underNavbar"
+                app:bb_badgesHideWhenActive="true"
+                app:bb_badgeBackgroundColor="@color/brand_400"
+                android:layout_gravity="bottom"
+                android:layout_margin="0dp"
+                />
 
         </LinearLayout>
     </android.support.design.widget.CoordinatorLayout>
     <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/overlayFrameLayout"
-            android:clickable="false"
-            android:fitsSystemWindows="true"
-            />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/overlayFrameLayout"
+        android:clickable="false"
+        android:fitsSystemWindows="true"
+        />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index f943080e2..1cdb57f5b 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -8,7 +8,6 @@
               android:layout_height="wrap_content"
               android:layout_centerHorizontal="true"
               android:adjustViewBounds="true"
-              android:fitsSystemWindows="true"
               android:focusable="true"
               android:focusableInTouchMode="true"
               android:orientation="vertical"
diff --git a/Habitica/res/layout/button_list_item.xml b/Habitica/res/layout/button_list_item.xml
new file mode 100644
index 000000000..ad972d7e1
--- /dev/null
+++ b/Habitica/res/layout/button_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="@dimen/card_padding"/>
diff --git a/Habitica/res/layout/dialog_edit_tag.xml b/Habitica/res/layout/dialog_edit_tag.xml
deleted file mode 100644
index d89801c06..000000000
--- a/Habitica/res/layout/dialog_edit_tag.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/tagEditText" android:layout_gravity="center_horizontal"
-            android:focusable="true"
-            android:maxLines="1"/>
-    <Button
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/edit_tag_btn_delete"
-            android:textColor="@color/white"
-            android:id="@+id/btnDelete"
-            android:drawableEnd="@drawable/ic_action_delete_white_24"
-            android:drawableRight="@drawable/ic_action_delete_white_24"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_login_incentive.xml b/Habitica/res/layout/dialog_login_incentive.xml
index c0d3c4bf1..11cbd48cd 100644
--- a/Habitica/res/layout/dialog_login_incentive.xml
+++ b/Habitica/res/layout/dialog_login_incentive.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    >
+    android:gravity="center_horizontal">
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:layout_centerHorizontal="true"
         android:id="@+id/imageView" />
 
-
     <TextView
         android:text=""
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/imageView"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="50dp"
         android:layout_marginLeft="25dp"
         android:layout_marginRight="25dp"
@@ -28,8 +23,6 @@
         android:text=""
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/you_earned_message"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="50dp"
         android:id="@+id/next_unlock_message" />
 
@@ -37,10 +30,8 @@
         android:text="@string/see_you_tomorrow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/next_unlock_message"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="50dp"
         android:id="@+id/confirm_button"
         style="@style/Widget.AppCompat.Button.Borderless.Colored" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 3978da75d..74e8591e1 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -8,12 +8,15 @@
     android:layout_width="match_parent"
     android:layout_height="2dp"
     android:background="@color/pill_gray"
-        android:layout_marginTop="6dp"/>
+        android:layout_marginTop="16dp"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="16dp"
         android:orientation="vertical">
         <TextView
             android:id="@+id/task_type_title"
@@ -60,7 +63,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
 
             <TextView
                 android:id="@+id/tags_title"
@@ -80,7 +85,9 @@
                     android:layout_gravity="right"
                     android:text="@string/edit_tag_btn_edit"
                     android:textColor="#6133b4"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:gravity="right|center_vertical"
+                    android:paddingRight="0dp"/>
         </LinearLayout>
         <ScrollView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/edit_tag_item.xml b/Habitica/res/layout/edit_tag_item.xml
index f46126812..d4acbd4d3 100644
--- a/Habitica/res/layout/edit_tag_item.xml
+++ b/Habitica/res/layout/edit_tag_item.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-<EditText
-    android:id="@+id/edit_text"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"/>
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical">
     <Button
         android:id="@+id/delete_button"
         android:layout_width="45dp"
         android:layout_height="wrap_content"
-        android:drawableRight="@drawable/ic_delete_black_24dp"
         android:padding="0dp"
+        android:drawableLeft="@drawable/ic_close_purple_300_36dp"
         style="@style/Base.Widget.AppCompat.Button.Borderless"/>
+    <EditText
+        android:id="@+id/edit_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginLeft="8dp"
+        android:drawableRight="@drawable/ic_create_grey_400_18dp"
+        tools:text="hello"
+        style="@style/TagEditTextTheme"
+        android:paddingBottom="14dp"
+        />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/equipment_overview_list.xml b/Habitica/res/layout/equipment_overview_list.xml
index 1f6a2c7b0..803b597c3 100644
--- a/Habitica/res/layout/equipment_overview_list.xml
+++ b/Habitica/res/layout/equipment_overview_list.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
     <data>
         <import type="java.util.Map"/>
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.Outfit" />
+        <import type="com.habitrpg.android.habitica.models.user.Outfit" />
         <variable name="categorytitle" type="String"/>
         <variable name="outfit" type="Outfit"/>
         <variable
diff --git a/Habitica/res/layout/floating_menu_tasks.xml b/Habitica/res/layout/floating_menu_tasks.xml
index c444bd70b..9485d17a9 100644
--- a/Habitica/res/layout/floating_menu_tasks.xml
+++ b/Habitica/res/layout/floating_menu_tasks.xml
@@ -1,90 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:fab="http://schemas.android.com/apk/res-auto"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/fab.menu"
-        app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+<com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fab.menu"
+    app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom|right"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginRight="8dp"
+    fab:menu_fab_size="normal"
+    fab:menu_colorNormal="@color/brand_400"
+    fab:menu_colorPressed="@color/brand_500"
+    fab:menu_colorRipple="#FFFFFF"
+    fab:menu_animationDelayPerItem="50"
+    fab:menu_icon="@drawable/fab_add"
+    fab:menu_buttonSpacing="2dp"
+    fab:menu_labels_margin="4dp"
+    fab:menu_fab_show_animation="@anim/fab_slide_in"
+    fab:menu_fab_hide_animation="@anim/fab_slide_out">
+
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.habit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginRight="8dp"
-        fab:menu_fab_size="normal"
-        fab:menu_labels_paddingTop="8dp"
-        fab:menu_labels_paddingRight="8dp"
-        fab:menu_labels_paddingBottom="8dp"
-        fab:menu_labels_paddingLeft="8dp"
 
-        fab:menu_colorNormal="@color/brand"
-        fab:menu_colorPressed="@color/brand_400"
-        fab:menu_colorRipple="#FFFFFF"
-        fab:menu_animationDelayPerItem="50"
-        fab:menu_icon="@drawable/fab_add"
-        fab:menu_buttonSpacing="2dp">
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.habit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
+        android:src="@drawable/add_habit"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_habit" />
 
-            fab:fab_colorNormal="@color/brand"
-            fab:fab_colorPressed="@color/brand_400"
-            fab:fab_colorRipple="#FFFFFF"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.daily"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="6dp"
-            android:src="@drawable/fab_add"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_habit" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.daily"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/brand"
-            fab:fab_colorPressed="@color/brand_400"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_daily"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_daily" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="6dp"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.todo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            android:src="@drawable/fab_add"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_daily" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.todo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/brand"
-            fab:fab_colorPressed="@color/brand_400"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_todo"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_todo" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="6dp"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.reward"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            android:src="@drawable/fab_add"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_todo" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.reward"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/brand"
-            fab:fab_colorPressed="@color/brand_400"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_rewards"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_reward" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="6dp"
-
-            android:src="@drawable/fab_add"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_reward" />
-
-    </com.github.clans.fab.FloatingActionMenu>
+</com.github.clans.fab.FloatingActionMenu>
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index 00b4d2d0c..f429af959 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.Preferences" />
+        <import type="com.habitrpg.android.habitica.models.user.Preferences" />
         <import type="android.view.View" />
 
         <variable
@@ -11,19 +11,18 @@
             type="Preferences" />
     </data>
 
-
     <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbarSize="3dp"
         android:scrollbarThumbVertical="@color/md_grey_500"
-        android:paddingBottom="?attr/actionBarSize"
         android:scrollbars="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="?attr/actionBarSize">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_equipment_overview.xml b/Habitica/res/layout/fragment_equipment_overview.xml
index ef5e2d56a..c4e4038dd 100644
--- a/Habitica/res/layout/fragment_equipment_overview.xml
+++ b/Habitica/res/layout/fragment_equipment_overview.xml
@@ -4,7 +4,7 @@
 
     <data>
         <import type="java.util.Map"/>
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.Outfit" />
+        <import type="com.habitrpg.android.habitica.models.user.Outfit" />
         <import type="android.view.View" />
 
         <variable
diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml
index 7f3eb36c6..a28337e37 100644
--- a/Habitica/res/layout/fragment_faq_detail.xml
+++ b/Habitica/res/layout/fragment_faq_detail.xml
@@ -5,13 +5,13 @@
     android:layout_height="match_parent"
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/md_grey_500"
-    android:paddingBottom="?attr/actionBarSize"
     android:scrollbars="vertical">
 
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingBottom="?attr/actionBarSize">
 
         <TextView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 7a13c66cf..9ab0222f7 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -4,10 +4,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.Group" />
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent" />
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.invitations.PartyInvite" />
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser" />
+        <import type="com.habitrpg.android.habitica.models.social.Group" />
+        <import type="com.habitrpg.android.habitica.models.inventory.QuestContent" />
+        <import type="com.habitrpg.android.habitica.models.invitations.PartyInvite" />
+        <import type="com.habitrpg.android.habitica.models.user.HabitRPGUser" />
         <import type="android.view.View" />
         <import type="android.text.Html"/>
 
diff --git a/Habitica/res/layout/fragment_guild_recyclerview.xml b/Habitica/res/layout/fragment_guild_recyclerview.xml
deleted file mode 100644
index 173286a5a..000000000
--- a/Habitica/res/layout/fragment_guild_recyclerview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent"
-        android:orientation="vertical">
-
-    <android.support.design.widget.CoordinatorLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/coordinatorLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-
-        <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scrollbarSize="3dp"
-                android:scrollbarThumbVertical="@color/md_grey_500"
-                android:scrollbars="vertical" />
-
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/empty_view"
-                style="@style/EmptyView"/>
-
-    </android.support.design.widget.CoordinatorLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml
index 6c5da0794..7724f7c66 100644
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@@ -19,6 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/empty_view"
-        style="@style/EmptyView"/>
+        style="@style/EmptyView"
+        android:visibility="gone"/>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
index 18f319647..2ac93f84e 100644
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/refresh.layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -20,10 +21,38 @@
             android:clipToPadding="false"
             android:paddingBottom="?attr/actionBarSize" />
 
-        <TextView
+        <LinearLayout
+            android:id="@+id/empty_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/empty_view"
-            style="@style/EmptyView"/>
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:visibility="gone">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                style="@style/EmptyView">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/empty_view_title"
+                    tools:text="No Items"
+                    android:textSize="@dimen/card_medium_text"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/empty_view_description"
+                    tools:text="No Items" />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/justin_textbox"
+                android:layout_marginTop="16dp"
+                />
+        </LinearLayout>
+
     </FrameLayout>
 </android.support.v4.widget.SwipeRefreshLayout>
diff --git a/Habitica/res/layout/fragment_setup_avatar.xml b/Habitica/res/layout/fragment_setup_avatar.xml
index f0bf3fe6e..d7438ea6e 100644
--- a/Habitica/res/layout/fragment_setup_avatar.xml
+++ b/Habitica/res/layout/fragment_setup_avatar.xml
@@ -45,10 +45,10 @@
             />
 
     <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:namePlate="Justin"
-            app:text="@string/avatar_setup_description"
             app:npcDrawable="@drawable/justin_textbox"
             android:layout_marginLeft="@dimen/content_inset"
             android:layout_marginRight="@dimen/content_inset"
diff --git a/Habitica/res/layout/fragment_setup_tasks.xml b/Habitica/res/layout/fragment_setup_tasks.xml
index 9a5e49ac0..ad2aeb780 100644
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@@ -43,10 +43,10 @@
             android:padding="17dp"/>
 
     <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:namePlate="Justin"
-            app:text="@string/task_setup_description"
             app:npcDrawable="@drawable/justin_textbox"
             android:layout_marginLeft="@dimen/content_inset"
             android:layout_marginRight="@dimen/content_inset"
diff --git a/Habitica/res/layout/fragment_skills.xml b/Habitica/res/layout/fragment_skills.xml
index 53070fad9..462cf2a07 100644
--- a/Habitica/res/layout/fragment_skills.xml
+++ b/Habitica/res/layout/fragment_skills.xml
@@ -6,5 +6,4 @@
     android:layout_height="match_parent"
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/md_grey_500"
-
     android:scrollbars="vertical" />
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
index 87889d109..327b0827f 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -1,11 +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"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/light_gray_bg"
-              android:gravity="center_vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/light_gray_bg"
+    android:gravity="center_vertical">
     <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -54,10 +55,10 @@
                 android:layout_marginTop="18dp"/>
     </RelativeLayout>
     <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:namePlate="Justin"
-            app:text="@string/welcome_text"
             android:layout_marginLeft="@dimen/content_inset"
             android:layout_marginRight="@dimen/content_inset"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/overlay_tutorial.xml b/Habitica/res/layout/overlay_tutorial.xml
index a46327175..adef2b2c6 100644
--- a/Habitica/res/layout/overlay_tutorial.xml
+++ b/Habitica/res/layout/overlay_tutorial.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:clickable="true"
-                android:fitsSystemWindows="true"
-                android:id="@+id/background">
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:clickable="true"
+    android:fitsSystemWindows="true"
+    android:id="@+id/background">
     <View android:layout_height="match_parent"
-          android:layout_width="match_parent"
-          android:background="@android:color/black"
-          android:alpha="0.6"/>
+        android:layout_width="match_parent"
+        android:background="@android:color/black"
+        android:alpha="0.6"/>
     <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="24dp"
+        android:layout_alignParentBottom="true"
+        android:fitsSystemWindows="true"
+        android:layout_marginBottom="?actionBarSize">
+        <com.habitrpg.android.habitica.ui.SpeechBubbleView
+            android:id="@+id/speech_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:layout_alignParentBottom="true"
-            android:fitsSystemWindows="true"
-            android:layout_marginBottom="?actionBarSize">
-        <com.habitrpg.android.habitica.ui.SpeechBubbleView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:namePlate="Justin"
-                app:npcDrawable="@drawable/justin_textbox"/>
+            app:namePlate="Justin"
+            app:npcDrawable="@drawable/justin_textbox"/>
     </FrameLayout>
 </RelativeLayout>
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
index 150a1608b..0194c200e 100644
--- a/Habitica/res/layout/qr_code.xml
+++ b/Habitica/res/layout/qr_code.xml
@@ -11,6 +11,7 @@
         android:text="@string/qr_section_title"
         style="@style/SectionTitle"
         android:layout_gravity="center"
+        android:layout_marginTop="40dp"
          />
 
     <FrameLayout
diff --git a/Habitica/res/layout/qr_dialogue.xml b/Habitica/res/layout/qr_dialogue.xml
index b0c658db3..d5e10426d 100644
--- a/Habitica/res/layout/qr_dialogue.xml
+++ b/Habitica/res/layout/qr_dialogue.xml
@@ -10,7 +10,7 @@
         android:id="@+id/dialogButtonOK"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/profile_achievement_ok"
+        android:text="@string/profile_qrcode_close"
         android:layout_marginTop="5dp"
         android:layout_marginRight="5dp"
         android:layout_centerHorizontal="true"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 5d5c9dbaa..416951cf3 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -2,7 +2,8 @@
 <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:layout_height="wrap_content"
+    android:background="@color/white">
 
     <LinearLayout
         android:id="@+id/gearElementsLayout"
@@ -16,7 +17,9 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_gravity="center_vertical"
-            android:padding="5dp" />
+            android:layout_margin="12dp"
+            android:scaleType="center"
+            tools:src="@drawable/custom_reward"/>
 
         <LinearLayout
             android:id="@+id/textReward"
@@ -27,9 +30,7 @@
             android:orientation="vertical"
             android:paddingBottom="@dimen/task_top_bottom_padding"
             android:paddingEnd="@dimen/reward_spacing"
-            android:paddingLeft="@dimen/task_text_padding"
             android:paddingRight="@dimen/reward_spacing"
-            android:paddingStart="@dimen/task_text_padding"
             android:paddingTop="@dimen/task_top_bottom_padding">
 
             <net.pherth.android.emoji_library.EmojiTextView
diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index 6e02e58da..9f31e7fd1 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/CardView.Default"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/RowWrapper"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        style="@style/CardContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/skill_image"
@@ -21,6 +17,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:orientation="vertical">
@@ -29,27 +26,32 @@
                 android:id="@+id/skill_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                tools:text="Spell Name"
+                style="@style/Subheader1"/>
 
             <TextView
                 android:id="@+id/skill_notes"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                style="@style/Caption2.Regular"
+                tools:text="This is the spell description"/>
         </LinearLayout>
-
-        <Button
-            android:id="@+id/price_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="@color/brand_100"
-            android:drawableLeft="@drawable/ic_header_magic"
-            android:drawableStart="@drawable/ic_header_magic"
-            android:paddingLeft="16dp"
-            android:paddingStart="16dp"
-            android:paddingRight="24dp"
-            android:paddingEnd="24dp"
-            android:textColor="@android:color/white" />
-    </LinearLayout>
-
-</android.support.v7.widget.CardView>
\ No newline at end of file
+    <Button
+        android:id="@+id/price_button"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:minWidth="64dp"
+        android:layout_gravity="center_vertical"
+        android:gravity="left|center_vertical"
+        android:drawablePadding="5dp"
+        android:background="@drawable/rounded_purple_square"
+        android:paddingLeft="12dp"
+        android:paddingStart="12dp"
+        android:paddingRight="12dp"
+        android:paddingEnd="12dp"
+        android:textColor="@color/white"
+        tools:text="150"
+        android:textSize="15sp"
+        android:drawableLeft="@drawable/ic_header_magic"
+        android:drawableStart="@drawable/ic_header_magic" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index 8547f47da..51049bd77 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -4,7 +4,7 @@
 
     <data>
 
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.tasks.Task" />
+        <import type="com.habitrpg.android.habitica.models.tasks.Task" />
         <import type="android.view.View"/>
 
         <variable
diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml
index f1e62d2b8..e7e5ff79c 100644
--- a/Habitica/res/layout/speechbubble.xml
+++ b/Habitica/res/layout/speechbubble.xml
@@ -14,51 +14,64 @@
             android:layout_marginRight="30dp"/>
 
     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="46dp"
+        android:background="@drawable/white_rounded_bg"
+        android:orientation="vertical"
+        android:paddingBottom="16dp"
+        android:paddingLeft="21dp"
+        android:paddingRight="21dp"
+        android:paddingTop="24dp"
+        android:layout_marginBottom="10dp">
+
+        <com.habitrpg.android.habitica.ui.views.Typewriter
+            android:id="@+id/textView"
+            style="@style/Subheader1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/white_rounded_bg"
-            android:paddingLeft="21dp"
-            android:paddingTop="16dp"
-            android:paddingRight="21dp"
-            android:paddingBottom="14dp"
-            android:layout_marginTop="56dp"
-            android:orientation="vertical">
-        <TextView
-                android:id="@+id/textView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            tools:text="@string/welcome_text" />
 
-                style="@style/Body1"
-                tools:text="@string/welcome_text"/>
         <LinearLayout
-                android:id="@+id/confirmation_buttons"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                style="?android:attr/buttonBarStyle" >
+            android:id="@+id/confirmation_buttons"
+            style="?android:attr/buttonBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="8dp"
+            android:layout_gravity="right">
 
             <Button
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/dismiss_tutorial"
-                    android:id="@+id/dismissButton"
-                    android:layout_gravity="center_vertical"
-                    android:theme="@style/DialogButton"
-                    style="?android:attr/buttonBarButtonStyle" />
+                android:id="@+id/dismissButton"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/dismiss_tutorial"
+                android:theme="@style/DialogButton"/>
 
             <Button
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/complete_tutorial"
-                    android:id="@+id/completeButton"
-                    android:layout_gravity="center_vertical"
-                    android:theme="@style/DialogButton"
-                    style="?android:attr/buttonBarButtonStyle" />
+                android:id="@+id/completeButton"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/complete_tutorial"
+                android:theme="@style/DialogButton" />
         </LinearLayout>
     </LinearLayout>
 
+    <ImageView
+        android:id="@+id/continue_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/speechbubble_caret"
+        android:layout_gravity="bottom|center"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
     <TextView
             android:id="@+id/name_plate"
             android:layout_width="wrap_content"
@@ -68,6 +81,6 @@
             android:gravity="center_vertical"
             android:textColor="@color/white"
             android:layout_marginLeft="21dp"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="32dp"
             android:textStyle="bold" />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/tavern_chat_new_entry_item.xml
index 12246e003..26672f439 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@@ -3,13 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:layout_margin="8dp">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="7dp"
-        android:text="Chat"
+        android:text="@string/chat"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@color/material_drawer_primary_text" />
 
@@ -20,17 +20,17 @@
 
         <ImageButton
             android:id="@+id/emoji.toggle.btn"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:src="@drawable/ic_emoticon_grey600_24dp"
             android:scaleType="center"
             android:backgroundTint="@color/transparent"
-            android:contentDescription="Toogle Emojis" />
+            android:contentDescription="Toogle Emojis"
+            android:layout_gravity="center"/>
 
         <android.support.design.widget.TextInputLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:minHeight="72dp"
             android:layout_weight="1"
             app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
@@ -51,7 +51,13 @@
             android:layout_height="50dp"
             android:textColor="@color/white"
             android:text="@string/post"
-            android:drawableTint="@color/white"/>
+            android:drawableTint="@color/white"
+            android:layout_gravity="center"/>
     </LinearLayout>
-
+    <TextView
+        android:id="@+id/community_guidelines_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/read_community_guidelines"
+        style="@style/Caption3" />
 </LinearLayout>
diff --git a/Habitica/res/values-bg/strings.profile.xml b/Habitica/res/values-bg/strings.profile.xml
index 4fdf05896..8103de203 100644
--- a/Habitica/res/values-bg/strings.profile.xml
+++ b/Habitica/res/values-bg/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Лично съобщение</string>
     <string name="profile_achievements">Постижения</string>
     <string name="profile_achievement_ok">Добре</string>
+    <string name="profile_qrcode_close">Затваряне</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-bg/strings.tutorial.xml b/Habitica/res/values-bg/strings.tutorial.xml
index 0856634a7..67565cd13 100644
--- a/Habitica/res/values-bg/strings.tutorial.xml
+++ b/Habitica/res/values-bg/strings.tutorial.xml
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Отбелязвайте положителните си навици, за да получавате злато и опит! Отрицателните навици ще наранят героя Ви, ако ги докоснете, така че ги избягвайте в истинския живот!</string>
-  <string name="tutorial_dailies">Побеждавайте своите повтарящи се ежедневни задачи, за да печелите злато и опит. Внимание! Ежедневните задачи ще наранят героя Ви, ако не ги изпълните навреме.</string>
-  <string name="tutorial_todos">Завършвайте задачите си за изпълнение в истинския живот, а след това ги отбелязвайте тук за ЗЛАТО и ОПИТ; така ще можете да отключвате награди и нови функционалности!</string>
-  <string name="tutorial_rewards">Това са наградите Ви! Печелете злато като изпълнявате истинските си навици, ежедневни задачи и задачи за изпълнение. След това го харчете за награди в играта или персонализирани такива за истинския живот!</string>
+  <string name="tutorial_overview">Готово! Въведох няколко задачи, според интересите Ви. Опитайте да добавите още няколко, ако искате. Можете да редактирате всяка задача като докоснете заглавието ѝ.</string>
+  <string name="tutorial_habits_1">Първо, навиците. Те могат да са положителни — тоест такива, каквито искате да си създадете или затвърдите, и отрицателни — от които искате да се откажете.</string>
+  <string name="tutorial_habits_2">Всеки път, когато извършите нещо, което е положителен навик, докоснете знака +, за да получите опит и злато!</string>
+  <string name="tutorial_habits_3">Ако се отпуснете и направите нещо, което е лош навик, докоснете знака - и героят Ви ще загуби малко здраве — това ще Ви държи отговорни за действията си.</string>
+  <string name="tutorial_habits_4">Опитайте! Можете да разгледате и другите видове задачи чрез бутоните отдолу.</string>
+  <string name="tutorial_dailies_1">Създайте ежедневни задачи за онези неща, които трябва да се правят редовно или по график.</string>
+  <string name="tutorial_dailies_2">Внимавайте! Ако пропуснете някоя ежедневна задача, героят Ви ще загуби здраве в края на деня. Не пропускайте да ги отмятайте и ако сте постоянен/а, ще получите страхотни награди!</string>
+  <string name="tutorial_todos_1">Използвайте задачите за изпълнение, за да следите онези неща, които трябва да извършите само веднъж.</string>
+  <string name="tutorial_todos_2">Ако дадена задача трябва да бъде изпълнена навреме, задайте ѝ краен срок. Изглежда можете да отметнете една още сега. Направете го!</string>
+  <string name="tutorial_rewards_1">Купувайте екипировка за героя си със златото, което печелите!</string>
+  <string name="tutorial_rewards_2">Можете и да си създадете реални персонализирани награди, в зависимост от това какво Ви мотивира.</string>
+  <string name="tutorial_tasks_complete">Това е всичко засега. Ако искате да си припомните нещо, погледнете раздела с ЧЗВ.</string>
   <string name="tutorial_equipment">Когато купувате екипировка, тя се появява тук. Бойното снаряжение променя показателите Ви, а костюмът (ако е включен) променя вида на героя Ви.</string>
   <string name="tutorial_items">Печелете предмети като изпълнявате задачи и качвате нива. Докоснете предмет, за да го използвате!</string>
   <string name="tutorial_pets">Когато изпълнявате задачите си в истинския живот, имате шанс на случаен принцип да Ви се паднат яйца и отвари. Комбинирайте ги, за да излюпите любимци.</string>
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 833aff978..244baf855 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -38,9 +38,9 @@
   <string name="preference_push_invited_to_quest">Получихте покана за мисия</string>
   <!--Adding tasks-->
   <string name="task_value">Стойност</string>
-  <string name="new_todo">Нова задача за изпълнение</string>
+  <string name="new_todo">Нова задача</string>
   <string name="new_reward">Нова награда</string>
-  <string name="new_daily">Нова ежедневна задача</string>
+  <string name="new_daily">Нова ежедневна</string>
   <string name="new_habit">Нов навик</string>
   <string name="action_edit">Редактиране</string>
   <string name="action_delete">Изтриване</string>
@@ -187,8 +187,8 @@
   <string name="intro_2_subtitle">Напредък в играта</string>
   <string name="intro_2_title">Напредък в живота</string>
   <string name="intro_2_description">Отключвайте функционалности в играта като отбелязвате завършените задачи в истинския си живот. За изпълнението на целите си ще получавате екипировка, любимци и най-различни други награди.</string>
-  <string name="intro_3_subtitle">Общувайте</string>
-  <string name="intro_3_title">Бийте се с чудовища</string>
+  <string name="intro_3_subtitle">Бийте се с чудовища</string>
+  <string name="intro_3_title">Общувайте</string>
   <string name="intro_3_description">Приятелите Ви могат да Ви помогнат да постигнете целите си. Подкрепяйте се взаимно в живота и битките, за да израснете заедно!</string>
   <string name="intro_finish_button">Да започваме!</string>
   <string name="previous_button">Назад</string>
@@ -197,8 +197,10 @@
   <string name="setup_welcome_description">Добре дошли в Хабитика, където напредването в играта ще подобри истинския Ви живот! Докато изпълнявате реалните си цели, ще отключвате екипировка, любимци, мисии и още.</string>
   <string name="setup_welcome_title">Добре дошли</string>
   <string name="avatar_setup_description">Е, как искате да изглеждате? Не се притеснявайте, по-късно ще можете да промените това.</string>
+  <string name="task_setup_description">Страхотно! И така, върху какво искате да поработите по време на това пътешествие?</string>
   <string name="setup_group_work">Работа</string>
   <string name="setup_group_exercise">Упражнения</string>
+  <string name="setup_group_health">Здраве</string>
   <string name="setup_group_school">Училище</string>
   <string name="setup_group_teams">Екипи</string>
   <string name="setup_group_chores">Домакинска работа</string>
@@ -238,7 +240,7 @@
   <string name="delete">Изтриване</string>
   <string name="name">Име</string>
   <string name="description">Описание</string>
-  <string name="add_tag">Добавяне на етикет</string>
+  <string name="add_tag">Добавяне на нов етикет</string>
   <string name="privacy">Поверителност</string>
   <string name="write_message">Напишете съобщение</string>
   <string name="post">Изпр.</string>
@@ -395,7 +397,7 @@
   <string name="all_dailies_completed">Изпълнихте всичките си ежедневни задачи. Добра работа!</string>
   <string name="widget_habit_button">Извършване на навик в Хабитика</string>
   <string name="widget_dailies">Ежедневни задачи в Хабитика</string>
-  <string name="widget_todo_list">Задачи за изпълнение в Хабитика</string>
+  <string name="widget_todo_list">Списък за изпълнение в Хабитика</string>
   <string name="widget_add_task">Добавяне на задача в Хабитика</string>
   <string name="google_services_missing">Услугите за „Google play“ не могат да бъдат намерени.</string>
   <string name="gem.purchase.toolbartitle">Купуване</string>
@@ -519,8 +521,22 @@
   <string name="avatar_wheelchair">Инвалидна количка</string>
   <string name="weak">Слаби</string>
   <string name="strong">Силни</string>
-  <string name="gray">Сиви</string>
+  <string name="gray">Изпълнени</string>
   <string name="dated">С дата</string>
   <string name="completed">Завършени</string>
   <string name="setuP_group_other">Други</string>
+  <string name="clear">Изчистване</string>
+  <string name="empty_title_habits">Нямате навици</string>
+  <string name="empty_description_habits">Навиците са задачи, които не се влияят от времето. Можете да ги отмятате много пъти през деня или пък да ги пропуснете.</string>
+  <string name="empty_title_dailies">Нямате ежедневни задачи</string>
+  <string name="empty_description_dailies">Ежедневните задачи са такива, които се повтарят през определено време. Изберете кога трябва де ги изпълнявате.</string>
+  <string name="empty_title_todos">Нямате задачи за изпълнение</string>
+  <string name="empty_description_todos">Задачите за изпълнение трябва да бъдат изпълнение само веднъж. Към тях можете да добавите подзадачи, като така ще увеличите стойността им.</string>
+  <string name="empty_title_rewards">Нямате награди</string>
+  <string name="reset_walkthrough">Нулиране на съветите на Джъстин</string>
+  <string name="read_community_guidelines">Моля, прочетете Обществените правила, преди да публикувате</string>
+  <string name="maintenance">Профилактика</string>
+  <string name="reload_content">Презареждане на съдържанието</string>
+  <string name="dailyDueDefaultView">Ежедневните по подразбиране да са неизпълнени</string>
+  <string name="dailyDueDefaultViewDescription">Ако това е избрано, ежедневните задачи по подразбиране ще се появяват в раздела с неизпълнени, вместо в този с всички задачи</string>
 </resources>
diff --git a/Habitica/res/values-de/strings.profile.xml b/Habitica/res/values-de/strings.profile.xml
index 774820136..676127686 100644
--- a/Habitica/res/values-de/strings.profile.xml
+++ b/Habitica/res/values-de/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">Private Nachricht</string>
     <string name="profile_achievements">Erfolge</string>
     <string name="profile_achievement_ok">Okay</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-de/strings.tutorial.xml b/Habitica/res/values-de/strings.tutorial.xml
index 04f772dbb..4d58435a8 100644
--- a/Habitica/res/values-de/strings.tutorial.xml
+++ b/Habitica/res/values-de/strings.tutorial.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Schließe positive Gewohnheiten ab, um Gold und Erfahrung zu erhalten! Negative Gewohnheiten fügen Deinem Avatar beim Antippen Schaden zu, versuche diese also im echten Leben zu vermeiden!</string>
-  <string name="tutorial_dailies">Besiege Deine täglichen Aufgaben um Gold und Erfahrung zu erhalten. Vorsicht! Tägliche Aufgaben fügen Dir Schaden zu, wenn Du sie nicht rechtzeitig schaffst.</string>
-  <string name="tutorial_todos">Erledige Deine To-Dos im echten Leben und hake diese ab, um GOLD und ERFAHRUNG zu erhalten und so Belohnungen und neue Features freizuschalten!</string>
-  <string name="tutorial_rewards">Dies sind Deine Belohnungen! Erwirb Gold, indem Du reale Gewohnheiten, tägliche Aufgaben und To-Dos abschließt. Gib dieses hinterher für Belohnungen im Spiel oder selbsterstellte Belohnungen in der Realität aus!</string>
   <string name="tutorial_equipment">Wenn Du Ausrüstung kaufst, taucht diese hier auf. Deine Kampfausrüstung beeinflusst Deine Spielerstatistiken und Dein Kostüm (falls aktiviert) beeinflusst Dein Aussehen.</string>
   <string name="tutorial_items">Verdiene Gegenstände indem Du Aufgaben erledigst und Stufen aufsteigst. Tippe auf einen Gegenstand um ihn zu benutzen!</string>
   <string name="tutorial_pets">Wenn du Aufgaben abschließt, hast Du eine Chance, Eier und Tränke zu finden. Kombiniere sie, um Haustiere auszubrüten.</string>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 1da053b40..fb315826c 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -16,7 +16,6 @@
   <string name="Language_summary">Habiticas Sprache ändern</string>
   <string name="SP_user_qr_code">Dein QR Code</string>
   <string name="PS_contact_title">Kontaktiere mich</string>
-  <string name="unknown_error">Ein Fehler ist aufgetreten...</string>
   <string name="pref_account_header">Konto</string>
   <string name="pref_first_day_of_the_week_title">Erster Tag der Woche</string>
   <string name="pref_first_day_of_the_week_summary">Erster Tag der Woche in allen Kalendern</string>
@@ -38,10 +37,6 @@
   <string name="preference_push_invited_to_quest">Zur Quest eingeladen</string>
   <!--Adding tasks-->
   <string name="task_value">Wert</string>
-  <string name="new_todo">Neuer To-Do-Eintrag</string>
-  <string name="new_reward">Neue Belohnung</string>
-  <string name="new_daily">Neue tägliche Aufgabe</string>
-  <string name="new_habit">Neue Gewohnheit</string>
   <string name="action_edit">Bearbeiten</string>
   <string name="action_delete">Löschen</string>
   <string name="action_cancel">Abbrechen</string>
@@ -187,7 +182,6 @@
   <string name="intro_2_subtitle">Fortschritt im Spiel</string>
   <string name="intro_2_title">Fortschritt im Leben</string>
   <string name="intro_2_description">Schalte Spielinhalte durch das Erledigen und Abhaken deiner realen Aufgaben frei. Bekomme Rüstungen, Tiere und vieles mehr als Belohnungen für das Erfüllen deiner Ziele.</string>
-  <string name="intro_3_title">Bekämpfe Monster</string>
   <string name="intro_3_description">Behalte Deine Ziele im Auge mit Hilfe Deiner Freunde. Unterstützt Euch gegenseitig im Leben und im Kampf, während Ihr Euch gemeinsam verbessert!</string>
   <string name="intro_finish_button">Fangen wir an!</string>
   <string name="previous_button">Zurück</string>
@@ -198,6 +192,7 @@
   <string name="avatar_setup_description">Also, wie möchtest Du aussehen? Keine Sorge, Du kannst das jederzeit ändern.</string>
   <string name="setup_group_work">Arbeit</string>
   <string name="setup_group_exercise">Bewegung</string>
+  <string name="setup_group_health">Gesundheit</string>
   <string name="setup_group_school">Schule</string>
   <string name="setup_group_teams">Teams</string>
   <string name="setup_group_chores">Hausarbeit</string>
@@ -231,13 +226,11 @@
   <string name="join">Beitreten</string>
   <string name="leader">Anführer</string>
   <string name="gems">Edelsteine</string>
-  <string name="copy_as_todo">Als To-Do kopieren</string>
   <string name="send_pm">PN senden</string>
   <string name="flag">Melden</string>
   <string name="delete">Löschen</string>
   <string name="name">Name</string>
   <string name="description">Beschreibung</string>
-  <string name="add_tag">Tag hinzufügen</string>
   <string name="privacy">Privatsphäre</string>
   <string name="write_message">Nachricht schreiben</string>
   <string name="post">posten</string>
@@ -394,7 +387,6 @@
   <string name="all_dailies_completed">Du hast alle deine täglichen Aufgaben erledigt. Gut gemacht!</string>
   <string name="widget_habit_button">Habitica: Gewohnheit</string>
   <string name="widget_dailies">Habitica: Tägliche Aufgaben</string>
-  <string name="widget_todo_list">Habitica-To-Do-Liste</string>
   <string name="widget_add_task">Habitica: Neue Aufgabe</string>
   <string name="google_services_missing">Google Play Dienste konnten nicht gefunden werden</string>
   <string name="gem.purchase.toolbartitle">Kaufen</string>
@@ -498,6 +490,7 @@
   <string name="done">Fertig</string>
   <string name="group_tasks_edit_description">Gruppenaufgaben können nicht bearbeitet werden.</string>
   <string name="group_tasks_edit_title">Aufgabe kann nicht bearbeitet werden</string>
+  <string name="groups">Gruppen</string>
   <string name="all">Alles</string>
   <string name="none">Nichts</string>
   <string name="owned">Im Besitz</string>
@@ -514,5 +507,14 @@
   <string name="avatar_wheelchair">Rollstuhl</string>
   <string name="weak">Schwach</string>
   <string name="strong">Stark</string>
-  <string name="gray">Grau</string>
+  <string name="completed">Vervollständigt</string>
+  <string name="setuP_group_other">Anderes</string>
+  <string name="clear">löschen</string>
+  <string name="empty_title_habits">Du hast keine Gewohnheiten</string>
+  <string name="empty_description_habits">Gewohnheiten sind Aufgaben ohne festen Zeitplan. Du kannst sie mehrmals am Tag oder gar nicht abhaken.</string>
+  <string name="empty_title_dailies">Du hast keine täglichen Aufgaben</string>
+  <string name="empty_description_dailies">Tägliche Aufgaben sind sich regelmäßig wiederholende Aufgaben. Such Dir den Zeitplan aus, der Dir am besten passt!</string>
+  <string name="empty_title_todos">Du hast keine To-Dos</string>
+  <string name="empty_description_todos">To-Dos sind Aufgaben, die nur einmal abgehakt werden. Füge Unteraufgaben zu To-Dos hinzu, um deren Wert zu steigern.</string>
+  <string name="empty_title_rewards">Du hast keine Belohnungen</string>
 </resources>
diff --git a/Habitica/res/values-es/strings.profile.xml b/Habitica/res/values-es/strings.profile.xml
index 322e14cfd..c57e22076 100644
--- a/Habitica/res/values-es/strings.profile.xml
+++ b/Habitica/res/values-es/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">Mensaje privado</string>
     <string name="profile_achievements">Logros</string>
     <string name="profile_achievement_ok">Ok</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-es/strings.tutorial.xml b/Habitica/res/values-es/strings.tutorial.xml
index 4bdbbab55..717549c73 100644
--- a/Habitica/res/values-es/strings.tutorial.xml
+++ b/Habitica/res/values-es/strings.tutorial.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Cumple con tus hábitos positivos para ganar oro y experiencia. Si pulsas en los hábitos negativos, tu personaje sufrirá daños, así que ¡evítalos en la vida real!</string>
-  <string name="tutorial_dailies">Vence a tus tareas diarias, día tras día, para ganar oro y experiencia. Pero ten cuidado: si no completas a tiempo una tarea diaria, hará daño a tu personaje.</string>
-  <string name="tutorial_todos">Completa tus tareas pendientes en la vida real y márcalas para obtener ORO y EXPERIENCIA con los que obtener recompensas y desbloquear nuevas funciones.</string>
-  <string name="tutorial_rewards">¡Estas son tus recompensas! Consigue oro completando tareas, hábitos y tareas diarias en el mundo real. Luego, podrás gastarlo en recompensas de dentro o fuera del juego.</string>
   <string name="tutorial_equipment">Cuando compres artículos de equipamiento, aparecerán aquí. El equipo de batalla que elijas afectará a tus estadísticas, y el disfraz (si lo habilitas) será lo que lleve tu personaje.</string>
   <string name="tutorial_items">Consigue artículos completando tareas y subiendo de nivel. Pulsa en un artículo para usarlo.</string>
   <string name="tutorial_pets">A medida que completes tareas del mundo real, a partir de ahora, podrás encontrar huevos y pociones al azar. Combínalos para que nazca una mascota.</string>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 2d2c21855..0ed18ef14 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -16,7 +16,6 @@
   <string name="Language_summary">Cambiar el idioma de Habitica</string>
   <string name="SP_user_qr_code">Tu código QR</string>
   <string name="PS_contact_title">Contactar</string>
-  <string name="unknown_error">Se produjo un error...</string>
   <string name="pref_account_header">Cuenta</string>
   <string name="pref_first_day_of_the_week_title">Primer día de la semana</string>
   <string name="pref_first_day_of_the_week_summary">Primer día de la semana en todos los calendarios</string>
@@ -38,10 +37,6 @@
   <string name="preference_push_invited_to_quest">Invitado a una misión</string>
   <!--Adding tasks-->
   <string name="task_value">Valor</string>
-  <string name="new_todo">Nueva tarea</string>
-  <string name="new_reward">Nueva recompensa</string>
-  <string name="new_daily">Nueva tarea diaria</string>
-  <string name="new_habit">Nuevo hábito</string>
   <string name="action_edit">Editar</string>
   <string name="action_delete">Borrar</string>
   <string name="action_cancel">Cancelar</string>
@@ -222,13 +217,11 @@
   <string name="join">Unirse</string>
   <string name="leader">Líder</string>
   <string name="gems">Gemas</string>
-  <string name="copy_as_todo">Copiar como tarea</string>
   <string name="send_pm">Enviar mensaje privado</string>
   <string name="flag">Marcar</string>
   <string name="delete">Borrar</string>
   <string name="name">Nombre</string>
   <string name="description">Descripción</string>
-  <string name="add_tag">Añadir etiqueta</string>
   <string name="privacy">Privacidad</string>
   <string name="write_message">Escribir mensaje</string>
   <string name="post">Publicar</string>
@@ -385,7 +378,6 @@
   <string name="all_dailies_completed">Ha completado todas las tareas diarias. ¡Buen trabajo!</string>
   <string name="widget_habit_button">Hábitos Habitica</string>
   <string name="widget_dailies">Tareas diarias Habitica</string>
-  <string name="widget_todo_list">Lista de Tareas de Habítica.</string>
   <string name="widget_add_task">Añade tareas Habitica</string>
   <string name="google_services_missing">Los servidores de Google Play no pueden ser encontrados.</string>
   <string name="gem.purchase.toolbartitle">Comprar</string>
diff --git a/Habitica/res/values-fr/strings.profile.xml b/Habitica/res/values-fr/strings.profile.xml
index 4646f34b2..448f06739 100644
--- a/Habitica/res/values-fr/strings.profile.xml
+++ b/Habitica/res/values-fr/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">Message privé</string>
     <string name="profile_achievements">Succès</string>
     <string name="profile_achievement_ok">Ok</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-fr/strings.tutorial.xml b/Habitica/res/values-fr/strings.tutorial.xml
index 8e8d9de98..73673bdb4 100644
--- a/Habitica/res/values-fr/strings.tutorial.xml
+++ b/Habitica/res/values-fr/strings.tutorial.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Réalisez vos Bonnes Habitudes afin de gagner de l\'or et de l\'expérience. Les Mauvaises Habitudes blesseront votre avatar si vous tapez sur elles, alors essayez de les éviter dans la vie réelle !</string>
-  <string name="tutorial_dailies">Accomplissez vos Tâches Quotidiennes afin de gagner de l\'or et de l\'expérience. Attention ! Les Tâches Quotidiennes blesseront votre avatar si vous ne les accomplissez pas à temps.</string>
-  <string name="tutorial_todos">Effectuez vos tâches À Faire dans la vraie vie, puis cochez-les pour gagner de l\'OR et de l\'EXPERIENCE, afin de récupérer des Récompenses et de débloquer du nouveau contenu !</string>
-  <string name="tutorial_rewards">Voici vos Récompenses !  Gagnez de l\'or en effectuant des Habitudes, des Tâches Quotidiennes et des Tâches à Faire dans le monde réel. Puis, dépensez-le en Récompenses dans le jeu ou en Récompenses personnalisées dans le monde réel.</string>
   <string name="tutorial_equipment">Quand vous achetez de l\'équipement, il apparaît ici. Votre Equipement de Combat affecte vos caractéristiques, et votre Costume (si utilisé) change l\'apparence de votre avatar.</string>
   <string name="tutorial_items">Gagnez des objets en accomplissant des tâches et en changeant de niveau. Tapez sur un objet pour l\'utiliser !</string>
   <string name="tutorial_pets">En accomplissant des tâches dans le monde réel, vous avez désormais une chance de trouver des œufs et des potions. Combinez-les pour faire éclore des familiers</string>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index ad68422b5..850fff634 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -38,10 +38,10 @@
   <string name="preference_push_invited_to_quest">Invitation à une quête</string>
   <!--Adding tasks-->
   <string name="task_value">Valeur</string>
-  <string name="new_todo">Nouvelle tâche</string>
-  <string name="new_reward">Nouvelle récompense</string>
-  <string name="new_daily">Nouvelle tâche quotidienne</string>
-  <string name="new_habit">Nouvelle habitude</string>
+  <string name="new_todo">Nouvelle tâche À Faire</string>
+  <string name="new_reward">Nouvelle Récompense</string>
+  <string name="new_daily">Nouvelle Quotidienne</string>
+  <string name="new_habit">Nouvelle Habitude</string>
   <string name="action_edit">Modifier</string>
   <string name="action_delete">Supprimer</string>
   <string name="action_cancel">Annuler</string>
@@ -187,8 +187,7 @@
   <string name="intro_2_subtitle">Progrès en jeu</string>
   <string name="intro_2_title">Progrès dans la vie</string>
   <string name="intro_2_description">Débloquez des fonctionnalités en jeu en validant vos tâches dans la vraie vie. Obtenez des équipements, des familiers, et d\'autres récompenses pour l\'accomplissement de vos objectifs.</string>
-  <string name="intro_3_subtitle">Sociabilisez-vous</string>
-  <string name="intro_3_title">Combattez des monstres</string>
+  <string name="intro_3_subtitle">Combattez des monstres</string>
   <string name="intro_3_description">Restez sur les rails de l\'accomplissement de vos buts avez l\'aide de vos amis. Épaulez-vous dans la vie et dans la bataille en vous améliorant ensemble !</string>
   <string name="intro_finish_button">C\'est parti !</string>
   <string name="previous_button">Précédent</string>
@@ -197,8 +196,10 @@
   <string name="setup_welcome_description">Bienvenue sur Habitica, où progresser dans le jeu améliorera votre vie quotidienne ! En accomplissant vos buts dans le monde réel, vous débloquerez de l’expérience, des animaux, des quêtes, et bien plus encore.</string>
   <string name="setup_welcome_title">Bienvenue</string>
   <string name="avatar_setup_description">Alors, à quoi voudriez-vous ressembler ? Ne vous inquiétez pas, vous pourrez changer d\'apparence plus tard.</string>
+  <string name="task_setup_description">Bien ! Maintenant, que voudriez-vous travailler pendant cette aventure ?</string>
   <string name="setup_group_work">Travailler</string>
   <string name="setup_group_exercise">Faire de l\'exercice</string>
+  <string name="setup_group_health">Santé</string>
   <string name="setup_group_school">Ecole</string>
   <string name="setup_group_teams">Equipes</string>
   <string name="setup_group_chores">Tâches ménagères</string>
@@ -232,13 +233,12 @@
   <string name="join">Rejoindre</string>
   <string name="leader">Responsable</string>
   <string name="gems">Gemmes</string>
-  <string name="copy_as_todo">Copier comme tâche À Faire</string>
+  <string name="copy_as_todo">Copier comme une tâche À Faire</string>
   <string name="send_pm">Envoyer un MP</string>
   <string name="flag">Signaler</string>
   <string name="delete">Supprimer</string>
   <string name="name">Nom</string>
   <string name="description">Description</string>
-  <string name="add_tag">Ajouter une étiquette</string>
   <string name="privacy">Sécurité</string>
   <string name="write_message">Écrire un message</string>
   <string name="post">Envoyer</string>
@@ -395,7 +395,6 @@
   <string name="all_dailies_completed">Vous avez accompli toutes vos tâches quotidiennes. Bravo !</string>
   <string name="widget_habit_button">Réaliser une tâche Habitica</string>
   <string name="widget_dailies">Quotidiennes Habitica</string>
-  <string name="widget_todo_list">Liste des tâches À faire Habitica</string>
   <string name="widget_add_task">Ajouter une tâche Habitica</string>
   <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
   <string name="gem.purchase.toolbartitle">Acheter</string>
@@ -519,8 +518,15 @@
   <string name="avatar_wheelchair">Fauteuil roulant</string>
   <string name="weak">Faibles</string>
   <string name="strong">Fortes</string>
-  <string name="gray">Grisées</string>
   <string name="dated">Datées</string>
   <string name="completed">Terminé</string>
   <string name="setuP_group_other">Autre</string>
+  <string name="clear">Effacer</string>
+  <string name="empty_title_habits">Vous n\'avez aucune habitude</string>
+  <string name="empty_description_habits">Les habitudes sont des tâches qui n\'ont pas de planning défini. Vous pouvez les valider plusieurs fois par jour, ou pas du tout.</string>
+  <string name="empty_title_dailies">Vous n\'avez aucune tâche quotidienne</string>
+  <string name="empty_description_dailies">Les quotidiennes sont des tâches qui se répètent de façon régulière. Choisissez la planification qui vous convient !</string>
+  <string name="empty_title_todos">Vous n\'avez aucune tâche à faire</string>
+  <string name="empty_description_todos">Les tâches à faire sont des tâches qui ne doivent être validées qu\'une seule fois. Ajoutez des listes de vérifications pour augmenter leur valeur.</string>
+  <string name="empty_title_rewards">Vous n\'avez aucune récompense</string>
 </resources>
diff --git a/Habitica/res/values-in/strings.tutorial.xml b/Habitica/res/values-in/strings.tutorial.xml
index 0b28c2cb5..5e11b34c2 100644
--- a/Habitica/res/values-in/strings.tutorial.xml
+++ b/Habitica/res/values-in/strings.tutorial.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Lakukan Kebiasaan Baik untuk mendapatkan emas dan pengalaman! Kebiasaan Buruk akan menyakiti avatarmu jika kamu mengetuknya, jadi hindari melakukannya di dunia nyata!</string>
-  <string name="tutorial_dailies">Kalahkan tugas harianmu yang berulang untuk mendapatkan emas dan pengalaman. Bahaya! Keseharian akan menyakiti avatarmu jika kamu tidak menyelesaikannya tepat waktu.</string>
-  <string name="tutorial_todos">Lakukan Tugasmu di dunia nyata, lalu ceklis daftar untuk EMAS dan PENGALAMAN sehingga kamu bisa mendapatkan Hadiah dan membuka fitur baru!</string>
-  <string name="tutorial_rewards">Ini adalah Hadiahmu! Dapatkan emas dengan menyelesaikan Tugas dunia-nyata, Keseharian, dan Daftar Tugas. Kemudian habiskan untuk Hadiah dalam game atau Hadiah dunia nyata kustom!</string>
   <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya mempengaruhi apa yang avatarmu kenakan.</string>
   <string name="tutorial_items">Dapatkan item dengan menyelesaikan tugas dan meningkatkan level. Ketuk pada item untuk menggunakannya!</string>
   <string name="tutorial_pets">Seiring kamu menyelesaikan tugas dunia-nyata, kamu sekarang memiliki kesempatan acak untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index f99555990..8ca3a0589 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -16,7 +16,6 @@
   <string name="Language_summary">Ganti bahasa dalam Habitica</string>
   <string name="SP_user_qr_code">QR Kodemu</string>
   <string name="PS_contact_title">Kontak saya</string>
-  <string name="unknown_error">Terjadi kesalahan...</string>
   <string name="pref_account_header">Akun</string>
   <string name="pref_first_day_of_the_week_title">Hari Pertama dalam Minggu</string>
   <string name="pref_first_day_of_the_week_summary">Hari pertama dalam minggu di semua kalender</string>
@@ -38,10 +37,6 @@
   <string name="preference_push_invited_to_quest">Terundang ke Tugas</string>
   <!--Adding tasks-->
   <string name="task_value">Nilai</string>
-  <string name="new_todo">Tugas baru</string>
-  <string name="new_reward">Hadiah baru</string>
-  <string name="new_daily">Keseharian baru</string>
-  <string name="new_habit">Kebiasaan baru</string>
   <string name="action_edit">Edit</string>
   <string name="action_delete">Hapus</string>
   <string name="action_cancel">Batal</string>
@@ -222,13 +217,11 @@
   <string name="join">Gabung</string>
   <string name="leader">Ketua</string>
   <string name="gems">Permata</string>
-  <string name="copy_as_todo">Salin sebagai Tugas</string>
   <string name="send_pm">Kirim PM</string>
   <string name="flag">Tandai</string>
   <string name="delete">Hapus</string>
   <string name="name">Nama </string>
   <string name="description">Deskripsi</string>
-  <string name="add_tag">Beri Label</string>
   <string name="privacy">Privasi</string>
   <string name="write_message">Tulis Pesan</string>
   <string name="post">Kirim</string>
@@ -384,7 +377,6 @@
   <string name="all_dailies_completed">Anda telah menyelesaikan semua keseharianmu. Selamat!</string>
   <string name="widget_habit_button">Habitica Melakukan Kebiasaan</string>
   <string name="widget_dailies">Keseharian Habitica</string>
-  <string name="widget_todo_list">Daftar Tugas Habitica</string>
   <string name="widget_add_task">Habitica Menambahkan Tugas</string>
   <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
   <string name="gem.purchase.toolbartitle">Bayar</string>
diff --git a/Habitica/res/values-it/strings.profile.xml b/Habitica/res/values-it/strings.profile.xml
index 8140922e2..a5a025896 100644
--- a/Habitica/res/values-it/strings.profile.xml
+++ b/Habitica/res/values-it/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Messaggio privato</string>
     <string name="profile_achievements">Medaglie</string>
     <string name="profile_achievement_ok">Ok</string>
+    <string name="profile_qrcode_close">Chiudi</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-it/strings.tutorial.xml b/Habitica/res/values-it/strings.tutorial.xml
index ed311d450..a46666b74 100644
--- a/Habitica/res/values-it/strings.tutorial.xml
+++ b/Habitica/res/values-it/strings.tutorial.xml
@@ -1,9 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Completa le tue Habit (abitudini) positive per guadagnare oro ed esperienza! Le abitudini negative danneggeranno il tuo avatar se le tocchi, quindi cerca di evitarle nella vita reale!</string>
-  <string name="tutorial_dailies">Sconfiggi i tuoi impegni giornalieri (Daily) per guadagnare oro ed esperienza. Attenzione! Le Daily danneggeranno il tuo avatar se non le completerai in tempo.</string>
-  <string name="tutorial_todos">Completa i tuoi To-Do nella vita reale, poi spuntali per ottenere ORO ed ESPERIENZA in modo da poter comprare delle Ricompense e sbloccare nuove funzionalità di gioco!</string>
-  <string name="tutorial_rewards">Queste sono le tue Ricompense! Guadagna oro completando le tue Daily, Habit e To-Do. Poi spendilo in Ricompense nel gioco o nella vita reale!</string>
+  <string name="tutorial_overview">Eccoci qui! Ho creato alcune attività per te basate sui tuoi interessi. Prova ad aggiungerne qualcuna anche tu. Puoi modificare un\'attività toccando il titolo.</string>
+  <string name="tutorial_habits_1">Per prima cosa ci sono le Habit, le abitudini. Possono essere abitudini positive che vuoi migliorare o abitudini negative che vuoi abbandonare.</string>
+  <string name="tutorial_habits_2">Ogni volta che porti a termine un\'abitudine positiva, tocca il + per ottenere esperienza ed oro!</string>
+  <string name="tutorial_habits_3">Se ti fai tentare da un\'abitudine negativa, toccando - il tuo avatar perderà punti salute, per aiutarti a non farlo di nuovo.</string>
+  <string name="tutorial_todos_1">Usa le To-do per tenere traccia delle cose che devi fare solo una volta.</string>
+  <string name="tutorial_todos_2">Se le tue To-do devono essere completate entro un certo giorno, imposta una data di scadenza. Pare che tu possa completarne una, prova!</string>
+  <string name="tutorial_rewards_1">Compra oggetti per il tuo avatar con l\'oro che ottieni!</string>
+  <string name="tutorial_rewards_2">Puoi anche creare delle ricompense reali, basate su ciò che ti motiva.</string>
+  <string name="tutorial_tasks_complete">Per ora è tutto. Se hai bisogno di un ripasso, consulta la sezione FAQ.</string>
   <string name="tutorial_equipment">Quando compri dell\'equipaggiamento, apparirà qui. Il tuo equipaggiamento di battaglia influisce sulle tue statistiche, e il tuo Costume (se attivato) cambia ciò che indossa il tuo avatar.</string>
   <string name="tutorial_items">Guadagnati degli oggetti completando attività e salendo di livello. Tocca un oggetto per usarlo!</string>
   <string name="tutorial_pets">Man mano che porti a termine attività nella vita reale, ora potrai trovare casualmente uova e pozioni. Combinali per far nascere degli animali!</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index b7309e3bd..242f4a9ee 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -38,10 +38,10 @@
   <string name="preference_push_invited_to_quest">Invito ad una Missione</string>
   <!--Adding tasks-->
   <string name="task_value">Valore</string>
-  <string name="new_todo">Nuova to-do</string>
+  <string name="new_todo">Nuova To-Do</string>
   <string name="new_reward">Nuova ricompensa</string>
-  <string name="new_daily">Nuova daily</string>
-  <string name="new_habit">Nuova habit</string>
+  <string name="new_daily">Nuova Daily</string>
+  <string name="new_habit">Nuova Habit</string>
   <string name="action_edit">Modifica</string>
   <string name="action_delete">Elimina</string>
   <string name="action_cancel">Annulla</string>
@@ -187,8 +187,8 @@
   <string name="intro_2_subtitle">Progressi nel gioco</string>
   <string name="intro_2_title">Progressi nella vita</string>
   <string name="intro_2_description">Sblocca nuovi elementi nel gioco portando a termine gli impegni della vita reale. Ottieni armature, animali e altro come ricompensa per aver raggiunto i tuoi obiettivi.</string>
-  <string name="intro_3_subtitle">Sii Social</string>
-  <string name="intro_3_title">Combatti mostri</string>
+  <string name="intro_3_subtitle">Combatti mostri</string>
+  <string name="intro_3_title">Sii Social</string>
   <string name="intro_3_description">Tieni traccia dei tuoi obiettivi con l\'aiuto dei tuoi amici. Supportatevi a vicenda nella vita e nelle battaglie per migliorare insieme!</string>
   <string name="intro_finish_button">Iniziamo!</string>
   <string name="previous_button">Indietro</string>
@@ -197,8 +197,10 @@
   <string name="setup_welcome_description">Benvenuto in Habitica, dove progredire nel gioco migliorerà la tua vita! Man mano che raggiungerai obiettivi nella vita reale, sbloccherai equipaggiamento, animali, missioni e altro.</string>
   <string name="setup_welcome_title">Benvenuto</string>
   <string name="avatar_setup_description">Quindi, che aspetto ti piacerebbe avere? Non preoccuparti, lo potrai cambiare in seguito.</string>
+  <string name="task_setup_description">Splendido! Ora dimmi, su cosa vorresti lavorare durante questo viaggio?</string>
   <string name="setup_group_work">Lavoro</string>
   <string name="setup_group_exercise">Esercizio fisico</string>
+  <string name="setup_group_health">Salute</string>
   <string name="setup_group_school">Scuola</string>
   <string name="setup_group_teams">Team</string>
   <string name="setup_group_chores">Faccende di casa</string>
@@ -232,13 +234,13 @@
   <string name="join">Partecipa</string>
   <string name="leader">Leader</string>
   <string name="gems">Gemme</string>
-  <string name="copy_as_todo">Copia come ToDo</string>
+  <string name="copy_as_todo">Copia come To-Do</string>
   <string name="send_pm">Invia messaggio privato</string>
   <string name="flag">Segnala</string>
   <string name="delete">Elimina</string>
   <string name="name">Nome</string>
   <string name="description">Descrizione</string>
-  <string name="add_tag">Aggiungi etichetta</string>
+  <string name="add_tag">Aggiungi una nuova etichetta</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Scrivi messaggio</string>
   <string name="post">Invia</string>
@@ -291,7 +293,7 @@
   <string name="use_animal">Usa</string>
   <string name="feed">Dai da mangiare</string>
   <string name="hatch_with">Fai nascere un animale con %s</string>
-  <string name="hatched_pet_title">E\' nato un %2$s %1$s!</string>
+  <string name="hatched_pet_title">È nato un %2$s %1$s!</string>
   <string name="close">Chiudi</string>
   <string name="share">Condividi</string>
   <string name="notification_pet_fed">Hai dato da mangiare al tuo %1$s %2$s!</string>
@@ -328,7 +330,7 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <string name="dialog_go_back">Ritorna</string>
   <string name="opt_out_confirmation">Vuoi davvero rinunciare?</string>
   <string name="change_class">Cambia la tua classe</string>
-  <string name="change_class_description">Cambia classe a riottieni i tuoi punti attributo per 3 gemme. Puoi assegnare i punti attributo attraverso il sito web.</string>
+  <string name="change_class_description">Cambia classe e riottieni i tuoi punti attributo per 3 gemme. Puoi assegnare i punti attributo attraverso il sito web.</string>
   <string name="enable_class">Abilita sistema delle classi</string>
   <string name="changing_class_progress">Cambiamento classe</string>
   <string name="by_email">Per e-mail</string>
@@ -524,4 +526,18 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <string name="dated">Con scadenza</string>
   <string name="completed">Completate</string>
   <string name="setuP_group_other">Altro</string>
+  <string name="clear">Deseleziona</string>
+  <string name="empty_title_habits">Non hai alcuna Habit.</string>
+  <string name="empty_description_habits">Le Habit sono attività che possono essere svolte in modo molto flessibile. Puoi usarle diverse volte al giorno, o non usarle affatto.</string>
+  <string name="empty_title_dailies">Non hai nessuna Daily</string>
+  <string name="empty_description_dailies">Le Daily sono delle attività che vanno svolte regolarmente. Scegli la frequenza con cui ti trovi meglio!</string>
+  <string name="empty_title_todos">Non hai alcuna To-do.</string>
+  <string name="empty_description_todos">Le To-do sono attività da completare solo una volta. Aggiungi una checklist alle tue To-do per aumentarne il valore.</string>
+  <string name="empty_title_rewards">Non hai nessuna Ricompensa</string>
+  <string name="reset_walkthrough">Ripristina la spiegazione introduttiva di Justin</string>
+  <string name="read_community_guidelines">Per favore, leggi le Linee guida della community prima di scrivere un post.</string>
+  <string name="maintenance">Manutenzione</string>
+  <string name="reload_content">Ricarica contenuti</string>
+  <string name="dailyDueDefaultView">Visualizza lista Daily incomplete di default</string>
+  <string name="dailyDueDefaultViewDescription">Con questa opzione selezionata, le Daily mostrate saranno quelle della lista \'incomplete\' invece che \'tutte\'.</string>
 </resources>
diff --git a/Habitica/res/values-iw/strings.tutorial.xml b/Habitica/res/values-iw/strings.tutorial.xml
index 129a2757d..2b2403403 100644
--- a/Habitica/res/values-iw/strings.tutorial.xml
+++ b/Habitica/res/values-iw/strings.tutorial.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">השלימו הרגלים חיוביים כדי לזכות בזהב וניסיון! הרגלים רעים יפגעו בדמות שלכם אם תלחצו עליהם, אז המנעו מהם בחיים האמיתיים!</string>
-  <string name="tutorial_dailies">הביסו את המטלות היומיות שלכם כדי לזכות בזהב וניסיון. זהירות! מטלות יומיות יפגעו בדמות שלכם אם אתם לא משלימים אותן בזמן.</string>
-  <string name="tutorial_todos">השלימו את המטרות שלכם בחיים האמיתיים, ולאחר מכן סמנו שהושלמו כדי לקבל זהב וניסיון - כך שתוכלו להרוויח פרסים ולאפשר יכולות נוספות במשחק!</string>
-  <string name="tutorial_rewards">אלו הם הפרסים שלכם! הרוויחו זהב על-ידי השלמת הרגלים, מטלות יומיות ומטרות בעולם האמיתי. ואז בזבזו אותו על פרסים במשחק או פרסים שהתאמתם לעצמכם אישית בעולם האמיתי!</string>
   <string name="tutorial_equipment">כאשר אתם קונים ציוד הוא מופיע כאן. ציוד הקרב שלכם משפיע על תכונות, והתחפושת שלכם (אם מאופשרת) משפיעה על הלבוש של הדמות שלכם.</string>
   <string name="tutorial_items">הרוויחו חפצים על-ידי השלמת משימות ועלייה בדרגות. לחצו על חפץ כדי להשתמש בו!</string>
   <string name="tutorial_pets">בזמן שאתם משלימים משימות בעולם האמיתי, יש לכם סיכוי למצוא ביצים ושיקויים. שלבו אותם כדי להבקיע חיות מחמד</string>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 68db1042d..7fa971dc1 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -15,7 +15,6 @@
   <string name="Language_title">שפה</string>
   <string name="SP_user_qr_code">קוד ה QR שלכם</string>
   <string name="PS_contact_title">צרו איתי קשר</string>
-  <string name="unknown_error">ארעה תקלה...</string>
   <string name="pref_account_header">חשבון</string>
   <string name="pref_first_day_of_the_week_title">היום הראשון בשבוע</string>
   <string name="pref_reminder_header">תזכורת יומית</string>
@@ -32,10 +31,6 @@
   <string name="preference_push_invited_to_quest">הוזמנו להרפתקה</string>
   <!--Adding tasks-->
   <string name="task_value">ערך</string>
-  <string name="new_todo">מטרה חדשה</string>
-  <string name="new_reward">פרס חדש</string>
-  <string name="new_daily">מטלה יומית חדשה</string>
-  <string name="new_habit">הרגל חדש</string>
   <string name="action_edit">עריכה</string>
   <string name="action_delete">מחיקה</string>
   <string name="action_cancel">ביטול</string>
@@ -214,13 +209,11 @@
   <string name="join">הצטרפו</string>
   <string name="leader">מנהיג</string>
   <string name="gems">אבני חן</string>
-  <string name="copy_as_todo">העתקה כמשימה</string>
   <string name="send_pm">שילחו הודעה פרטית</string>
   <string name="flag">דיווח</string>
   <string name="delete">מחיקה</string>
   <string name="name">שם</string>
   <string name="description">תיאור</string>
-  <string name="add_tag">הוסיפו תגית</string>
   <string name="privacy">פרטיות</string>
   <string name="write_message">כיתבו הודעה</string>
   <string name="post">שליחה</string>
diff --git a/Habitica/res/values-ja/strings.profile.xml b/Habitica/res/values-ja/strings.profile.xml
index e72a7c198..70ba83f5c 100644
--- a/Habitica/res/values-ja/strings.profile.xml
+++ b/Habitica/res/values-ja/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">プライベートメッセージ</string>
     <string name="profile_achievements">実績</string>
     <string name="profile_achievement_ok">Ok</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ja/strings.tutorial.xml b/Habitica/res/values-ja/strings.tutorial.xml
index 4db899107..40dfc9778 100644
--- a/Habitica/res/values-ja/strings.tutorial.xml
+++ b/Habitica/res/values-ja/strings.tutorial.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">いい習慣にとりくんで、ゴールドと経験値を稼ごう! 　悪い習慣をタップすると、アバターがダメージを受けるので、実生活でもひかえるようにしよう!</string>
-  <string name="tutorial_dailies">連続的に日課をやっつけると、得られるゴールドと経験値が増えていくよ。あぶない!　日課を期限内にやっつけないとアバターがダメージを受けるぞ。 </string>
-  <string name="tutorial_todos">To-Do を実生活で達成したら、アプリでチェックを入れて「ゴールド」と「経験値」を手に入れよう。「ごほうび」を得たり、新機能をアンロックすることができるよ。</string>
-  <string name="tutorial_rewards">これがあなたへの「ごほうび」!　現実世界で習慣、日課、そしてTo-Doを達成してゴールドを稼ごう。そして稼いだゴールドでゲーム内の「ごほうび」やあなた好みの現実世界での「ごほうび」を買おう。</string>
   <string name="tutorial_equipment">装備を買ったら、ここに表示されるよ。武装はアバターのステータに影響し、(有効にすれば)衣装としてアバターの見た目を変えるよ。</string>
   <string name="tutorial_items">タスクを達成したりレベルを上げることで、アイテムを入手できるぞ。アイテムを使うにはタップしよう。</string>
   <string name="tutorial_pets">現実世界のタスクを達成すると、「たまご」や「たまごがえしの薬」を見つけるチャンスが。組み合わせるとペットが生まれるよ。</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 3cca459ab..538b041d0 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -16,7 +16,6 @@
   <string name="Language_summary">Habitica の言語を変更する</string>
   <string name="SP_user_qr_code">QR コード</string>
   <string name="PS_contact_title">開発者に連絡する</string>
-  <string name="unknown_error">エラーが発生しました…</string>
   <string name="pref_account_header">アカウント</string>
   <string name="pref_first_day_of_the_week_title">週の最初の曜日</string>
   <string name="pref_first_day_of_the_week_summary">すべてのカレンダーでの週の最初の曜日</string>
@@ -38,10 +37,6 @@
   <string name="preference_push_invited_to_quest">クエストに招待されました</string>
   <!--Adding tasks-->
   <string name="task_value">値</string>
-  <string name="new_todo">新しい To-Do</string>
-  <string name="new_reward">新しいごほうび</string>
-  <string name="new_daily">新しい日課</string>
-  <string name="new_habit">新しい習慣</string>
   <string name="action_edit">編集</string>
   <string name="action_delete">削除</string>
   <string name="action_cancel">戻る</string>
@@ -185,8 +180,6 @@
   <string name="intro_1_title">Habitica</string>
   <string name="intro_2_subtitle">ゲームの進行</string>
   <string name="intro_2_title">人生の進行</string>
-  <string name="intro_3_subtitle">友達とつながって</string>
-  <string name="intro_3_title">モンスターと戦おう</string>
   <string name="intro_3_description">友達の力を借りて目標にしがみつこう。実生活とバトルでお互いに助け合い、いっしょに成長しよう!</string>
   <string name="intro_finish_button">始めましょう!</string>
   <string name="previous_button">戻る</string>
@@ -230,13 +223,11 @@
   <string name="join">参加する</string>
   <string name="leader">リーダー</string>
   <string name="gems">ジェム</string>
-  <string name="copy_as_todo">To-Doにコピーする</string>
   <string name="send_pm">PMを送る</string>
   <string name="flag">フラグ</string>
   <string name="delete">削除</string>
   <string name="name">名前</string>
   <string name="description">詳細</string>
-  <string name="add_tag">タグを追加する</string>
   <string name="privacy">プライバシー</string>
   <string name="write_message">メッセージを書く</string>
   <string name="post">投稿</string>
@@ -393,7 +384,6 @@
   <string name="all_dailies_completed">日課をすべて完了した。お見事!</string>
   <string name="widget_habit_button">Habitica の習慣</string>
   <string name="widget_dailies">Habitica の日課</string>
-  <string name="widget_todo_list">Habitica To-Do リスト</string>
   <string name="widget_add_task">Habitica のタスク追加</string>
   <string name="google_services_missing">Google Play サービスが見つかりません。</string>
   <string name="gem.purchase.toolbartitle">購入</string>
diff --git a/Habitica/res/values-ko/strings.profile.xml b/Habitica/res/values-ko/strings.profile.xml
index 31afe88e1..6142193db 100644
--- a/Habitica/res/values-ko/strings.profile.xml
+++ b/Habitica/res/values-ko/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">개인 메시지</string>
     <string name="profile_achievements">업적</string>
     <string name="profile_achievement_ok">확인</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ko/strings.tutorial.xml b/Habitica/res/values-ko/strings.tutorial.xml
index b81657b97..e5a4ad094 100644
--- a/Habitica/res/values-ko/strings.tutorial.xml
+++ b/Habitica/res/values-ko/strings.tutorial.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">좋은 습관을 달성하고 골드와 경험치를 얻으세요! 나쁜 습관은 당신의 아바타를 다치게 하니, 일상생활을 열심히 하세요!</string>
-  <string name="tutorial_dailies">골드와 경험치를 위해 일일과제를 달성하세요. 주의할 점! 일일과제는 제때 끝내지 못하면 당신의 아바타를 다치게 만들어요.</string>
-  <string name="tutorial_todos">일상에서 해야 할 일을 달성하고 골드와 경험치를 얻으셔서 새로운 보상과 기능을 여세요!</string>
-  <string name="tutorial_rewards">이것들은 당신의 보상들이에요! 습관, 일일과제, 해야할 일들을 일상생활에서 달성하면 골드를 모을 수 있어요. 이 골드를 게임의 보상들이나 스스로 설정한 보상을 구입하는데 사용하세요!</string>
   <string name="tutorial_equipment">장비를 구입하면 여기에 보입니다. 전투장비는 당신의 스탯에 영향을 주고, 당신의 의상은 (활성화 했다면) 아바타의 모습을 바꿔줍니다.</string>
   <string name="tutorial_items">과제와 레벨업을 달성하면 아이템을 받을 수 있습니다. 아이템을 터치해서 사용하세요!</string>
   <string name="tutorial_pets">일상생활의 과제들을 해결해 나아가면, 랜덤으로 알이나 포션을 발견할 수 있습니다. 둘을 섞어서 알을 부화시키면 펫을 얻을 수 있어요.</string>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 7ad02a282..f612b59d0 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -16,7 +16,6 @@
   <string name="Language_summary">Habitica의 언어 바꾸기</string>
   <string name="SP_user_qr_code">당신의 QR코드</string>
   <string name="PS_contact_title">연락처</string>
-  <string name="unknown_error">오류가 발생했습니다...</string>
   <string name="pref_account_header">계정</string>
   <string name="pref_first_day_of_the_week_title">일주일의 첫날</string>
   <string name="pref_first_day_of_the_week_summary">모든 달력에서 일주일의 첫날</string>
@@ -38,10 +37,6 @@
   <string name="preference_push_invited_to_quest">퀘스트에 초대를 받았음</string>
   <!--Adding tasks-->
   <string name="task_value">값</string>
-  <string name="new_todo">새로운 할 일</string>
-  <string name="new_reward">새로운 보상</string>
-  <string name="new_daily">새로운 일일과제</string>
-  <string name="new_habit">새로운 습관</string>
   <string name="action_edit">수정</string>
   <string name="action_delete">삭제</string>
   <string name="action_cancel">취소</string>
@@ -186,8 +181,6 @@
   <string name="intro_2_subtitle">게임의 진전</string>
   <string name="intro_2_title">삶의 진전</string>
   <string name="intro_2_description">실제 삶에서의 일을 처리하는 것으로 게임의 특색들을 잠금해제 하세요. 목표를 달성해 갑옷, 펫, 그리고 더 많은 것들을 얻으세요.</string>
-  <string name="intro_3_subtitle">친목을 다지세요</string>
-  <string name="intro_3_title">몬스터와 싸우세요</string>
   <string name="intro_3_description">친구들의 도움으로 당신의 목표를 유지시키세요. 일상 생활과 전투에서 서로를 도와가며 함께 성장하세요!</string>
   <string name="intro_finish_button">시작합시다!</string>
   <string name="previous_button">이전</string>
@@ -237,13 +230,11 @@
   <string name="join">가입하기</string>
   <string name="leader">리더</string>
   <string name="gems">보석</string>
-  <string name="copy_as_todo">해야할 일로 복사하기</string>
   <string name="send_pm">개인 메시지 보내기</string>
   <string name="flag">신고</string>
   <string name="delete">삭제</string>
   <string name="name">이름</string>
   <string name="description">설명</string>
-  <string name="add_tag">태그 더하기</string>
   <string name="privacy">개인정보 보호</string>
   <string name="write_message">메세지 작성</string>
   <string name="post">게시</string>
@@ -400,7 +391,6 @@
   <string name="all_dailies_completed">오늘의 모든 일일과제를 달성하셨습니다. 잘 했어요!</string>
   <string name="widget_habit_button">Habitica 습관</string>
   <string name="widget_dailies">Habitica 일일과제</string>
-  <string name="widget_todo_list">Habitica 해야 할 일 목록</string>
   <string name="widget_add_task">Habitica 과제 추가</string>
   <string name="google_services_missing">구글 플레이 서비스를 찾을 수 없습니다.</string>
   <string name="gem.purchase.toolbartitle">구매</string>
diff --git a/Habitica/res/values-lt/strings.tutorial.xml b/Habitica/res/values-lt/strings.tutorial.xml
index cabe74759..1529bf298 100644
--- a/Habitica/res/values-lt/strings.tutorial.xml
+++ b/Habitica/res/values-lt/strings.tutorial.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Tvirtink savo Teigiamus Įpročius, kad gautum aukso ir patirties! Blogi Įpročiai darys žalą tavo veikėjui, juos pažymėjus, taigi venk jų savo gyvenime!</string>
-  <string name="tutorial_dailies">Nugalėk savo kasdienes Užduotis ir gauk aukso bei patirties. Bet Atsargiai! Nebaigtos užduotys padarys žalos tavo veikėjui, jei jų laiku neatliksi.</string>
-  <string name="tutorial_todos">Pabaigus vienkartines užduotis, pažymėk jas ir gausi Aukso bei Patirties, su kuriais gali atsidengti naujas funkcijas ir uždirbti Atlygius!</string>
-  <string name="tutorial_rewards">Tai tavo Atlygiai! Užsidirbk aukso darant užduotis ir tvirtinant savo Įpročius. Auksą galima leisti tiek žaidimo Atlygiams tiek savo susikurtiems tikro gyvenimo Atlygiams! </string>
   <string name="tutorial_equipment">Tavo perkami įrankiai atsiras čia. Tavo Kovinė Apranga keičia tavo statistiką, ir tavo Kostiumas (jei įjungtas) keičia tavo veikėjo išvaizdą.</string>
   <string name="tutorial_items">Rask lobius atliekant užduotis ir keliant veikėjo lygį. Paspausk ant lobio, kad jį panaudoti!</string>
   <string name="tutorial_pets">Darant savo gyvenimo užduotis, turi šansą rasti kiaušinius ir eliksyrus. Maišant juos gali išauginti gyvūnėlius.</string>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index de54111bd..211847db5 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -16,7 +16,6 @@
   <string name="Language_summary">Pakeisti Habitica kalbą</string>
   <string name="SP_user_qr_code">Tavo QR Kodas</string>
   <string name="PS_contact_title">Susisiekti</string>
-  <string name="unknown_error">Įvyko klaida...</string>
   <string name="pref_account_header">Paskyra</string>
   <string name="pref_first_day_of_the_week_title">Pirma Savaitės Diena</string>
   <string name="pref_first_day_of_the_week_summary">Pirma savaitės diena visuose kalendoriuose</string>
@@ -38,10 +37,6 @@
   <string name="preference_push_invited_to_quest">Pakvietimas į Misiją</string>
   <!--Adding tasks-->
   <string name="task_value">Reikšmė</string>
-  <string name="new_todo">Nauja vienkartinė užduotis</string>
-  <string name="new_reward">Naujas atlygis</string>
-  <string name="new_daily">Nauja dienos uždutis</string>
-  <string name="new_habit">Naujas įprotis</string>
   <string name="action_edit">Keisti</string>
   <string name="action_delete">Ištrinti</string>
   <string name="action_cancel">Atšaukti</string>
@@ -221,13 +216,11 @@
   <string name="join">Prisijungti</string>
   <string name="leader">Vadas</string>
   <string name="gems">Brangakmeniai</string>
-  <string name="copy_as_todo">Kopijuoti kaip Užduotį</string>
   <string name="send_pm">Siųsti Žinutę</string>
   <string name="flag">Žymėti</string>
   <string name="delete">Trinti</string>
   <string name="name">Pavadinimas</string>
   <string name="description">Aprašymas</string>
-  <string name="add_tag">Pridėti Žymę</string>
   <string name="privacy">Privatumas</string>
   <string name="write_message">Rašyti Žinutę</string>
   <string name="post">Siųsti</string>
@@ -377,7 +370,6 @@
   <string name="all_dailies_completed">Atlikai visas savo dienos užduotis. Puiku!</string>
   <string name="widget_habit_button">Habitica Pažymėti Įprotį</string>
   <string name="widget_dailies">Habitica Kasdienės Užduotys</string>
-  <string name="widget_todo_list">Habitica užduočių sąrašas</string>
   <string name="widget_add_task">Habitica Prodėti Užduotį</string>
   <string name="google_services_missing">Nepavyko rasti Google play paslaugos.</string>
   <string name="gem.purchase.toolbartitle">Pirkti</string>
diff --git a/Habitica/res/values-nl/strings.profile.xml b/Habitica/res/values-nl/strings.profile.xml
index 3c04c13a5..a481be4c6 100644
--- a/Habitica/res/values-nl/strings.profile.xml
+++ b/Habitica/res/values-nl/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Privébericht</string>
     <string name="profile_achievements">Prestaties</string>
     <string name="profile_achievement_ok">Oké</string>
+    <string name="profile_qrcode_close">Sluiten</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-nl/strings.tutorial.xml b/Habitica/res/values-nl/strings.tutorial.xml
index 5903896f5..93512db34 100644
--- a/Habitica/res/values-nl/strings.tutorial.xml
+++ b/Habitica/res/values-nl/strings.tutorial.xml
@@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Voltooi positieve gewoontes om goud en ervaringspunten te verdienen! Negatieve gewoontes schaden je avatar als je ze aan klikt, dus vermijd ze in het echte leven!</string>
-  <string name="tutorial_dailies">Versla je herhalende dagelijkse taken om goud en ervaringspunten te verdienen. Pas op! Dagelijkse taken zullen je avatar bezeren als je ze niet op tijd voltooit.</string>
-  <string name="tutorial_todos">Voltooi je to-do\'s in het echte leven en streep ze dan hier af voor GOUD en ERVARINGSPUNTEN zodat je beloningen kunt verdienen en nieuwe mogelijkheden kunt ontgrendelen!</string>
-  <string name="tutorial_rewards">Dit zijn je beloningen! Verdien goud door gewoontes, dagelijkse taken en to-do\'s te voltooien in de echte wereld. Gebruik het daarna voor in-game beloningen of zelf gekozen beloningen in de echte wereld!</string>
+  <string name="tutorial_overview">Daar zijn we dan! Ik heb enkele taken voor je ingevuld op basis van je interesses. Probeer er zelf enkele aan toe te voegen. Je kan elke taak bewerken door op de titel te tikken.</string>
+  <string name="tutorial_habits_1">Als eerste de gewoontes. Dit kunnen goede gewoontes zijn die je wilt verbeteren of slechte gewoontes die je wilt afleren.</string>
+  <string name="tutorial_habits_2">Iedere keer dat je een goede gewoonte doet, tik je op de + om ervaring en goud te krijgen!</string>
+  <string name="tutorial_habits_3">Als je toegeeft en een slechte gewoonte doet, tik je op de - en verliest je avatar gezondheid, dus neem verantwoordelijkheid en voorkom slechte gewoontes.</string>
+  <string name="tutorial_habits_4">Probeer het maar! Je kan de andere soorten taken doornemen met de onderstaande navigatie.</string>
+  <string name="tutorial_dailies_1">Maak dagelijkse taken voor tijdgevoelige taken die volgens een vast schema gedaan moeten worden.</string>
+  <string name="tutorial_dailies_2">Wees voorzichtig - als je er een mist, verliest je avatar gezondheid de volgende dag. Vink ze regelmatig af voor grootse beloningen!</string>
+  <string name="tutorial_todos_1">Gebruik to-do\'s om taken bij te houden die je slechts één keer moet doen.</string>
+  <string name="tutorial_todos_2">Als je to-do tegen een bepaalde dag afgewerkt moet zijn, voer dan een einddatum in. Je kan er precies een afvinken - doe maar!</string>
+  <string name="tutorial_rewards_1">Koop uitrusting voor je avatar met het goud dat je verdient!</string>
+  <string name="tutorial_rewards_2">Je kan ook zelf beloningen maken voor in de echte wereld, gebaseerd op wat je motiveert.</string>
+  <string name="tutorial_tasks_complete">Dat was het voorlopig. Als je iets vergeet, kijk dan in de FAQ sectie.</string>
   <string name="tutorial_equipment">Als je uitrustingsstukken koopt verschijnen die hier. Jouw gevechtsuitrusting beïnvloedt je statistieken en je kostuum (als het aan staat) beïnvloedt wat je avatar aan heeft.</string>
   <string name="tutorial_items">Verdien voorwerpen door taken te voltooien en niveaus omhoog te gaan. Tik op een voorwerp om het te gebruiken!</string>
   <string name="tutorial_pets">Terwijl je taken uit de echte wereld voltooit, heb je een kans om eieren en drankjes te vinden. Combineer ze om je huisdier te laten uitkomen.</string>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 23d27b64b..2e4221f31 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -16,7 +16,7 @@
   <string name="Language_summary">Verander Habitica\'s taal</string>
   <string name="SP_user_qr_code">Je QR code</string>
   <string name="PS_contact_title">Contact</string>
-  <string name="unknown_error">Er ging iets mis...</string>
+  <string name="unknown_error">Een fout is opgetreden...</string>
   <string name="pref_account_header">Account</string>
   <string name="pref_first_day_of_the_week_title">Eerste dag van de week</string>
   <string name="pref_first_day_of_the_week_summary">Eerste dag van de week op alle kalenders</string>
@@ -187,8 +187,8 @@
   <string name="intro_2_subtitle">Vooruitgang in het spel</string>
   <string name="intro_2_title">Vooruitgang in je leven</string>
   <string name="intro_2_description">Ontgrendel functies in het spel door taken in je echte leven af te vinken. Verdien uitrusting, huisdieren en meer als beloning voor het bereiken van je doelen.</string>
-  <string name="intro_3_subtitle">Word sociaal</string>
-  <string name="intro_3_title">Vecht tegen monsters</string>
+  <string name="intro_3_subtitle">Vecht tegen monsters</string>
+  <string name="intro_3_title">Wordt sociaal</string>
   <string name="intro_3_description">Houd je doelen op peil met hulp van je vrienden. Ondersteun elkaar in het leven en vecht samen terwijl je steeds beter wordt.</string>
   <string name="intro_finish_button">Laten we beginnen!</string>
   <string name="previous_button">Vorige</string>
@@ -197,8 +197,10 @@
   <string name="setup_welcome_description">Welkom in Habitica, waar vooruitgang in het spel je leven zal verbeteren! Terwijl je echte doelen bereikt, verdien je uitrusting, huisdieren, queestes en meer.</string>
   <string name="setup_welcome_title">Welkom</string>
   <string name="avatar_setup_description">Dus, hoe wil jij er uit zien? Geen zorgen, je kan dit later veranderen.</string>
+  <string name="task_setup_description">Geweldig! Nu, waar zou je graag aan willen werken doorheen deze reis?</string>
   <string name="setup_group_work">Werk</string>
   <string name="setup_group_exercise">Sport</string>
+  <string name="setup_group_health">Gezondheid</string>
   <string name="setup_group_school">School</string>
   <string name="setup_group_teams">Teams</string>
   <string name="setup_group_chores">Klusjes</string>
@@ -238,7 +240,7 @@
   <string name="delete">Verwijderen</string>
   <string name="name">Naam</string>
   <string name="description">Beschrijving</string>
-  <string name="add_tag">Label toevoegen</string>
+  <string name="add_tag">Nieuwe label toevoegen</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Bericht schrijven</string>
   <string name="post">Post</string>
@@ -395,7 +397,7 @@
   <string name="all_dailies_completed">Je hebt al je Dagelijkse taken voltooid. Goed gedaan!</string>
   <string name="widget_habit_button">Habitica Doe Gewoonte</string>
   <string name="widget_dailies">Habitica Dagelijkse taken</string>
-  <string name="widget_todo_list">Habitica To-do Lijst</string>
+  <string name="widget_todo_list">Habitica to-do lijst</string>
   <string name="widget_add_task">Habitica Voeg taak toe</string>
   <string name="google_services_missing">Google play diensten niet gevonden.</string>
   <string name="gem.purchase.toolbartitle">Kopen</string>
@@ -513,6 +515,28 @@
   <string name="avatar_extras">Extra\'s</string>
   <string name="avatar_skin_color">Huidskleur</string>
   <string name="avatar_hair_color">Haarkleur</string>
+  <string name="avatar_hair_bangs">Pony</string>
+  <string name="avatar_hair_ponytail">Paardenstaart</string>
   <string name="avatar_glasses">Bril</string>
   <string name="avatar_wheelchair">Rolstoel</string>
+  <string name="weak">Zwak</string>
+  <string name="strong">Sterk</string>
+  <string name="gray">Grijd</string>
+  <string name="dated">Gedateerd</string>
+  <string name="completed">Voltooid</string>
+  <string name="setuP_group_other">Andere</string>
+  <string name="clear">Wissen</string>
+  <string name="empty_title_habits">Je hebt geen gewoontes</string>
+  <string name="empty_description_habits">Gewoontes zijn taken die geen vast schema hebben. Je kan ze meerdere keren per dag afvinken of helemaal niet.</string>
+  <string name="empty_title_dailies">Je hebt geen dagelijkse taken</string>
+  <string name="empty_description_dailies">Dagelijkse taken zijn taken die op een vast schema herhalen. Kies de routine die voor jou werkt!</string>
+  <string name="empty_title_todos">Je hebt geen to-do\'s</string>
+  <string name="empty_description_todos">To-do\'s zijn taken die slechts een keer voltooid moeten worden. Voeg checklijsten aan je to-do\'s toe om hun waarde te verhogen.</string>
+  <string name="empty_title_rewards">Je hebt geen beloningen</string>
+  <string name="reset_walkthrough">Herstart Justin\'s inleiding</string>
+  <string name="read_community_guidelines">Lees alsjeblieft onze gemeenschapsrichtlijnen voordat je berichten plaatst</string>
+  <string name="maintenance">Onderhoud</string>
+  <string name="reload_content">Inhoud herladen</string>
+  <string name="dailyDueDefaultView">Standaard de \'Onvoltooid\' tab laten zien in Dagelijkse Taken</string>
+  <string name="dailyDueDefaultViewDescription">Als deze optie aan staat, wordt standaard de \'onvoltooid\' tab getoond in plaats van \'alle\'</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.profile.xml b/Habitica/res/values-pl/strings.profile.xml
index 4570ca2a3..0206d9948 100644
--- a/Habitica/res/values-pl/strings.profile.xml
+++ b/Habitica/res/values-pl/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Wiadomość prywatna</string>
     <string name="profile_achievements">Osiągnięcia</string>
     <string name="profile_achievement_ok">OK</string>
+    <string name="profile_qrcode_close">Zamknij</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-pl/strings.tutorial.xml b/Habitica/res/values-pl/strings.tutorial.xml
index 91410edf3..4ccc6adaf 100644
--- a/Habitica/res/values-pl/strings.tutorial.xml
+++ b/Habitica/res/values-pl/strings.tutorial.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Utrwalaj Pozytywne Nawyki, aby zdobyć złoto i punkty doświadczenia! Negatywne Nawyki zranią Twojego bohatera gdy na nie natrafisz. Unikaj ich w prawdziwym życiu!</string>
-  <string name="tutorial_dailies">Pokonuj kolejne Codzienne zadania, aby zdobyć złoto i doświadczenie. Uwaga! Codzienne zranią Twojego awatara, jeśli nie ukończysz ich na czas.</string>
-  <string name="tutorial_todos">Ukończ swoje Do-Zrobienia w prawdziwym życiu i odznacz je w zamian za ZŁOTO i DOŚWIADCZENIE, aby móc kupować Nagrody i odblokowywać nowe funkcje!</string>
-  <string name="tutorial_rewards">Oto Twoje Nagrody! Zyskuj złoto za ukończone w prawdziwym życiu Nawyki, Codzienne i Do-Zrobienia. Następnie wydawaj na Nagrody w grze lub własne w realnym świecie!</string>
+  <string name="tutorial_tasks_complete">To wszystko na razie. Jeżeli potrzebujesz przypomnienia, sprawdź sekcję FAQ.</string>
   <string name="tutorial_equipment">Tu pojawia się zakupiony ekwipunek. Wyposażenie Bojowe wpływa na Twoje statystyki, a Kostium (o ile włączony) na wygląd Twojego awatara.</string>
   <string name="tutorial_items">Zbieraj przedmioty kończąc zadania i zdobywając poziomy. Stuknij przedmiot, żeby go użyć!</string>
   <string name="tutorial_pets">Kończąc zadania w prawdziwym świecie, masz szansę znalezienia losowych jaj i eliksirów. Połącz je, aby wykluć chowańce.</string>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 6f6c1fae7..358271d13 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -38,10 +38,10 @@
   <string name="preference_push_invited_to_quest">Zaproszono Cię na misję</string>
   <!--Adding tasks-->
   <string name="task_value">Wartość</string>
-  <string name="new_todo">Nowe DoZrobienia</string>
-  <string name="new_reward">Nowa Nagroda</string>
-  <string name="new_daily">Nowe Codzienne</string>
-  <string name="new_habit">Nowy Nawyk</string>
+  <string name="new_todo">Nowe Do-Zrobienia</string>
+  <string name="new_reward">Nowa nagroda</string>
+  <string name="new_daily">Nowe codzienne</string>
+  <string name="new_habit">Nowy nawyk</string>
   <string name="action_edit">Edytuj</string>
   <string name="action_delete">Usuń</string>
   <string name="action_cancel">Anuluj</string>
@@ -186,7 +186,6 @@
   <string name="intro_2_subtitle">Postęp w grze</string>
   <string name="intro_2_title">Postęp w życiu</string>
   <string name="intro_2_description">Odblokuj cechy w grze przez wykonywanie twoich zadań z realnego życia. Zdobywaj broń, chowańce i znacznie więcej za realizacje swoich celów.</string>
-  <string name="intro_3_title">Walcz z potworami</string>
   <string name="intro_3_description">Zmierzaj do swoich celów z pomocą przyjaciół. Wspierajcie się wzajemnie w życiu i w walce, aby wspólnie się udoskonalać!</string>
   <string name="intro_finish_button">Zaczynajmy!</string>
   <string name="previous_button">Poprzedni</string>
@@ -197,6 +196,7 @@
   <string name="avatar_setup_description">Więc, jak chciałbyś wyglądać. Nie obawiaj się, możesz to później zmienić.</string>
   <string name="setup_group_work">Praca</string>
   <string name="setup_group_exercise">Ćwiczenia</string>
+  <string name="setup_group_health">Zdrowie</string>
   <string name="setup_group_school">Szkoła</string>
   <string name="setup_group_teams">Zespoły</string>
   <string name="setup_group_chores">Obowiązki domowe</string>
@@ -230,13 +230,12 @@
   <string name="join">Dołącz</string>
   <string name="leader">Lider</string>
   <string name="gems">Klejnoty</string>
-  <string name="copy_as_todo">Skopiuj jako Do-Zrobienia</string>
+  <string name="copy_as_todo">Kopiuj jako Do-Zrobienia</string>
   <string name="send_pm">Wyślij wiadomość</string>
   <string name="flag">Oznacz</string>
   <string name="delete">Usuń</string>
   <string name="name">Nazwa</string>
   <string name="description">Opis</string>
-  <string name="add_tag">Dodaj tag</string>
   <string name="privacy">Prywatność</string>
   <string name="write_message">Napisz wiadomość</string>
   <string name="post">Wyślij</string>
@@ -393,7 +392,7 @@
   <string name="all_dailies_completed">Wykonałeś wszystkie codzienne. Brawo!</string>
   <string name="widget_habit_button">Nawyk Habitiki</string>
   <string name="widget_dailies">Codzienne Habitiki</string>
-  <string name="widget_todo_list">Lista do zrobienia Habitiki</string>
+  <string name="widget_todo_list">Lista Do-Zrobienia Habitiki</string>
   <string name="widget_add_task">Dodaj zadanie do Habitiki</string>
   <string name="google_services_missing">Nie znaleziono usługi Google Play.</string>
   <string name="gem.purchase.toolbartitle">Zamów</string>
@@ -499,7 +498,17 @@
   <string name="avatar_wheelchair">Wózek</string>
   <string name="weak">Słaby</string>
   <string name="strong">Silny</string>
-  <string name="gray">Szary</string>
   <string name="dated">Przestarzały</string>
+  <string name="completed">Ukończone</string>
   <string name="setuP_group_other">Pozostałe</string>
+  <string name="empty_title_habits">Nie posiadasz żadnych nawyków</string>
+  <string name="empty_description_habits">Nawyki są zadaniami nie posiadającymi sztywnego harmonogramu. Możesz je odhaczać wiele razy dziennie, lub w ogóle.</string>
+  <string name="empty_title_dailies">Nie posiadasz żadnych codziennych</string>
+  <string name="empty_description_dailies">Codzienne są zadaniami regularnie się powtarzającymi. Wybierz pasujący Ci harmonogram!</string>
+  <string name="empty_title_todos">Nie posiadasz żadnych Do-Zrobienia</string>
+  <string name="empty_description_todos">Do-Zrobienia są jednokrotnymi zadaniami. Dodaj listy kontrolne do swoich Do-Zrobienia, aby zwiększyć ich wartość.</string>
+  <string name="empty_title_rewards">Nie posiadasz żadnych nagród</string>
+  <string name="read_community_guidelines">Prosimy, przeczytaj Wytyczne Społeczności zanim umieścisz posta</string>
+  <string name="maintenance">Utrzymanie</string>
+  <string name="reload_content">Odśwież zawartość</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.profile.xml b/Habitica/res/values-ru/strings.profile.xml
index 100853fd1..03867c934 100644
--- a/Habitica/res/values-ru/strings.profile.xml
+++ b/Habitica/res/values-ru/strings.profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="profile_pets_and_mounts">Питомцы &amp; Скакуны</string>
-    <string name="profile_pets_found">Найдены питомцы</string>
+    <string name="profile_pets_found">Найденые питомцы</string>
     <string name="profile_mounts_tamed">Прирученые скакуны</string>
     <string name="profile_loading_data">загрузка данных участников.</string>
     <string name="profile_send_message_to">Отправить сообщение %s</string>
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Личное сообщение</string>
     <string name="profile_achievements">Достижения</string>
     <string name="profile_achievement_ok">Хорошо</string>
+    <string name="profile_qrcode_close">Закрыть</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ru/strings.tutorial.xml b/Habitica/res/values-ru/strings.tutorial.xml
index 7319f9f1a..1e322454a 100644
--- a/Habitica/res/values-ru/strings.tutorial.xml
+++ b/Habitica/res/values-ru/strings.tutorial.xml
@@ -1,9 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Придерживайтесь хороших привычек, чтобы зарабатывать золото и опыт. Плохие привычки нанесут урон вашему аватару, так что остерегайтесь их!</string>
-  <string name="tutorial_dailies">Выполняйте ежедневные задания, чтобы зарабатывать золото и опыт. Осторожно! Если вы не будете их выполнять вовремя, они нанесут вам урон.</string>
-  <string name="tutorial_todos">Выполняйте задания из Вашего списка дел, затем отмечайте их выполнение, чтобы заработать ЗОЛОТО и ОПЫТ и позже обменять их на награды и открыть новые возможности!</string>
-  <string name="tutorial_rewards">Это ваши награды! Зарабатывайте золото, выполняя задания в реальной жизни. Затем тратьте его на награды в игре или Ваши персональные награды в реальной жизни!</string>
+  <string name="tutorial_overview">Вот и мы! Я выполнил некоторые задания для вас, исходя из ваших интересов. Попробуйте добавить несколько собственных. Вы можете редактировать любую задачу, нажав на заголовок.</string>
+  <string name="tutorial_habits_1">Прежде всего это Привычки. Они могут быть положительными, которые вы хотите приобрести, или негативными, которые вы хотите бросить.</string>
+  <string name="tutorial_habits_2">Каждый раз, когда вы выполняете положительную привычку, нажмите +, чтобы получить опыт и золото!</string>
+  <string name="tutorial_habits_3">Если вы ошибетесь в негативной привычкой, нажав на - , то вы уменьшите здоровье вашего аватара. Это сделано для того, чтобы помочь вам быть более ответственным.</string>
+  <string name="tutorial_dailies_1">Создайте ежедневные задачи, которые необходимо выполнять по расписанию.</string>
+  <string name="tutorial_dailies_2">Будьте осторожны - если вы пропустите раз, ваш аватар в одночасье получит урон . Регулярно выполняя их, вы получите отличные награды!</string>
+  <string name="tutorial_todos_1">Используйте список дел, чтобы отслеживать задачи, которые нужно выполнять только один раз.</string>
+  <string name="tutorial_todos_2">Если ваше задание должно быть выполнено к определенному времени, установите срок. Похоже, вы можете выполнить одно - идти впереди!</string>
+  <string name="tutorial_rewards_1">Покупайте снаряжение для вашего аватара за золото которое вы получаете!</string>
+  <string name="tutorial_rewards_2">Вы также можете создавать свои вознаграждения в зависимости от того, что вас мотивирует.</string>
+  <string name="tutorial_tasks_complete">На этом все. Если вы что-то забыли, проверьте раздел часто задаваемых вопросов.</string>
   <string name="tutorial_equipment">Когда вы покупаете снаряжение, оно появляется здесь. Ваша Боевая Экипировка влияет на ваши характеристики, а Костюм (если используется) изменяет внешний вид вашего аватара.</string>
   <string name="tutorial_items">Зарабатывайте предметы, выполняя задания и повышая уровень. Нажмите на предмет, чтобы использовать его!</string>
   <string name="tutorial_pets">Теперь, когда вы будете выполнять задачи в реальном мире, у Вас есть шанс получить яйца и зелья. Соединяйте их, чтобы вылуплялись питомцы</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index d5bd67690..2aac43550 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -181,14 +181,25 @@
   <string name="sidebar_help">Помощь и ЧаВо</string>
   <string name="complete_tutorial">Есть!</string>
   <string name="dismiss_tutorial">Напомнить позже</string>
+  <string name="intro_1_subtitle">Добро пожаловать в</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Пришло время веселиться, пока вы делаете свою работу. Присоединитесь к %s участникам, уже улучшающих свою жизнь.</string>
+  <string name="intro_2_subtitle">Прогресс в игре</string>
+  <string name="intro_2_title">Прогресс в жизни</string>
+  <string name="intro_3_subtitle">Битва с монстрами</string>
+  <string name="intro_3_title">Общайтесь</string>
   <string name="intro_3_description">Добивайтесь поставленнх целей с помощью друзей. Поддерживайте друг друга в реальной жизни и в сражении, делая свою жизнь лучше!</string>
+  <string name="intro_finish_button">Давайте начнем!</string>
   <string name="previous_button">Назад</string>
   <string name="next_button">Далее</string>
   <string name="skip_button">Пропустить</string>
   <string name="setup_welcome_description">Добро пожаловать в Habitica, где продвижение в игре помогает вам в рельной жизни! Выполняя реальные задачи, вы разблокируете снаряжение, питомцев, квесты и многое другое.</string>
   <string name="setup_welcome_title">Добро пожаловать</string>
+  <string name="avatar_setup_description">Итак, как бы вы хотели выглядеть? Не беспокойтесь, вы это сможете изменить позже.</string>
+  <string name="task_setup_description">Великолепно! Теперь, вы заинтересованы в работе на протяжении этого путешествия?</string>
   <string name="setup_group_work">Работа</string>
   <string name="setup_group_exercise">Тренировки</string>
+  <string name="setup_group_health">Здоровье</string>
   <string name="setup_group_school">Школа</string>
   <string name="setup_group_teams">Команды</string>
   <string name="setup_group_chores">Домашние дела</string>
@@ -222,13 +233,13 @@
   <string name="join">Присоединиться</string>
   <string name="leader">Предводитель</string>
   <string name="gems">Самоцветы</string>
-  <string name="copy_as_todo">Скопировать как «Задание»</string>
+  <string name="copy_as_todo">Скопировать как «Ежедневное»</string>
   <string name="send_pm">Отправить личное сообщение</string>
   <string name="flag">Пометить</string>
   <string name="delete">Удалить</string>
   <string name="name">Имя</string>
   <string name="description">Описание</string>
-  <string name="add_tag">Добавить метку</string>
+  <string name="add_tag">Добавить новый Тег</string>
   <string name="privacy">Приватность</string>
   <string name="write_message">Написать сообщение</string>
   <string name="post">Отправить</string>
@@ -385,7 +396,7 @@
   <string name="all_dailies_completed">Вы справились со всеми ежедневными заданиями. Так держать!</string>
   <string name="widget_habit_button">Привычки Habitica</string>
   <string name="widget_dailies">Ежедневные задания Habitica</string>
-  <string name="widget_todo_list">Список дел Habitica</string>
+  <string name="widget_todo_list">Список задач Habitica</string>
   <string name="widget_add_task">Добавить задачу Habitica</string>
   <string name="google_services_missing">Сервис Google play не найден.</string>
   <string name="gem.purchase.toolbartitle">Купить</string>
@@ -417,6 +428,7 @@
   <string name="subscriptions">Абонемент</string>
   <string name="subscription_duration">Повторять каждые %s</string>
   <string name="subscribe">Подписаться</string>
+  <string name="subscribe.listitem2.description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
   <string name="subscribe.listitem3.description">Завершенный список дел и история доступны дольше.</string>
   <string name="subscription_hourglasses">+%d Мистических песочных часов</string>
   <string name="payment_method">Способ оплаты</string>
@@ -439,9 +451,13 @@
   <string name="twelve_months">12 месяцев</string>
   <string name="subscribe_prompt_thanks">Как подписчик вы получаете эти полезные преимущества:</string>
   <string name="subscription_status">Статус подписки</string>
+  <string name="byLeader">сделано %s</string>
   <string name="challenge_details">Детали испытания</string>
   <string name="challenge_leave_title">Покинуть испытание</string>
   <string name="challenge_leave_text">Вы уверены, что хотите покинуть испытание “%s”?</string>
+  <string name="challenge_remove_tasks_title">Удалить задачи</string>
+  <string name="challenge_remove_tasks_text">Вы уверены, что хотите удалить задачи?</string>
+  <string name="remove_tasks">Удалить</string>
   <string name="my_challenges">Мои испытания</string>
   <string name="public_challenges">Общее</string>
   <string name="challenges">Испытания</string>
@@ -472,6 +488,36 @@
   <string name="notification_mystery_item">Вы открываете коробку и находите %s!</string>
   <string name="checkInRewardEarned">Вы заработали %1$s в качестве награды за преданность к улучшению жизни.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Ваш следующий приз будет доступен после  %1$d входа в игру</string>
+  <string name="pending_approval">ожидает утверждения</string>
+  <string name="filters">Фильтры</string>
+  <string name="done">Выполнено</string>
   <string name="group_tasks_edit_description">Групповые задания не могут быть редактированы.</string>
   <string name="group_tasks_edit_title">Нельзя редактировать это задание</string>
+  <string name="groups">Группы</string>
+  <string name="all">Все</string>
+  <string name="none">Никто</string>
+  <string name="owned">Принадлежит</string>
+  <string name="not_owned">Не принадлежит</string>
+  <string name="login_btn_fb">Зарегистрироваться с Facebook</string>
+  <string name="login_btn_google">Зарегистрироваться с Google</string>
+  <string name="action_back">Назад</string>
+  <string name="welcome_text">О,  должно быть ,вы новичок. Я Джастин, я буду твоим проводником в Habitica. \ N \ nЧтобы начать, вам нужно создать аватар.</string>
+  <string name="avatar_extras">Дополнительно</string>
+  <string name="avatar_skin_color">Цвет кожи</string>
+  <string name="avatar_hair_color">Цвет волос</string>
+  <string name="avatar_hair_bangs">Чёлка</string>
+  <string name="avatar_hair_ponytail">Конский хвост</string>
+  <string name="avatar_glasses">Очки</string>
+  <string name="avatar_wheelchair">Кресло-каталка</string>
+  <string name="weak">Стройное</string>
+  <string name="strong">Тучное</string>
+  <string name="gray">Серый</string>
+  <string name="completed">Завершить</string>
+  <string name="setuP_group_other">Другое</string>
+  <string name="clear">Очистить</string>
+  <string name="empty_title_habits">У вас нет привычек</string>
+  <string name="empty_title_todos">У вас нет задач</string>
+  <string name="empty_title_rewards">У вас нет вознаграждений</string>
+  <string name="maintenance">Cодержание</string>
+  <string name="reload_content">Обновить содержимое</string>
 </resources>
diff --git a/Habitica/res/values-tr/strings.profile.xml b/Habitica/res/values-tr/strings.profile.xml
index 5d4a9ebbf..f810ca377 100644
--- a/Habitica/res/values-tr/strings.profile.xml
+++ b/Habitica/res/values-tr/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Özel Mesaj</string>
     <string name="profile_achievements">Başarılar</string>
     <string name="profile_achievement_ok">Tamam</string>
+    <string name="profile_qrcode_close">Kapat</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-tr/strings.tutorial.xml b/Habitica/res/values-tr/strings.tutorial.xml
index 95ce17c24..bc1c325f7 100644
--- a/Habitica/res/values-tr/strings.tutorial.xml
+++ b/Habitica/res/values-tr/strings.tutorial.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Pozitif Alışkanlıkları tamamlayarak altın ve deneyim kazan! Negatif Alışkanlıkların üzerlerine tıklarsan avatar\'ın can kaybeder, bu yüzden onlardan gerçek hayatta kaçın! </string>
-  <string name="tutorial_dailies">Tekrar eden Günlük işlerini altın ve deneyim kazanmak için bozguna uğrat. Tehlike! Günlük işleri, zamanında tamamlayamazsan karakterine zarar verir. </string>
-  <string name="tutorial_todos">Gerçek hayatta Yapılacak İşlerini tamamla, sonrasında oyun içerisinde ALTIN ve DENEYİM için işaretle ki Ödüller kazanıp yeni özellikler açabilesin!</string>
-  <string name="tutorial_rewards">Bunlar senin Ödüllerin! Gerçek hayat Alışkanlıklarını, Günlük İşlerini, ve Yapılacak İşlerini tamamlayarak altın kazan. Sonra o altınları oyun içi Ödüllerine ya da kendi belirlediğin gerçek hayat Ödüllerinde harca!</string>
+  <string name="tutorial_overview">İşte geldik! İlgi alanlarına göre sana bazı işler doldurdum. Kendin de birkaç tane eklemeyi dene. Başlığa basarak işleri düzenleyebilirsin.</string>
   <string name="tutorial_equipment">Ekipman satın aldığında burada gözükür. Savaş Ekipmanın niteliklerini, ve Kostümün (eğer etkinse) avatarının ne giydiğini etkiler.</string>
   <string name="tutorial_items">Görevlerini tamamlayarak ve seviye yükselerek eşya kazan. Kullanmak için eşyanın üzerine tıkla!</string>
   <string name="tutorial_pets">Gerçek dünya işlerini tamamladıkça, artık rastgele yumurta ve iksir bulma şansın var. Hayvanları yumurtadan çıkarmak için o ikisini birleştir</string>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index 645b8f1b4..bb22da300 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -38,10 +38,10 @@
   <string name="preference_push_invited_to_quest">Göreve Davet Edildin</string>
   <!--Adding tasks-->
   <string name="task_value">Değer</string>
-  <string name="new_todo">Yeni yapılacak iş</string>
-  <string name="new_reward">Yeni ödül</string>
-  <string name="new_daily">Yeni günlük iş</string>
-  <string name="new_habit">Yeni alışkanlık</string>
+  <string name="new_todo">Yeni Yapılacak İş</string>
+  <string name="new_reward">Yeni Ödül</string>
+  <string name="new_daily">Yeni Günlük İş</string>
+  <string name="new_habit">Yeni Alışkanlık</string>
   <string name="action_edit">Düzenle</string>
   <string name="action_delete">Sil</string>
   <string name="action_cancel">İptal et</string>
@@ -187,8 +187,8 @@
   <string name="intro_2_subtitle">Oyun gelişimi</string>
   <string name="intro_2_title">Hayatta gelişim</string>
   <string name="intro_2_description">Gerçek hayatındaki işlerini tamamlayarak oyun içindeki özellikleri aç. Zırh, evcil hayvan ve daha fazlasını hedeflerine ulaştığında ödül olarak kazan.</string>
-  <string name="intro_3_subtitle">Sosyalleş</string>
-  <string name="intro_3_title">Canavarlarla Savaş</string>
+  <string name="intro_3_subtitle">Canavarlarla savaş</string>
+  <string name="intro_3_title">Sosyalleş</string>
   <string name="intro_3_description">Hedeflerini arkadaşlarından yardım alarak devam ettir. Hayatta ve savaşlarda birbirinizi birlikte geliştirerek destek olun!</string>
   <string name="intro_finish_button">Hadi başlayalım!</string>
   <string name="previous_button">Önceki</string>
@@ -197,8 +197,10 @@
   <string name="setup_welcome_description">Habitica\'ya hoşgeldin, oyunda ilerledikçe gerçek hayatını da geliştireceksin! Gerçek hayat hedeflerine ulaştıkça, ekipman, evcil hayvan, görevler ve dahasını da ortaya çıkaracaksın.</string>
   <string name="setup_welcome_title">Hoş Geldin</string>
   <string name="avatar_setup_description">Nasıl görünmek istersin? Dert etme, daha sonra bunları değiştirebilirsin.</string>
+  <string name="task_setup_description">Müthiş! Şimdi, bu yolculukta neyi geliştirmek istiyorsun?</string>
   <string name="setup_group_work">İş</string>
   <string name="setup_group_exercise">Egzersiz</string>
+  <string name="setup_group_health">Sağlık</string>
   <string name="setup_group_school">Okul</string>
   <string name="setup_group_teams">Takımlar</string>
   <string name="setup_group_chores">Günlük İşler</string>
@@ -238,7 +240,6 @@
   <string name="delete">Sil</string>
   <string name="name">Ad</string>
   <string name="description">Tanım</string>
-  <string name="add_tag">Etiket Ekle</string>
   <string name="privacy">Gizlilik</string>
   <string name="write_message">Mesaj Yaz</string>
   <string name="post">Gönder</string>
@@ -523,4 +524,9 @@
   <string name="dated">Tarihli</string>
   <string name="completed">Tamamlanmış</string>
   <string name="setuP_group_other">Diğer</string>
+  <string name="clear">Temizle</string>
+  <string name="empty_title_habits">Hiç Alışkanlık sahibi değilsin</string>
+  <string name="empty_title_dailies">Hiç Günlük İş sahibi değilsin</string>
+  <string name="empty_title_todos">Hiç Yapılacak İş sahibi değilsin</string>
+  <string name="empty_title_rewards">Hiç Ödül sahibi değilsin</string>
 </resources>
diff --git a/Habitica/res/values-v19/styles.xml b/Habitica/res/values-v19/styles.xml
new file mode 100644
index 000000000..a820635d2
--- /dev/null
+++ b/Habitica/res/values-v19/styles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme.ActionBar.Transparent">
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBarOverlay">true</item>
+    </style>
+    <style name="AppTheme.NoActionBar.Transparent">
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-zh/strings.profile.xml b/Habitica/res/values-zh/strings.profile.xml
index cc1c9cb89..c221ff3f1 100644
--- a/Habitica/res/values-zh/strings.profile.xml
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">私信</string>
     <string name="profile_achievements">成就</string>
     <string name="profile_achievement_ok">OK</string>
+    <string name="profile_qrcode_close">关闭</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-zh/strings.tutorial.xml b/Habitica/res/values-zh/strings.tutorial.xml
index 2e633e61d..ccd660700 100644
--- a/Habitica/res/values-zh/strings.tutorial.xml
+++ b/Habitica/res/values-zh/strings.tutorial.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">完成好习惯能获得金币和经验！坏习惯会使你的角色受到伤害，在日常生活中改正你的坏习惯吧！</string>
-  <string name="tutorial_dailies">完成你那规律的每日任务来拿到金币和经验。危险！如果你没能及时完成每日任务，它们会伤害你的角色的。</string>
-  <string name="tutorial_todos">现实中完成了待办事项以后，勾选相应条目以获得金币和经验，用来购买奖励和解锁新的外观。</string>
-  <string name="tutorial_rewards">这些是你的奖励！通过完成现实中的习惯、每日任务和待办事项可以获得金币，然后用它们去购买游戏内的奖励和自己设定的现实奖励吧。</string>
+  <string name="tutorial_overview">我们在这儿！我已经根据你的兴趣给你添加了几个任务~也试试自己添加几个吧！你还可以点击任务标题来修改它们。</string>
+  <string name="tutorial_habits_1">首先是习惯。它们可以是你想养成的积极习惯，也可以是你想停止的消极习惯。</string>
+  <string name="tutorial_habits_2">每当你完成一次积极的习惯，点击习惯前的加号，就可以获得经验和金币啦！</string>
+  <string name="tutorial_habits_3">如果你一不留神完成了一次消极习惯，点击减号，这会减少你的角色的生命值来帮助你保持责任感。</string>
   <string name="tutorial_equipment">在你购买装备后，在这里显示。你的战斗装备会影响你的属性，你的服装(如果装备)会在你的角色上显示。</string>
   <string name="tutorial_items">通过升级和完成任务获得物品。点击一个物品来使用。</string>
   <string name="tutorial_pets">完成现实任务后，随机掉落宠物蛋和药水。将药水洒在宠物蛋上孵化宠物。</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index be11b42ac..78ff0e6b8 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -16,7 +16,7 @@
   <string name="Language_summary">更改 Habitica的语言</string>
   <string name="SP_user_qr_code">你的二维码</string>
   <string name="PS_contact_title">联系我</string>
-  <string name="unknown_error">发生了一个错误……</string>
+  <string name="unknown_error">发生错误……</string>
   <string name="pref_account_header">账号</string>
   <string name="pref_first_day_of_the_week_title">每周的第一天</string>
   <string name="pref_first_day_of_the_week_summary">在所有的日程表中，每周的第一天</string>
@@ -33,7 +33,7 @@
   <string name="preference_push_gifted_gems">赠送的钻石</string>
   <string name="preference_push_gifted_subscription">赠送的订阅</string>
   <string name="preference_push_invited_to_party">被邀请加入队伍</string>
-  <string name="preference_push_invited_to_guild">已邀请至工会</string>
+  <string name="preference_push_invited_to_guild">已邀请至公会</string>
   <string name="preference_push_your_quest_has_begun">你的冒险开始了</string>
   <string name="preference_push_invited_to_quest">被邀请加入冒险</string>
   <!--Adding tasks-->
@@ -186,8 +186,6 @@
   <string name="intro_2_subtitle">游戏进度</string>
   <string name="intro_2_title">生活进度</string>
   <string name="intro_2_description">通过完成现实生活中的任务来解锁游戏内容。得到装备、宠物和更多的奖励来促使你完成你的目标吧！</string>
-  <string name="intro_3_subtitle">获得社交</string>
-  <string name="intro_3_title">击退怪物</string>
   <string name="intro_3_description">和朋友们一起为目标努力吧。在生活和战斗中互相支持，共同进步！</string>
   <string name="intro_finish_button">让我们开始吧！</string>
   <string name="previous_button">上一页</string>
@@ -223,24 +221,22 @@
   <string name="setup_task_creativity_2">进行创新项目</string>
   <string name="setup_task_creativity_3">完成创新项目</string>
   <string name="gem.purchase.support">想要帮助我们维持Habitica？通过买宝石的方式来支持开发者吧！\n\n 宝石能用来购买额外的乐趣，包括：\n\n - 角色的酷酷的服装\n - 好看的背景\n - 能获得宠物蛋的有趣的任务\n - 1001级之前改变职业的能力\n\n非常感谢您帮助我们使Habitica变的更好。您的支持非常重要！</string>
-  <string name="my_guilds">我的工会</string>
+  <string name="my_guilds">我的公会</string>
   <string name="public_guilds">公共公会</string>
   <string name="guild">公会</string>
   <string name="leave">离开</string>
   <string name="join">加入</string>
   <string name="leader">会长</string>
   <string name="gems">宝石</string>
-  <string name="copy_as_todo">复制为待办事项</string>
   <string name="send_pm">发送私人信息</string>
   <string name="flag">标志</string>
   <string name="delete">删除</string>
   <string name="name">名称</string>
   <string name="description">描述</string>
-  <string name="add_tag">添加标签</string>
   <string name="privacy">隐私</string>
   <string name="write_message">写消息</string>
   <string name="post">公告</string>
-  <string name="guild_search_hint">寻找工会</string>
+  <string name="guild_search_hint">查找公会</string>
   <string name="todo_due">到期：%s</string>
   <string name="daily_streak">目前连击数：%d</string>
   <string name="todo_has_duedate">任务有截止日</string>
@@ -393,7 +389,6 @@
   <string name="all_dailies_completed">你完成了所有没有任务。干得漂亮！</string>
   <string name="widget_habit_button">Habitica完成习惯</string>
   <string name="widget_dailies">Habitica每日任务</string>
-  <string name="widget_todo_list">Habitica 待办事项</string>
   <string name="widget_add_task">Habitica增加任务</string>
   <string name="google_services_missing">没有找到Google play服务。</string>
   <string name="gem.purchase.toolbartitle">购买</string>
@@ -464,7 +459,7 @@
   <string name="keep_tasks">保持</string>
   <string name="my_challenges">我的挑战</string>
   <string name="public_challenges">公共挑战</string>
-  <string name="challenges">享受挑战吧！</string>
+  <string name="challenges">挑战</string>
   <string name="daily">每日任务</string>
   <string name="habit">习惯</string>
   <string name="reward">奖励</string>
@@ -474,8 +469,8 @@
   <string name="challenge">挑战</string>
   <string name="go_to_challenge">参加挑战</string>
   <string name="not_part_of_a_challenge">你还没有加入任何挑战呢！</string>
-  <string name="join_a_challenge">加入一个挑战会将它的任务加入你的任务列表，完成一个挑战会给你一个成就，通常还有一些宝石奖励。</string>
-  <string name="check_the_public_challenge_tab">点击“公公挑战”按钮来寻找其他勇士创建的挑战吧！也许会有适合你的哟！</string>
+  <string name="join_a_challenge">加入一个挑战会将它的任务加入你的任务列表，然后去完成任务战胜其他habitican赢得成就甚至钻石吧！</string>
+  <string name="check_the_public_challenge_tab">点击“公会挑战”按钮来寻找其他勇士创建的挑战吧！也许会有适合你的哟！</string>
   <string name="add_reminder">增加提醒</string>
   <string name="warning">警告</string>
   <string name="open_settings">打开设置</string>
@@ -502,4 +497,21 @@
   <string name="none">无</string>
   <string name="owned">已拥有的</string>
   <string name="not_owned">未拥有的</string>
+  <string name="login_btn_fb">Facebook登录</string>
+  <string name="login_btn_google">Google登录</string>
+  <string name="action_back">返回</string>
+  <string name="avatar_skin_color">肤色</string>
+  <string name="avatar_hair_color">发色</string>
+  <string name="avatar_hair_bangs">刘海</string>
+  <string name="avatar_hair_ponytail">辫子</string>
+  <string name="avatar_glasses">眼镜</string>
+  <string name="avatar_wheelchair">轮椅</string>
+  <string name="weak">瘦小</string>
+  <string name="strong">强壮</string>
+  <string name="completed">完成</string>
+  <string name="setuP_group_other">其他</string>
+  <string name="empty_title_habits">你还没有任何习惯</string>
+  <string name="empty_title_dailies">你还没有任何每日任务</string>
+  <string name="empty_title_todos">你还没有任何待办事项</string>
+  <string name="empty_title_rewards">你还没有任何奖励项目</string>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 1d9600754..32f629c30 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -54,7 +54,6 @@
 
     <color name="changelog.note">#ffcf42</color>
 
-
     <color name="colorPrimary">@color/brand_300</color>
     <color name="colorPrimaryDark">@color/brand_50</color>
     <!-- text -->
@@ -116,6 +115,7 @@
     <color name="white_75_alpha">#bfffffff</color>
     <color name="white_50_alpha">#7fffffff</color>
     <color name="white_15_alpha">#26ffffff</color>
+    <color name="black_5_alpha">#0b000000</color>
     <color name="black_10_alpha">#16000000</color>
     <color name="black_20_alpha">#33000000</color>
     <color name="light_gray_bg">#F6F4F8</color>
diff --git a/Habitica/res/values/strings.profile.xml b/Habitica/res/values/strings.profile.xml
index 5e06d4258..caec9cab9 100644
--- a/Habitica/res/values/strings.profile.xml
+++ b/Habitica/res/values/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Private Message</string>
     <string name="profile_achievements">Achievements</string>
     <string name="profile_achievement_ok">Ok</string>
+    <string name="profile_qrcode_close">Close</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.tutorial.xml b/Habitica/res/values/strings.tutorial.xml
index 47155e3a5..d27624738 100644
--- a/Habitica/res/values/strings.tutorial.xml
+++ b/Habitica/res/values/strings.tutorial.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="tutorial_habits">Complete Positive Habits to earn gold and experience! Negative Habits will hurt your avatar if you tap them, so avoid them in real life!</string>
-    <string name="tutorial_dailies">Defeat your repeating Daily tasks to gain gold and experience. Danger! Dailies will hurt your avatar if you don\'t complete them in time.</string>
-    <string name="tutorial_todos">Complete your To-Dos in real life, then check them off for GOLD and EXPERIENCE so you can earn Rewards and unlock new features!</string>
-    <string name="tutorial_rewards">These are your Rewards! Earn gold by completing real-world Habits, Dailies, and To-Dos. Then spend it on in-game Rewards or custom real-world Rewards!</string>
+    <string name="tutorial_overview">Here we are! I’ve filled out some tasks for you based on your interests. Try adding a few of your own. You can edit any task by tapping the title.</string>
+    <string name="tutorial_habits_1">First up is Habits. They can be positive Habits you want to improve or negative Habits you want to quit.</string>
+    <string name="tutorial_habits_2">Every time you do a positive Habit, tap the + to get experience and gold!</string>
+    <string name="tutorial_habits_3">If you slip up and do a negative Habit, tapping the - will reduce your avatar’s health to help you stay accountable.</string>
+    <string name="tutorial_habits_4">Give it a shot! You can explore the other task types through the bottom navigation.</string>
+    <string name="tutorial_dailies_1">Make Dailies for time sensitive tasks that need to be done on a regular schedule.</string>
+    <string name="tutorial_dailies_2">Be careful — if you miss one, your avatar will take damage overnight. Checking them off consistently brings great rewards!</string>
+    <string name="tutorial_todos_1">Use To-dos to keep track of tasks you need to do just once.</string>
+    <string name="tutorial_todos_2">If your To-do has to be done by a certain time, set a due date. Looks like you can check one off — go ahead!</string>
+    <string name="tutorial_rewards_1">Buy gear for your avatar with the gold you earn!</string>
+    <string name="tutorial_rewards_2">You can also make real-world Custom Rewards based on what motivates you.</string>
+    <string name="tutorial_tasks_complete">That\'s all for now. If you need a reminder, check the FAQ section.</string>
 
     <string name="tutorial_equipment">When you buy equipment, it appears here. Your Battle Gear affects your stats, and your Costume (if enabled) affects what your avatar wears.</string>
     <string name="tutorial_items">Earn items by completing tasks and leveling up. Tap on an item to use it!</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index bcbea03b0..703fb89d3 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="Language_summary">Change Habitica\'s language</string>
     <string name="SP_user_qr_code">Your QR Code</string>
     <string name="PS_contact_title">Contact me</string>
-    <string name="unknown_error">An error happened…</string>
+    <string name="unknown_error">An error occurred…</string>
     <string name="pref_account_header">Account</string>
     <string name="pref_first_day_of_the_week_title">First Day of the Week</string>
     <string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
@@ -45,10 +45,10 @@
 
     <!-- Adding tasks -->
     <string name="task_value">Value</string>
-    <string name="new_todo">New todo</string>
-    <string name="new_reward">New reward</string>
-    <string name="new_daily">New daily</string>
-    <string name="new_habit">New habit</string>
+    <string name="new_todo">New To-Do</string>
+    <string name="new_reward">New Reward</string>
+    <string name="new_daily">New Daily</string>
+    <string name="new_habit">New Habit</string>
     <string name="action_edit">Edit</string>
     <string name="action_delete">Delete</string>
     <string name="action_cancel">Cancel</string>
@@ -210,8 +210,8 @@
     <string name="intro_2_subtitle">Progress in the game</string>
     <string name="intro_2_title">Progress in life</string>
     <string name="intro_2_description">Unlock features in the game by checking off your real life tasks. Earn armor, pets, and more as rewards for meeting your goals.</string>
-    <string name="intro_3_subtitle">Get social</string>
-    <string name="intro_3_title">Fight monsters</string>
+    <string name="intro_3_subtitle">Fight monsters</string>
+    <string name="intro_3_title">Get social</string>
     <string name="intro_3_description">Keep your goals on track with help from your friends. Support each other in life and in battle as you improve together!</string>
     <string name="intro_finish_button">Let\'s start!</string>
     <string name="previous_button">Previous</string>
@@ -258,13 +258,13 @@
     <string name="join">Join</string>
     <string name="leader">Leader</string>
     <string name="gems">Gems</string>
-    <string name="copy_as_todo">Copy as ToDo</string>
+    <string name="copy_as_todo">Copy as To-Do</string>
     <string name="send_pm">Send PM</string>
     <string name="flag">Flag</string>
     <string name="delete">Delete</string>
     <string name="name">Name</string>
     <string name="description">Description</string>
-    <string name="add_tag">Add Tag</string>
+    <string name="add_tag">Add new Tag</string>
     <string name="privacy">Privacy</string>
     <string name="write_message">Write Message</string>
     <string name="post">Post</string>
@@ -424,7 +424,7 @@
     <string name="all_dailies_completed">You completed all your dailies. Well done!</string>
     <string name="widget_habit_button">Habitica Do Habit</string>
     <string name="widget_dailies">Habitica Dailies</string>
-    <string name="widget_todo_list">Habitica Todo List</string>
+    <string name="widget_todo_list">Habitica To-Do List</string>
     <string name="widget_add_task">Habitica Add Task</string>
     <string name="google_services_missing">Google play services could not be found.</string>
     <string name="gem.purchase.toolbartitle">Purchase</string>
@@ -551,11 +551,24 @@
     <string name="avatar_wheelchair">Wheelchair</string>
     <string name="weak">Weak</string>
     <string name="strong">Strong</string>
-    <string name="gray">Gray</string>
+    <string name="gray">Grey</string>
     <string name="dated">Dated</string>
     <string name="completed">Completed</string>
     <string name="setuP_group_other">Other</string>
     <string name="clear">Clear</string>
+    <string name="empty_title_habits">You don\'t have any Habits</string>
+    <string name="empty_description_habits">Habits are tasks that don\'t have a rigid schedule. You can check them off many times a day, or not at all.</string>
+    <string name="empty_title_dailies">You don\'t have any Dailies</string>
+    <string name="empty_description_dailies">Dailies are tasks that repeat on a regular basis. Choose the schedule that works for you!</string>
+    <string name="empty_title_todos">You don\'t have any To-Dos</string>
+    <string name="empty_description_todos">To-Dos are tasks that only need to be completed once. Add checklists to your To-Dos to increase their value.</string>
+    <string name="empty_title_rewards">You don\'t have any Rewards</string>
+    <string name="reset_walkthrough">Reset Justins Walkthrough</string>
+    <string name="read_community_guidelines">Please read our Community Guidelines before posting</string>
+    <string name="maintenance">Maintenance</string>
+    <string name="reload_content">Reload Content</string>
+    <string name="dailyDueDefaultView">Set Dailies default to ‘due’ tab</string>
+    <string name="dailyDueDefaultViewDescription">With this option set, the Dailies tasks will default to ‘due’ instead of ‘all’</string>
     <string name="save">Save</string>
     <string name="location">Location</string>
     <string name="gem_reward">Gem reward</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index d5e50506b..20f5a2c79 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -181,10 +181,13 @@
     </style>
 
     <style name="EmptyView">
-        <item name="android:textSize">@dimen/card_medium_text</item>
         <item name="android:padding">@dimen/section_top_padding</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center</item>
+        <item name="android:background">@color/white</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:visibility">gone</item>
     </style>
 
     <style name="LoginRow">
@@ -348,4 +351,10 @@
         <item name="android:padding">8dp</item>
         <item name="android:textColor">@drawable/radio_button_text_color</item>
     </style>
+
+    <style name="TagEditTextTheme">
+        <item name="colorAccent">@color/black_20_alpha</item>
+        <item name="colorControlNormal">@color/black_20_alpha</item>
+        <item name="android:drawablePadding">@dimen/spacing_large</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index e248041d3..c6927f287 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -85,6 +85,11 @@
             android:entryValues="@array/AudioValues"
             android:summary="@string/AudioTheme_summary"
             android:order="3"/>
+        <CheckBoxPreference android:title="@string/dailyDueDefaultView"
+            android:key="dailyDueDefaultView"
+            android:order="6"
+            android:summary="@string/dailyDueDefaultViewDescription"
+            />
         <Preference android:title="@string/logout"
             android:key="logout"
             android:summary="@string/logout_description"
@@ -180,4 +185,11 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:title="@string/maintenance">
+        <Preference android:title="@string/reload_content"
+            android:key="reload_content"
+            android:order="99"/>
+
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
index 0a1cb293a..a98adc9ec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
@@ -2,10 +2,10 @@ package com.habitrpg.android.habitica;
 
 import android.support.annotation.Nullable;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.QuestBoss;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.inventory.QuestBoss;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 import com.raizlabs.android.dbflow.sql.language.Where;
@@ -13,7 +13,6 @@ import com.raizlabs.android.dbflow.sql.language.Where;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
 
 import rx.Observable;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java
index 124912df5..b501a8ea6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java
@@ -1,5 +1,23 @@
 package com.habitrpg.android.habitica;
 
+import com.habitrpg.android.habitica.models.responses.HabiticaError;
+
+import java.util.List;
+
 public class ErrorResponse {
     public String message;
+    public List<HabiticaError> errors;
+
+    public String getDisplayMessage() {
+        if (errors != null && errors.size() > 0) {
+            HabiticaError error = errors.get(0);
+            if (error.message != null && error.message.length() > 0) {
+                return error.message;
+            }
+        }
+        if (message != null && message.length() > 0) {
+            return message;
+        }
+        return "";
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
index ec9a42013..6e1c0adc1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -44,8 +44,8 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.activities.IntroActivity;
 import com.habitrpg.android.habitica.ui.activities.LoginActivity;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.raizlabs.android.dbflow.config.FlowManager;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
index a4e409ea1..60e4ca96c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
@@ -2,10 +2,10 @@ package com.habitrpg.android.habitica;
 
 import com.habitrpg.android.habitica.events.UserSubscribedEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.Transaction;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
+import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
+import com.habitrpg.android.habitica.models.Transaction;
 import com.playseeds.android.sdk.Seeds;
 
 import org.greenrobot.eventbus.EventBus;
@@ -23,7 +23,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import retrofit2.adapter.rxjava.HttpException;
+import retrofit2.HttpException;
 
 /**
  * Created by Negue on 26.11.2015.
@@ -76,11 +76,11 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                         Seeds.sharedInstance().recordSeedsIAPEvent(purchase.sku, 19.99);
                     }
                 }, throwable -> {
-                    if (throwable.getClass().equals(HttpException.class)) {
+                    if (throwable.getClass().equals(retrofit2.adapter.rxjava.HttpException.class)) {
                         HttpException error = (HttpException)throwable;
                         ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
                         if (error.code() == 401) {
-                            if (res.message.equals("RECEIPT_ALREADY_USED")) {
+                            if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
                                 purchasedOrderList.add(purchase.orderId);
 
                                     requestListener.onSuccess(verifiedPurchases);
@@ -105,11 +105,11 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
 
                         EventBus.getDefault().post(new UserSubscribedEvent());
                     }, throwable -> {
-                        if (throwable.getClass().equals(HttpException.class)) {
+                        if (throwable.getClass().equals(retrofit2.adapter.rxjava.HttpException.class)) {
                             HttpException error = (HttpException) throwable;
                             ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
                             if (error.code() == 401) {
-                                if (res.message.equals("RECEIPT_ALREADY_USED")) {
+                                if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
                                     purchasedOrderList.add(purchase.orderId);
 
                                     verifiedPurchases.add(purchase);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
index def5702f3..dacd96fc0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica;
 
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
similarity index 85%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
index 9ec993133..aba6666a8 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
@@ -1,34 +1,33 @@
-package com.magicmicky.habitrpgwrapper.lib.api;
+package com.habitrpg.android.habitica.api;
 
-import com.magicmicky.habitrpgwrapper.lib.models.AchievementResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
-import com.magicmicky.habitrpgwrapper.lib.models.LeaveChallengeBody;
-import com.magicmicky.habitrpgwrapper.lib.models.PostChallenge;
-import com.magicmicky.habitrpgwrapper.lib.models.PostChatMessageResult;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Quest;
-import com.magicmicky.habitrpgwrapper.lib.models.Shop;
-import com.magicmicky.habitrpgwrapper.lib.models.Status;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuth;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthSocial;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.BuyResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.SkillResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.UnlockResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.AchievementResult;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
+import com.habitrpg.android.habitica.models.PurchaseValidationResult;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.auth.UserAuth;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
+import com.habitrpg.android.habitica.models.responses.BuyResponse;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
+import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/MaintenanceApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
similarity index 61%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/MaintenanceApiService.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
index a2b23b3a1..439ab6e61 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/MaintenanceApiService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
@@ -1,7 +1,7 @@
-package com.magicmicky.habitrpgwrapper.lib.api;
+package com.habitrpg.android.habitica.api;
 
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.MaintenanceResponse;
+import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
 
 import retrofit2.http.GET;
 import rx.Observable;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/Server.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java
similarity index 93%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/Server.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java
index cde7c5c2f..7b31e5c86 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/Server.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.api;
+package com.habitrpg.android.habitica.api;
 
 /**
  * Created by MagicMicky on 15/06/2014.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
index d64ec0869..a8f9487e3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.callbacks;
 
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import android.support.annotation.Nullable;
 
@@ -20,11 +20,11 @@ public class HabitRPGUserCallback implements Action1<HabitRPGUser> {
     }
 
     @Override
-    public void call(HabitRPGUser habitRPGUser) {
+    public void call(HabitRPGUser user) {
         // Negue: once everything is refactored to DbFlowTaskLocalRepository, this will be removed
-        habitRPGUser.async().save();
+        user.async().save();
         if (callBack != null) {
-            callBack.onUserReceived(habitRPGUser);
+            callBack.onUserReceived(user);
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
index ad4af4e6b..d4ab056ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.callbacks;
 
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
 
 import rx.functions.Action1;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
index 77b94372f..675ef4e10 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.callbacks;
 
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import android.support.annotation.Nullable;
 
@@ -16,20 +16,6 @@ public class MergeUserCallback extends HabitRPGUserCallback {
 
     @Override
     public void call(HabitRPGUser user) {
-        if (user.getItems() != null) {
-            this.user.setItems(user.getItems());
-        }
-        if (user.getPreferences() != null) {
-            this.user.setPreferences(user.getPreferences());
-        }
-        if (user.getFlags() != null) {
-            this.user.setFlags(user.getFlags());
-        }
-        if (user.getStats() != null) {
-            this.user.getStats().merge(user.getStats());
-        }
-
-        this.user.async().save();
 
         if (callBack != null) {
             callBack.onUserReceived(this.user);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
index b81d48f06..94d1c1e9e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.callbacks;
 
 import com.habitrpg.android.habitica.events.SkillUsedEvent;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java
deleted file mode 100644
index d138d07d0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.events.TaskCreatedEvent;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-
-import org.greenrobot.eventbus.EventBus;
-
-import rx.functions.Action1;
-
-/**
- * Created by magicmicky on 02/04/15.
- */
-public class TaskCreationCallback implements Action1<Task> {
-
-    @Override
-    public void call(Task task) {
-        task.save();
-        EventBus.getDefault().post(new TaskCreatedEvent(task));
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskDeletionCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskDeletionCallback.java
deleted file mode 100644
index 830e114c9..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskDeletionCallback.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-
-import rx.functions.Action1;
-
-
-/**
- * Created by magicmicky on 02/04/15.
- */
-public class TaskDeletionCallback implements Action1<Void> {
-    private final OnTaskDeleted callback;
-    private final Task taskToDelete;
-
-    public TaskDeletionCallback(OnTaskDeleted cb, Task taskToDelete) {
-        this.callback = cb;
-        this.taskToDelete = taskToDelete;
-    }
-
-    @Override
-    public void call(Void aVoid) {
-        callback.onTaskDeleted(taskToDelete);
-    }
-
-
-    public interface OnTaskDeleted {
-        public void onTaskDeleted(Task deleted);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
index 613bf8980..849fb0aa6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
@@ -1,11 +1,11 @@
 package com.habitrpg.android.habitica.callbacks;
 
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Item;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
index 88bbe9a51..e2f1d799c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.callbacks;
 
 import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
index 166dbfef5..e1b811266 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.callbacks;
 
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
 
 import rx.functions.Action1;
 
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 1f8f57eda..e57e9d9e9 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
@@ -1,7 +1,11 @@
 package com.habitrpg.android.habitica.components;
 
+import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseInstanceIDService;
+import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseMessagingService;
+import com.habitrpg.android.habitica.receivers.TaskAlarmBootReceiver;
+import com.habitrpg.android.habitica.receivers.TaskReceiver;
 import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.helpers.RemindersManager;
 import com.habitrpg.android.habitica.helpers.SoundManager;
@@ -239,5 +243,13 @@ public interface AppComponent {
 
     void inject(TaskFilterDialog taskFilterDialog);
 
+    void inject(TaskReceiver taskReceiver);
+
+    void inject(TaskAlarmBootReceiver taskAlarmBootReceiver);
+
+    void inject(HabiticaFirebaseInstanceIDService habiticaFirebaseInstanceIDService);
+
+    void inject(HabiticaFirebaseMessagingService habiticaFirebaseMessagingService);
+
     void inject(CreateChallengeActivity createChallengeActivity);
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiClient.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
similarity index 76%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiClient.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
index b9cbe61a5..cac37c0a9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiClient.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
@@ -1,41 +1,40 @@
-package com.magicmicky.habitrpgwrapper.lib.api;
+package com.habitrpg.android.habitica.data;
 
 import android.support.annotation.Nullable;
 
 import com.habitrpg.android.habitica.ErrorResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.AchievementResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
-import com.magicmicky.habitrpgwrapper.lib.models.LeaveChallengeBody;
-import com.magicmicky.habitrpgwrapper.lib.models.PostChallenge;
-import com.magicmicky.habitrpgwrapper.lib.models.PostChatMessageResult;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Quest;
-import com.magicmicky.habitrpgwrapper.lib.models.Shop;
-import com.magicmicky.habitrpgwrapper.lib.models.Status;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.BuyResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.SkillResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.UnlockResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.AchievementResult;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
+import com.habitrpg.android.habitica.models.PurchaseValidationResult;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+import com.habitrpg.android.habitica.models.responses.BuyResponse;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
+import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import retrofit2.adapter.rxjava.HttpException;
+import retrofit2.HttpException;
 import rx.Observable;
 
 public interface ApiClient {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
index d112c04e2..a5962a726 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
@@ -1,9 +1,8 @@
 package com.habitrpg.android.habitica.data;
 
 
-import com.magicmicky.habitrpgwrapper.lib.models.Customization;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.SetupCustomization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.SetupCustomization;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
index 76a67129d..c8068e660 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.data;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
+import com.habitrpg.android.habitica.models.Tag;
 
 import java.util.Collection;
 import java.util.List;
@@ -9,14 +9,16 @@ import rx.Observable;
 
 public interface TagRepository extends BaseRepository {
 
+    Observable<List<Tag>> getTags();
+
     Observable<Tag> createTag(Tag tag);
-
     Observable<Tag> updateTag(Tag tag);
-
     Observable<Void> deleteTag(String id);
 
 
     Observable<Tag> createTags(Collection<Tag> tags);
     Observable<Tag> updateTags(Collection<Tag> tags);
     Observable<List<Void>> deleteTags(Collection<String> tagIds);
+
+    void removeOldTags(List<Tag> onlineTags);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
index 945d9d58f..ce81b04df 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
@@ -1,17 +1,19 @@
 package com.habitrpg.android.habitica.data;
 
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import rx.Observable;
 
 public interface TaskRepository extends BaseRepository  {
-    Observable<ArrayList<Task>> getTasks(String taskType);
+    Observable<List<Task>> getTasks(String taskType, String userID);
 
     Observable<TaskList> refreshTasks(TasksOrder tasksOrder);
 
@@ -19,6 +21,13 @@ public interface TaskRepository extends BaseRepository  {
     Observable<Task> scoreChecklistItem(String taskId, String itemId);
 
     Observable<Task> createTask(Task task);
-
     Observable<Task> updateTask(Task task);
+    Observable<Void> deleteTask(String taskID);
+
+    Observable<List<Task>> createTasks(List<Task> newTasks);
+
+    void removeOldTasks(String userID, List<Task> onlineTaskList);
+    void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
+    void removeOldTaskTags(List<TaskTag> onlineTaskTags);
+    void removeOldReminders(List<RemindersItem> onlineReminders);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
new file mode 100644
index 000000000..99158deba
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
@@ -0,0 +1,22 @@
+package com.habitrpg.android.habitica.data;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.Map;
+
+import rx.Observable;
+
+public interface UserRepository extends BaseRepository {
+
+    Observable<HabitRPGUser> getUser(String userID);
+    Observable<HabitRPGUser> updateUser(HabitRPGUser user, Map<String, Object> updateData);
+    Observable<HabitRPGUser> updateUser(HabitRPGUser user, String key, Object value);
+
+    Observable<HabitRPGUser> retrieveUser(Boolean withTasks);
+
+    Observable<HabitRPGUser> revive(HabitRPGUser user);
+
+    void resetTutorial(@Nullable HabitRPGUser user);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
similarity index 82%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ApiClientImpl.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index b574597f9..cc511bc29 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -9,80 +9,85 @@ import com.google.gson.FieldAttributes;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.ErrorResponse;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy;
 import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiService;
-import com.magicmicky.habitrpgwrapper.lib.api.Server;
-import com.magicmicky.habitrpgwrapper.lib.models.AchievementResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Customization;
-import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
-import com.magicmicky.habitrpgwrapper.lib.models.LeaveChallengeBody;
-import com.magicmicky.habitrpgwrapper.lib.models.PostChallenge;
-import com.magicmicky.habitrpgwrapper.lib.models.PostChatMessageResult;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Purchases;
-import com.magicmicky.habitrpgwrapper.lib.models.Quest;
-import com.magicmicky.habitrpgwrapper.lib.models.Shop;
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
-import com.magicmicky.habitrpgwrapper.lib.models.Status;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuth;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthSocial;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthSocialTokens;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Mount;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.BuyResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.SkillResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.UnlockResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
-import com.magicmicky.habitrpgwrapper.lib.utils.BooleanAsIntAdapter;
-import com.magicmicky.habitrpgwrapper.lib.utils.ChallengeDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.ChatMessageDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.ChecklistItemSerializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.ContentDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.CustomizationDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.DateDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.EggListDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.FAQArticleListDeserilializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.FeedResponseDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.FoodListDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.GroupSerialization;
-import com.magicmicky.habitrpgwrapper.lib.utils.HatchingPotionListDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.ItemDataListDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.MountListDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.PetListDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.PurchasedDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.QuestListDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.RemindersItemSerializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.SkillDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.TaskListDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.TaskSerializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.TaskTagDeserializer;
-import com.magicmicky.habitrpgwrapper.lib.utils.TutorialStepListDeserializer;
+import com.habitrpg.android.habitica.api.ApiService;
+import com.habitrpg.android.habitica.api.Server;
+import com.habitrpg.android.habitica.models.AchievementResult;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.FAQArticle;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
+import com.habitrpg.android.habitica.models.PurchaseValidationResult;
+import com.habitrpg.android.habitica.models.user.Purchases;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.auth.UserAuth;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
+import com.habitrpg.android.habitica.models.auth.UserAuthSocialTokens;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.responses.BuyResponse;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
+import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.utils.BooleanAsIntAdapter;
+import com.habitrpg.android.habitica.utils.ChallengeDeserializer;
+import com.habitrpg.android.habitica.utils.ChatMessageDeserializer;
+import com.habitrpg.android.habitica.utils.ChecklistItemSerializer;
+import com.habitrpg.android.habitica.utils.ContentDeserializer;
+import com.habitrpg.android.habitica.utils.CustomizationDeserializer;
+import com.habitrpg.android.habitica.utils.DateDeserializer;
+import com.habitrpg.android.habitica.utils.EggListDeserializer;
+import com.habitrpg.android.habitica.utils.FAQArticleListDeserilializer;
+import com.habitrpg.android.habitica.utils.FeedResponseDeserializer;
+import com.habitrpg.android.habitica.utils.FoodListDeserializer;
+import com.habitrpg.android.habitica.utils.GroupSerialization;
+import com.habitrpg.android.habitica.utils.HatchingPotionListDeserializer;
+import com.habitrpg.android.habitica.utils.ItemDataListDeserializer;
+import com.habitrpg.android.habitica.utils.MountListDeserializer;
+import com.habitrpg.android.habitica.utils.PetListDeserializer;
+import com.habitrpg.android.habitica.utils.PurchasedDeserializer;
+import com.habitrpg.android.habitica.utils.QuestListDeserializer;
+import com.habitrpg.android.habitica.utils.RemindersItemSerializer;
+import com.habitrpg.android.habitica.utils.SkillDeserializer;
+import com.habitrpg.android.habitica.utils.TaskListDeserializer;
+import com.habitrpg.android.habitica.utils.TaskSerializer;
+import com.habitrpg.android.habitica.utils.TaskTagDeserializer;
+import com.habitrpg.android.habitica.utils.TutorialStepListDeserializer;
 import com.raizlabs.android.dbflow.structure.ModelAdapter;
 
 import java.io.IOException;
@@ -103,8 +108,9 @@ import okhttp3.Request;
 import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Converter;
+import retrofit2.HttpException;
+import retrofit2.Response;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.HttpException;
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 import rx.Observable;
@@ -151,6 +157,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
         this.context = context;
         this.crashlyticsProxy = crashlyticsProxy;
         this.popupNotificationsManager = popupNotificationsManager;
+        this.popupNotificationsManager.setApiClient(this);
 
         HabiticaBaseApplication.getComponent().inject(this);
         crashlyticsProxy.setUserIdentifier(this.hostConfig.getUser());
@@ -300,7 +307,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
             this.showConnectionProblemDialog(R.string.internal_error_api);
         } else if (throwableClass.equals(SocketTimeoutException.class) || UnknownHostException.class.equals(throwableClass)) {
             this.showConnectionProblemDialog(R.string.network_error_no_network_body);
-        } else if (throwableClass.equals(HttpException.class)) {
+        } else if (throwableClass.equals(retrofit2.adapter.rxjava.HttpException.class)) {
             HttpException error = (HttpException) throwable;
             ErrorResponse res = getErrorResponse(error);
             int status = error.code();
@@ -311,12 +318,11 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
             }
 
             if (status >= 400 && status < 500) {
-                if (res != null && res.message != null && !res.message.isEmpty()) {
-                    showConnectionProblemDialog("", res.message);
+                if (res != null && res.getDisplayMessage().length() > 0) {
+                    showConnectionProblemDialog("", res.getDisplayMessage());
                 } else if (status == 401) {
                     showConnectionProblemDialog(R.string.authentication_error_title, R.string.authentication_error_body);
                 }
-
             } else if (status >= 500 && status < 600) {
                 this.showConnectionProblemDialog(R.string.internal_error_api);
             } else {
@@ -328,7 +334,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     public ErrorResponse getErrorResponse(HttpException error) {
-        retrofit2.Response<?> response = error.response();
+        Response<?> response = error.response();
         Converter<ResponseBody, ?> errorConverter =
                 gsonConverter
                         .responseBodyConverter(ErrorResponse.class, new Annotation[0], retrofitAdapter);
@@ -411,9 +417,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
                 AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity)
                         .setTitle(resourceTitleString)
                         .setMessage(resourceMessageString)
-                        .setNeutralButton(android.R.string.ok, (dialog, which) -> {
-                            displayedAlert = null;
-                        });
+                        .setNeutralButton(android.R.string.ok, (dialog, which) -> displayedAlert = null);
 
                 if (!resourceTitleString.isEmpty()) {
                     builder.setIcon(R.drawable.ic_warning_black);
@@ -498,7 +502,12 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
 
     @Override
     public Observable<Void> validateSubscription(SubscriptionValidationRequest request) {
-        return apiService.validateSubscription(request).compose(configureApiCallObserver());
+        return apiService.validateSubscription(request).map(habitResponse -> {
+            if (habitResponse.notifications != null) {
+                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
+            }
+            return habitResponse.getData();
+        });
     }
 
     @Override
@@ -749,7 +758,12 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
 
     @Override
     public Observable<PurchaseValidationResult> validatePurchase(PurchaseValidationRequest request) {
-        return apiService.validatePurchase(request).compose(configureApiCallObserver());
+        return apiService.validatePurchase(request).map(habitResponse -> {
+            if (habitResponse.notifications != null) {
+                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
+            }
+            return habitResponse.getData();
+        });
     }
 
     @Override
@@ -812,33 +826,6 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
         return apiService.leaveChallenge(challengeId, body).compose(configureApiCallObserver());
     }
 
-
-    @Override
-    public Observable<Challenge> createChallenge(PostChallenge challenge) {
-        return apiService.createChallenge(challenge).compose(configureApiCallObserver());
-    }
-
-
-    @Override
-    public Observable<Task> createChallengeTask(String challengeId, Task task) {
-        return apiService.createChallengeTask(challengeId, task).compose(configureApiCallObserver());
-    }
-
-    @Override
-    public Observable<List<Task>> createChallengeTasks(String challengeId, List<Task> tasks) {
-        return apiService.createChallengeTasks(challengeId, tasks).compose(configureApiCallObserver());
-    }
-
-    @Override
-    public Observable<Challenge> updateChallenge(PostChallenge challenge) {
-        return apiService.updateChallenge(challenge.id, challenge).compose(configureApiCallObserver());
-    }
-
-    @Override
-    public Observable<Void> deleteChallenge(String challengeId) {
-        return apiService.deleteChallenge(challengeId).compose(configureApiCallObserver());
-    }
-
     @Override
     public Observable<Void> debugAddTenGems() {
         return apiService.debugAddTenGems().compose(configureApiCallObserver());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.java
index 43904b7b3..7647e761a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.data.implementation;
 
 import com.habitrpg.android.habitica.data.BaseRepository;
 import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 
 public abstract class BaseRepositoryImpl<T extends BaseLocalRepository> implements BaseRepository {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
index aba454b02..9415dec51 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
@@ -2,13 +2,11 @@ package com.habitrpg.android.habitica.data.implementation;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.SetupCustomization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.SetupCustomization;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -81,7 +79,7 @@ public class SetupCustomizationRepositoryImpl implements SetupCustomizationRepos
 
     private List<SetupCustomization> getGlasses() {
         return Arrays.asList(
-                SetupCustomization.createGlasses("eyewear_base_0", R.drawable.creator_blank_face),
+                SetupCustomization.createGlasses("", R.drawable.creator_blank_face),
                 SetupCustomization.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe),
                 SetupCustomization.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe),
                 SetupCustomization.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe),
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
index 968e31d60..604d2757c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
@@ -2,14 +2,13 @@ package com.habitrpg.android.habitica.data.implementation;
 
 import com.habitrpg.android.habitica.data.TagRepository;
 import com.habitrpg.android.habitica.data.local.TagLocalRepository;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.Tag;
 
 import java.util.Collection;
 import java.util.List;
 
 import rx.Observable;
-import rx.functions.Func0;
 
 
 public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> implements TagRepository {
@@ -18,6 +17,11 @@ public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> im
         super(localRepository, apiClient);
     }
 
+    @Override
+    public Observable<List<Tag>> getTags() {
+        return localRepository.getTags();
+    }
+
     @Override
     public Observable<Tag> createTag(Tag tag) {
         return apiClient.createTag(tag);
@@ -52,4 +56,9 @@ public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> im
                 .flatMap(this::deleteTag)
                 .toList();
     }
+
+    @Override
+    public void removeOldTags(List<Tag> onlineTags) {
+        localRepository.removeOldTags(onlineTags);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index ea9041d92..03e85cf85 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -1,16 +1,24 @@
 package com.habitrpg.android.habitica.data.implementation;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirection;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.events.TaskCreatedEvent;
+import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
+import com.habitrpg.android.habitica.models.responses.TaskDirection;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.playseeds.android.sdk.inappmessaging.Log;
+
+import org.greenrobot.eventbus.EventBus;
 
-import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import rx.Observable;
 
@@ -24,8 +32,8 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
     }
 
     @Override
-    public Observable<ArrayList<Task>> getTasks(String taskType) {
-        return this.localRepository.getTasks(taskType);
+    public Observable<List<Task>> getTasks(String taskType, String userID) {
+        return this.localRepository.getTasks(taskType, userID);
     }
 
     @Override
@@ -62,7 +70,12 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         if (lastTaskAction > now-500) {
             return Observable.empty();
         }
-        return apiClient.createItem(task);
+        lastTaskAction = now;
+        return apiClient.createItem(task)
+                .doOnNext(task1 -> {
+                    localRepository.saveTask(task1);
+                    EventBus.getDefault().post(new TaskCreatedEvent(task1));
+                });
     }
 
     @Override
@@ -71,6 +84,42 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         if (lastTaskAction > now-500) {
             return Observable.empty();
         }
-        return apiClient.updateTask(task.getId(), task);
+        lastTaskAction = now;
+        return apiClient.updateTask(task.getId(), task)
+                .doOnNext(task1 -> {
+                    localRepository.saveTask(task1);
+                    EventBus.getDefault().post(new TaskUpdatedEvent(task1));
+                });
+    }
+
+    @Override
+    public Observable<Void> deleteTask(String taskID) {
+        return apiClient.deleteTask(taskID)
+                .doOnNext(aVoid -> localRepository.deleteTask(taskID));
+    }
+
+    @Override
+    public Observable<List<Task>> createTasks(List<Task> newTasks) {
+        return apiClient.createTasks(newTasks);
+    }
+
+    @Override
+    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
+        localRepository.removeOldTasks(userID, onlineTaskList);
+    }
+
+    @Override
+    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
+        localRepository.removeOldChecklists(onlineChecklistItems);
+    }
+
+    @Override
+    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
+        localRepository.removeOldTaskTags(onlineTaskTags);
+    }
+
+    @Override
+    public void removeOldReminders(List<RemindersItem> onlineReminders) {
+        localRepository.removeOldReminders(onlineReminders);
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
new file mode 100644
index 000000000..a0499150e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -0,0 +1,94 @@
+package com.habitrpg.android.habitica.data.implementation;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import rx.Observable;
+
+
+public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository> implements UserRepository {
+
+    public UserRepositoryImpl(UserLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<HabitRPGUser> getUser(String userID) {
+        return localRepository.getUser(userID)
+                .flatMap(habitRPGUser -> {
+                    if (habitRPGUser == null) {
+                        return retrieveUser(true);
+                    } else {
+                        return Observable.just(habitRPGUser);
+                    }
+                });
+    }
+
+    @Override
+    public Observable<HabitRPGUser> updateUser(HabitRPGUser user, Map<String, Object> updateData) {
+        return apiClient.updateUser(updateData)
+                .map(newUser -> mergeUser(user, newUser));
+    }
+
+    @Override
+    public Observable<HabitRPGUser> updateUser(HabitRPGUser user, String key, Object value) {
+        Map<String, Object> updateData = new HashMap<>();
+        updateData.put(key, value);
+        return updateUser(user, updateData);
+    }
+
+    @Override
+    public Observable<HabitRPGUser> retrieveUser(Boolean withTasks) {
+        return apiClient.retrieveUser(withTasks)
+                .doOnNext(localRepository::saveUser);
+    }
+
+    @Override
+    public Observable<HabitRPGUser> revive(HabitRPGUser user) {
+        return apiClient.revive().map(newUser -> mergeUser(user, newUser));
+    }
+
+    @Override
+    public void resetTutorial(HabitRPGUser user) {
+        localRepository.getTutorialSteps()
+                .map(tutorialSteps -> {
+                    Map<String, Object> updateData = new HashMap<>();
+                    for (TutorialStep step : tutorialSteps) {
+                        updateData.put("flags.tutorial." + step.getTutorialGroup() + "." + step.getIdentifier(), false);
+                    }
+                    return updateData;
+                })
+                .flatMap(updateData -> updateUser(user, updateData))
+                .subscribe(tutorialSteps -> {}, throwable -> {});
+    }
+
+    @Nullable
+    private HabitRPGUser mergeUser(@Nullable HabitRPGUser oldUser, HabitRPGUser newUser) {
+        if (oldUser == null) {
+            return null;
+        }
+        if (newUser.getItems() != null) {
+            oldUser.setItems(newUser.getItems());
+        }
+        if (newUser.getPreferences() != null) {
+            oldUser.setPreferences(newUser.getPreferences());
+        }
+        if (newUser.getFlags() != null) {
+            oldUser.setFlags(newUser.getFlags());
+        }
+        if (newUser.getStats() != null) {
+            oldUser.getStats().merge(newUser.getStats());
+        }
+
+        localRepository.saveUser(oldUser);
+        return oldUser;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
index 376c10bf2..67d854ab0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
@@ -1,4 +1,13 @@
 package com.habitrpg.android.habitica.data.local;
 
+import com.habitrpg.android.habitica.models.Tag;
+
+import java.util.List;
+
+import rx.Observable;
+
 public interface TagLocalRepository extends BaseLocalRepository {
+    Observable<List<Tag>> getTags();
+
+    void removeOldTags(List<Tag> onlineTags);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
index 656c2176f..a1ca78476 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
@@ -1,18 +1,28 @@
 package com.habitrpg.android.habitica.data.local;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import rx.Observable;
 
 public interface TaskLocalRepository extends BaseLocalRepository {
 
-    Observable<ArrayList<Task>> getTasks(String taskType);
+    Observable<List<Task>> getTasks(String taskType, String userID);
 
     void saveTasks(TasksOrder tasksOrder, TaskList tasks);
 
     void saveTask(Task task);
+
+    void removeOldTasks(String userID, List<Task> onlineTaskList);
+    void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
+    void removeOldTaskTags(List<TaskTag> onlineTaskTags);
+    void removeOldReminders(List<RemindersItem> onlineReminders);
+
+    void deleteTask(String taskID);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
new file mode 100644
index 000000000..64d5e8fab
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
@@ -0,0 +1,17 @@
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface UserLocalRepository extends BaseLocalRepository {
+
+    Observable<HabitRPGUser> getUser(String userID);
+
+    void saveUser(HabitRPGUser user);
+
+    Observable<List<TutorialStep>> getTutorialSteps();
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
new file mode 100644
index 000000000..46b4d0b2e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
@@ -0,0 +1,77 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+
+import android.database.sqlite.SQLiteDoneException;
+
+import com.habitrpg.android.habitica.data.local.TagLocalRepository;
+import com.habitrpg.android.habitica.models.Tag;
+import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
+import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
+import com.raizlabs.android.dbflow.sql.language.From;
+import com.raizlabs.android.dbflow.sql.language.OrderBy;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowTagLocalRepository implements TagLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<List<Tag>> getTags() {
+        return Observable.defer(() -> Observable.just(new Select().from(Tag.class)
+                .orderBy(OrderBy.columns("position", "dateCreated").descending())
+                .queryList()));
+    }
+
+    @Override
+    public void removeOldTags(List<Tag> onlineTags) {
+        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
+
+        for (Tag item : onlineTags) {
+            onlineTaskTagItemIdList.add(item.getId());
+        }
+
+        From<Tag> query = new Select().from(Tag.class);
+        try {
+            if (query.count() != onlineTags.size()) {
+
+                // Load Database Checklist items
+                query.async().queryList(new TransactionListener<List<Tag>>() {
+                    @Override
+                    public void onResultReceived(List<Tag> items) {
+
+                        ArrayList<Tag> tagsToDelete = new ArrayList<>();
+
+                        for (Tag tag : items) {
+                            if (!onlineTaskTagItemIdList.contains(tag.getId())) {
+                                tagsToDelete.add(tag);
+                            }
+                        }
+
+                        for (Tag tag : tagsToDelete) {
+                            tag.async().delete();
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<Tag>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<Tag>> transaction, List<Tag> result) {
+                        return result != null && result.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
index c5dfa086e..44b201042 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
@@ -1,12 +1,28 @@
 package com.habitrpg.android.habitica.data.local.implementation;
 
+import android.database.sqlite.SQLiteDoneException;
+
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.events.TaskRemovedEvent;
+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.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
+import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Delete;
+import com.raizlabs.android.dbflow.sql.language.From;
+import com.raizlabs.android.dbflow.sql.language.OrderBy;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.sql.language.Where;
+
+import org.greenrobot.eventbus.EventBus;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import rx.Observable;
@@ -14,8 +30,22 @@ import rx.Observable;
 public class DbFlowTaskLocalRepository implements TaskLocalRepository {
 
     @Override
-    public Observable<ArrayList<Task>> getTasks(String taskType) {
-        return null;
+    public Observable<List<Task>> getTasks(String taskType, String userID) {
+        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
+                .where(Condition.column("type").eq(taskType))
+                .and(Condition.CombinedCondition
+                        .begin(Condition.column("completed").eq(false))
+                        .or(Condition.column("type").eq("daily"))
+                )
+                .and(Condition.column("user_id").eq(userID))
+                .orderBy(OrderBy.columns("position", "dateCreated").descending())
+                .queryList()));
+    }
+
+    public Observable<Task> getTask(String taskID) {
+        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
+                .where(Condition.column("id").eq(taskID))
+                .querySingle()));
     }
 
     @Override
@@ -40,11 +70,211 @@ public class DbFlowTaskLocalRepository implements TaskLocalRepository {
         task.async().save();
     }
 
+    @Override
+    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
+        final ArrayList<String> onlineTaskIdList = new ArrayList<>();
+
+        for (Task oTask : onlineTaskList) {
+            onlineTaskIdList.add(oTask.getId());
+        }
+
+        Where<Task> query = new Select().from(Task.class).where(Condition.column("user_id").eq(userID));
+        try {
+            if (query.count() != onlineTaskList.size()) {
+
+                // Load Database Tasks
+                query.async().queryList(new TransactionListener<List<Task>>() {
+                    @Override
+                    public void onResultReceived(List<Task> tasks) {
+
+                        ArrayList<Task> tasksToDelete = new ArrayList<>();
+
+                        for (Task dbTask : tasks) {
+                            if (!onlineTaskIdList.contains(dbTask.getId())) {
+                                tasksToDelete.add(dbTask);
+                            }
+                        }
+
+                        for (Task delTask : tasksToDelete) {
+                            // TaskTag
+                            new Delete().from(TaskTag.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
+
+                            // ChecklistItem
+                            new Delete().from(ChecklistItem.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
+
+                            // Days
+                            new Delete().from(Days.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
+
+                            // TASK
+                            delTask.async().delete();
+
+                            EventBus.getDefault().post(new TaskRemovedEvent(delTask.getId()));
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<Task>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<Task>> baseTransaction, List<Task> tasks) {
+                        return tasks != null && tasks.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+
+    @Override
+    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
+        final ArrayList<String> onlineChecklistItemIdList = new ArrayList<>();
+
+        for (ChecklistItem item : onlineChecklistItems) {
+            onlineChecklistItemIdList.add(item.getId());
+        }
+
+        From<ChecklistItem> query = new Select().from(ChecklistItem.class);
+        try {
+            if (query.count() != onlineChecklistItems.size()) {
+
+                // Load Database Checklist items
+                query.async().queryList(new TransactionListener<List<ChecklistItem>>() {
+                    @Override
+                    public void onResultReceived(List<ChecklistItem> items) {
+
+                        ArrayList<ChecklistItem> checkListItemsToDelete = new ArrayList<>();
+
+                        for (ChecklistItem chItem : items) {
+                            if (!onlineChecklistItemIdList.contains(chItem.getId())) {
+                                checkListItemsToDelete.add(chItem);
+                            }
+                        }
+
+                        for (ChecklistItem chItem : checkListItemsToDelete) {
+                            chItem.async().delete();
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<ChecklistItem>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<ChecklistItem>> baseTransaction, List<ChecklistItem> items) {
+                        return items != null && items.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+
+    @Override
+    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
+        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
+
+        for (TaskTag item : onlineTaskTags) {
+            onlineTaskTagItemIdList.add(item.getId());
+        }
+
+        From<TaskTag> query = new Select().from(TaskTag.class);
+        try {
+            if (query.count() != onlineTaskTags.size()) {
+
+                // Load Database Checklist items
+                query.async().queryList(new TransactionListener<List<TaskTag>>() {
+                    @Override
+                    public void onResultReceived(List<TaskTag> items) {
+
+                        ArrayList<TaskTag> checkListItemsToDelete = new ArrayList<>();
+
+                        for (TaskTag ttag : items) {
+                            if (!onlineTaskTagItemIdList.contains(ttag.getId())) {
+                                checkListItemsToDelete.add(ttag);
+                            }
+                        }
+
+                        for (TaskTag ttag : checkListItemsToDelete) {
+                            ttag.async().delete();
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<TaskTag>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<TaskTag>> baseTransaction, List<TaskTag> items) {
+                        return items != null && items.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+
+    @Override
+    public void removeOldReminders(List<RemindersItem> onlineReminders) {
+        final ArrayList<String> onlineReminderIds = new ArrayList<>();
+
+        for (RemindersItem item : onlineReminders) {
+            onlineReminderIds.add(item.getId());
+        }
+
+        From<RemindersItem> query = new Select().from(RemindersItem.class);
+        try {
+            if (query.count() != onlineReminders.size()) {
+
+                // Load Database Checklist items
+                query.async().queryList(new TransactionListener<List<RemindersItem>>() {
+                    @Override
+                    public void onResultReceived(List<RemindersItem> items) {
+
+                        ArrayList<RemindersItem> remindersToDelete = new ArrayList<>();
+
+                        for (RemindersItem reminder : items) {
+                            if (!onlineReminderIds.contains(reminder.getId())) {
+                                remindersToDelete.add(reminder);
+                            }
+                        }
+
+                        for (RemindersItem reminder : remindersToDelete) {
+                            reminder.async().delete();
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<RemindersItem>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<RemindersItem>> baseTransaction, List<RemindersItem> items) {
+                        return items != null && items.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+
+    @Override
+    public void deleteTask(String taskID) {
+        getTask(taskID).subscribe(Task::delete, throwable -> {});
+    }
+
     private List<Task> sortTasks(TaskList taskList, List<String> taskOrder) {
         List<Task> taskResult = new ArrayList<>();
         int position = 0;
 
-
         for (String taskId : taskOrder) {
             Task task = taskList.tasks.get(taskId);
             if (task != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
new file mode 100644
index 000000000..331e9ae6c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
@@ -0,0 +1,35 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowUserLocalRepository implements UserLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<HabitRPGUser> getUser(String userID) {
+        return Observable.defer(() -> Observable.just(new Select()
+        .from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle()));
+    }
+
+    @Override
+    public void saveUser(HabitRPGUser user) {
+        user.async().save();
+    }
+
+    @Override
+    public Observable<List<TutorialStep>> getTutorialSteps() {
+        return Observable.defer(() -> Observable.just(new Select()
+        .from(TutorialStep.class).queryList()));
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/TagLocalRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/TagLocalRepositoryImpl.java
deleted file mode 100644
index 2d96269b0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/TagLocalRepositoryImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-
-import com.habitrpg.android.habitica.data.local.TagLocalRepository;
-
-public class TagLocalRepositoryImpl implements TagLocalRepository {
-    @Override
-    public void close() {
-
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/DisplayTutorialEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/DisplayTutorialEvent.java
index fe30a3f1d..ba549a94c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/DisplayTutorialEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/DisplayTutorialEvent.java
@@ -1,6 +1,8 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
 
 /**
  * Created by viirus on 26/01/16.
@@ -10,4 +12,6 @@ public class DisplayTutorialEvent {
     public TutorialStep step;
     public String tutorialText;
 
+    public List<String> tutorialTexts;
+    public boolean canBeDeferred;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/HabitScoreEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/HabitScoreEvent.java
index b66b128ea..5237f7799 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/HabitScoreEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/HabitScoreEvent.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 /**
  * Created by Negue on 10.07.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
index ef7ec941d..19b5c3ca6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 
 public class OpenedMysteryItemEvent {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReminderDeleteEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReminderDeleteEvent.java
index 3549e757e..2e7f02d31 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReminderDeleteEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReminderDeleteEvent.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 
 /**
  * Created by keithholliday on 7/16/16.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
index 0ad52fd71..b83891e48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
+import com.habitrpg.android.habitica.models.Skill;
 
 /**
  * Created by viirus on 28/11/15.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskCreatedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskCreatedEvent.java
index 0ff9e5794..d6a4990aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskCreatedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskCreatedEvent.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 /**
  * Created by Negue on 28.09.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java
index 0dcbd8868..9ce32fe5f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 /**
  * Created by keithholliday on 7/18/16.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java
index 17ddd34f3..b665f1cb1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java
@@ -1,8 +1,10 @@
 package com.habitrpg.android.habitica.events;
 
+import com.habitrpg.android.habitica.models.tasks.Task;
+
 /**
  * Created by Negue on 10.07.2015.
  */
 public class TaskLongPressedEvent {
-    public com.magicmicky.habitrpgwrapper.lib.models.tasks.Task task;
+    public Task task;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
index 7af7a13f6..e96a5e617 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 /**
  * Created by viirus on 03/08/15.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskTappedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskTappedEvent.java
index edf74903b..c4021aeef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskTappedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskTappedEvent.java
@@ -4,5 +4,5 @@ package com.habitrpg.android.habitica.events;
  * Created by Negue on 10.07.2015.
  */
 public class TaskTappedEvent {
-    public com.magicmicky.habitrpgwrapper.lib.models.tasks.Task Task;
+    public com.habitrpg.android.habitica.models.tasks.Task Task;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskUpdatedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskUpdatedEvent.java
index af346edbf..96546aa6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskUpdatedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskUpdatedEvent.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 /**
  * Created by Negue on 28.09.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyGemItemCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyGemItemCommand.java
index 9c0aa47b2..5f7a47e6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyGemItemCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyGemItemCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.ShopItem;
+import com.habitrpg.android.habitica.models.shops.ShopItem;
 
 public class BuyGemItemCommand {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyRewardCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyRewardCommand.java
index b5a1b9c47..11fcca4cf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyRewardCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyRewardCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 /**
  * Created by Negue on 11.07.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChatMessageCommandBase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChatMessageCommandBase.java
index b2b8e26fb..86cf73ec9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChatMessageCommandBase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChatMessageCommandBase.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
 
 /**
  * Created by Negue on 04.09.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChecklistCheckedCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChecklistCheckedCommand.java
index 68613ab45..7322c43c7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChecklistCheckedCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChecklistCheckedCommand.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 public class ChecklistCheckedCommand {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
index a9c291263..1acfcd311 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
 
 /**
  * Created by Negue on 30.08.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatMessageCommand.java
index 575fff4f0..8721d0fde 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatMessageCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
 
 /**
  * Created by jjbillings on 7/27/16.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
index 8701e82e7..151140f32 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
 
 /**
  * Created by Negue on 30.08.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
index 78f8522e7..9767c641c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
+import com.habitrpg.android.habitica.models.Tag;
 
 /**
  * Created by jjbillings on 8.9.2016.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
index 9da21197d..896bcd65b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
+import com.habitrpg.android.habitica.models.Tag;
 
 /**
  * Created by jjbillings on 8/16/16.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FeedCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FeedCommand.java
index 586581a11..14f520d6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FeedCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FeedCommand.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.Pet;
 
 public class FeedCommand {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
index 01c642f5e..e10213228 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
 
 /**
  * Created by Negue on 30.08.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/HatchingCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/HatchingCommand.java
index 311d04489..9ab0c5c80 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/HatchingCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/HatchingCommand.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 
 public class HatchingCommand {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
index 075025f68..346120fa3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.Item;
 
 public class SellItemCommand {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/TaskCheckedCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/TaskCheckedCommand.java
index 07d0ec8bf..1696f32d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/TaskCheckedCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/TaskCheckedCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 /**
  * Created by Negue on 11.07.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleLikeMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleLikeMessageCommand.java
index 3c528a169..5f1a75e11 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleLikeMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleLikeMessageCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
 
 /**
  * Created by Negue on 02.09.2015.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
index caa9839a4..6befee574 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
+import com.habitrpg.android.habitica.models.Tag;
 
 /**
  * Created by jjbillings on 8/17/16.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UseSkillCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UseSkillCommand.java
index 2827743d2..6558b015d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UseSkillCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UseSkillCommand.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.events.commands;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
+import com.habitrpg.android.habitica.models.Skill;
 
 /**
  * Created by viirus on 28/11/15.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
index ebb1c2e82..82f3810cb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.helpers;
 
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,9 +12,9 @@ import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.Notification;
-import com.magicmicky.habitrpgwrapper.lib.models.notifications.Reward;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.Notification;
+import com.habitrpg.android.habitica.models.notifications.Reward;
 
 import android.content.Context;
 
@@ -70,15 +71,18 @@ public class PopupNotificationsManager {
         DataBindingUtils.loadImage(imageView, imageKey);
 
         TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
+        youEarnedTexView.setTextColor(ContextCompat.getColor(context, R.color.textColorLight));
         youEarnedTexView.setText(youEarnedMessage);
 
         String message = context.getString(R.string.nextPrizeUnlocks, notification.data.nextRewardAt);
         TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
+        nextUnlockTextView.setTextColor(ContextCompat.getColor(context, R.color.textColorLight));
         nextUnlockTextView.setText(message);
 
         Button confirmButton = (Button) view.findViewById(R.id.confirm_button);
+        confirmButton.setTextColor(ContextCompat.getColor(context, R.color.brand_300));
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity)
+        AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity, R.style.AlertDialogTheme)
                 .setTitle(title)
                 .setView(view)
                 .setMessage("");
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
index f38da6bed..f156118e5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
@@ -18,7 +18,7 @@ import android.widget.Toast;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.AvatarView;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -52,8 +52,8 @@ public class QrCodeManager {
 
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
         @Override
-        public void onResultReceived(HabitRPGUser habitRPGUser) {
-            QrCodeManager.this.avatarView.setUser(habitRPGUser);
+        public void onResultReceived(HabitRPGUser user) {
+            QrCodeManager.this.avatarView.setUser(user);
         }
 
         @Override
@@ -62,7 +62,7 @@ public class QrCodeManager {
         }
 
         @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
             return true;
         }
     };
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
index 97e4cec40..11909f64b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.helpers;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 
 import android.app.Dialog;
 import android.app.TimePickerDialog;
@@ -20,6 +20,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.TimeZone;
 import java.util.UUID;
 
 import javax.inject.Inject;
@@ -93,8 +94,15 @@ public class RemindersManager {
                 int day = dialogDatePicker.getDayOfMonth();
                 int month = dialogDatePicker.getMonth();
                 int year = dialogDatePicker.getYear();
-                int hour1 = dialogTimePicker.getCurrentHour();
-                int minute1 = dialogTimePicker.getCurrentMinute();
+                int hour1 = 0;
+                int minute1 = 0;
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    hour1 = dialogTimePicker.getHour();
+                    minute1 = dialogTimePicker.getMinute();
+                } else {
+                    hour1 = dialogTimePicker.getCurrentHour();
+                    minute1 = dialogTimePicker.getCurrentMinute();
+                }
 
                 Calendar calendar = Calendar.getInstance();
                 calendar.set(year, month, day, hour1, minute1, 0);
@@ -106,7 +114,7 @@ public class RemindersManager {
         } else {
             TimePickerDialog timePickerDialog;
             timePickerDialog = new TimePickerDialog(context, (timePicker, selectedHour, selectedMinute) -> {
-                Calendar calendar = Calendar.getInstance();
+                Calendar calendar = Calendar.getInstance(TimeZone.getDefault());
                 calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), selectedHour, selectedMinute, 0);
 
                 onReminderTimeSelected(callback, reminder, calendar);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
index c688c5221..f083e2262 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
@@ -7,8 +7,8 @@ import com.habitrpg.android.habitica.events.TaskDeleteEvent;
 import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.receivers.TaskReceiver;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
@@ -40,26 +40,18 @@ import static android.os.Build.VERSION.SDK_INT;
 public class TaskAlarmManager {
     public static final String TASK_ID_INTENT_KEY = "TASK_ID";
     public static final String TASK_NAME_INTENT_KEY = "TASK_NAME";
-    private static TaskAlarmManager instance = null;
     @Inject
     CrashlyticsProxy crashlyticsProxy;
     private Context context;
     private AlarmManager am;
 
-    private TaskAlarmManager(Context context) {
+    public TaskAlarmManager(Context context) {
         HabiticaBaseApplication.getComponent().inject(this);
         this.context = context.getApplicationContext();
         EventBus.getDefault().register(this);
         am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
     }
 
-    public static TaskAlarmManager getInstance(Context context) {
-        if (instance == null) {
-            instance = new TaskAlarmManager(context);
-        }
-        return instance;
-    }
-
     public static void scheduleDailyReminder(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         if (prefs.getBoolean("use_reminder", false)) {
@@ -109,12 +101,13 @@ public class TaskAlarmManager {
             return;
         }
 
-        if (SDK_INT < Build.VERSION_CODES.KITKAT)
+        if (SDK_INT < Build.VERSION_CODES.KITKAT) {
             alarmManager.set(AlarmManager.RTC_WAKEUP, time, pendingIntent);
-        else if (Build.VERSION_CODES.KITKAT <= SDK_INT && SDK_INT < Build.VERSION_CODES.M)
+        } else if (Build.VERSION_CODES.KITKAT <= SDK_INT && SDK_INT < Build.VERSION_CODES.M) {
             alarmManager.setWindow(AlarmManager.RTC_WAKEUP, time, time + 60000, pendingIntent);
-        else if (SDK_INT >= Build.VERSION_CODES.M)
+        } else if (SDK_INT >= Build.VERSION_CODES.M) {
             alarmManager.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, time, pendingIntent);
+        }
     }
 
     @Subscribe
@@ -188,11 +181,12 @@ public class TaskAlarmManager {
     }
 
     private RemindersItem setTimeForDailyReminder(RemindersItem remindersItem, Task task) {
-        Calendar calendar = Calendar.getInstance();
         Date oldTime = remindersItem.getTime();
-        Date newTime = task.getNextActiveDateAfter(oldTime);
+        Date newTime = task.getNextReminderOccurence(oldTime);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(newTime);
         calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), oldTime.getHours(), oldTime.getMinutes(), 0);
-        remindersItem.setTime(newTime);
+        remindersItem.setTime(calendar.getTime());
         return remindersItem;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
index ac55cb082..39629ee8c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
@@ -1,6 +1,8 @@
 package com.habitrpg.android.habitica.helpers;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,8 +25,19 @@ public class TaskFilterHelper {
         this.tagsId.add(tags);
     }
 
-    public int howMany(String type) {
-        return this.tagsId.size() + (activeFilters.get(type) != null || Task.FILTER_ACTIVE.equals(activeFilters.get(type)) ? 1 : 0);
+    public int howMany(@Nullable String type) {
+        return this.tagsId.size() + (isTaskFilterActive(type) ? 1 : 0);
+    }
+
+    private boolean isTaskFilterActive(@Nullable String type) {
+        if (activeFilters.get(type) == null) {
+            return false;
+        }
+        if (Task.TYPE_TODO.equals(type)) {
+            return !Task.FILTER_ACTIVE.equals(activeFilters.get(type));
+        } else {
+            return !Task.FILTER_ALL.equals(activeFilters.get(type));
+        }
     }
 
     public List<String> getTags() {
@@ -40,8 +53,14 @@ public class TaskFilterHelper {
     }
 
     public List<Task> filter(List<Task> tasks) {
+        if (tasks.size() == 0) {
+            return tasks;
+        }
         List<Task> filtered = new ArrayList<>();
-        String activeFilter = activeFilters.get(tasks.get(0).type);
+        String activeFilter = null;
+        if (activeFilters != null && activeFilters.size() > 0) {
+            activeFilter = activeFilters.get(tasks.get(0).type);
+        }
         for (Task task : tasks) {
             if (isFiltered(task, activeFilter)) {
                 filtered.add(task);
@@ -51,7 +70,7 @@ public class TaskFilterHelper {
         return filtered;
     }
 
-    private boolean isFiltered(Task task, String activeFilter) {
+    private boolean isFiltered(Task task, @Nullable String activeFilter) {
         if (!task.containsAllTagIds(tagsId)) {
             return false;
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
index ee5ad0137..2966892aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.helpers;
 
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseInstanceIDService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseInstanceIDService.java
index 22624399e..6f17488f4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseInstanceIDService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseInstanceIDService.java
@@ -2,17 +2,21 @@ package com.habitrpg.android.habitica.helpers.notifications;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
+import com.habitrpg.android.habitica.HabiticaApplication;
+
+import javax.inject.Inject;
 
 /**
  * Created by keithholliday on 6/24/16.
  */
 public class HabiticaFirebaseInstanceIDService extends FirebaseInstanceIdService {
 
+    @Inject
     public PushNotificationManager pushNotificationManager;
 
     @Override
     public void onTokenRefresh() {
-        pushNotificationManager = PushNotificationManager.getInstance(this);
+        HabiticaApplication.getComponent().inject(this);
         String refreshedToken = FirebaseInstanceId.getInstance().getToken();
         pushNotificationManager.setRefreshedToken(refreshedToken);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.java
index cf4b82bdd..1cc4a49d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.java
@@ -2,14 +2,21 @@ package com.habitrpg.android.habitica.helpers.notifications;
 
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
+import com.habitrpg.android.habitica.HabiticaApplication;
+
+import javax.inject.Inject;
 
 /**
  * Created by keithholliday on 6/24/16.
  */
 public class HabiticaFirebaseMessagingService extends FirebaseMessagingService {
+
+    @Inject
+    public PushNotificationManager pushNotificationManager;
+
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
-        PushNotificationManager pushNotificationManager = PushNotificationManager.getInstance(this);
+        HabiticaApplication.getComponent().inject(this);
         pushNotificationManager.displayNotification(remoteMessage);
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
index 924d7f16c..d483e8137 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
@@ -7,9 +7,9 @@ import android.preference.PreferenceManager;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.messaging.RemoteMessage;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.PushDevice;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.PushDevice;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,29 +27,17 @@ public class PushNotificationManager {
     static final String QUEST_BEGUN_PUSH_NOTIFICATION_KEY = "questStarted";
     static final String WON_CHALLENGE_PUSH_NOTIFICATION_KEY = "wonChallenge";
     private static final String DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference";
-    private static PushNotificationManager instance = null;
-    @Inject
+    private final Context context;
     public ApiClient apiClient;
 
     private String refreshedToken;
     private SharedPreferences sharedPreferences;
-    private Context context;
     private HabitRPGUser user;
 
-    protected PushNotificationManager(Context context) {
-        HabiticaBaseApplication.getComponent().inject(this);
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-    }
-
-    public static PushNotificationManager getInstance(Context context) {
-        if (instance == null) {
-            instance = new PushNotificationManager(context.getApplicationContext());
-        }
-
-        instance.refreshedToken = instance.sharedPreferences.getString(DEVICE_TOKEN_PREFERENCE_KEY, "");
-        instance.context = context.getApplicationContext();
-
-        return instance;
+    public PushNotificationManager(ApiClient apiClient, SharedPreferences sharedPreferences, Context context) {
+        this.apiClient = apiClient;
+        this.sharedPreferences = sharedPreferences;
+        this.context = context;
     }
 
     public void setUser(HabitRPGUser user) {
@@ -132,6 +120,10 @@ public class PushNotificationManager {
 
         //@TODO: If user has push turned off to send
 
+        if (type == null) {
+            return true;
+        }
+
         if (type.equals(PARTY_INVITE_PUSH_NOTIFICATION_KEY)) {
             key = "preference_push_invited_to_party";
         } else if (type.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY)) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
index 849d14654..a1bc2573f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
@@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import javax.inject.Inject;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
index ae72109f0..3f9466bca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
@@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.events.SelectClassEvent;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import javax.inject.Inject;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ChecklistCheckUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ChecklistCheckUseCase.java
index ca1d4b50e..50cbd55d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ChecklistCheckUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ChecklistCheckUseCase.java
@@ -3,9 +3,7 @@ package com.habitrpg.android.habitica.interactors;
 import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import javax.inject.Inject;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
index 8dce653dd..c7196da3d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
@@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import javax.inject.Inject;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
index 978d8af73..47d5d5be4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
@@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 
 import javax.inject.Inject;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
index dcf05d7d9..0f13ac041 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
@@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import javax.inject.Inject;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
index dacc46853..90b2a7d6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
@@ -10,9 +10,10 @@ import com.habitrpg.android.habitica.events.ShareEvent;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
+import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.ui.AvatarView;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.SuppressedModals;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.SuppressedModals;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -20,7 +21,7 @@ import javax.inject.Inject;
 
 import rx.Observable;
 
-public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Void> {
+public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Stats> {
 
     private SoundManager soundManager;
     private CheckClassSelectionUseCase checkClassSelectionUseCase;
@@ -34,8 +35,8 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Void>
     }
 
     @Override
-    protected Observable buildUseCaseObservable(RequestValues requestValues) {
-        return Observable.from(() -> {
+    protected Observable<Stats> buildUseCaseObservable(RequestValues requestValues) {
+        return Observable.defer(() -> {
             soundManager.loadAndPlayAudio(SoundManager.SoundLevelUp);
 
 
@@ -47,7 +48,7 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Void>
                             }, throwable -> {
                             });
 
-                    return null;
+                    return Observable.just(requestValues.user.getStats());
                 }
             }
 
@@ -60,7 +61,7 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Void>
             }
 
             final ShareEvent event = new ShareEvent();
-            event.sharedMessage = requestValues.compatActivity.getString(R.string.share_levelup, requestValues.newLevel + "") + " https://habitica.com/social/level-up";
+            event.sharedMessage = requestValues.compatActivity.getString(R.string.share_levelup, requestValues.newLevel) + " https://habitica.com/social/level-up";
             AvatarView avatarView = new AvatarView(requestValues.compatActivity, true, true, true);
             avatarView.setUser(requestValues.user);
             avatarView.onAvatarImageReady(avatarImage -> event.shareImage = avatarImage);
@@ -84,7 +85,7 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Void>
                 alert.show();
             }
 
-            return null;
+            return Observable.just(requestValues.user.getStats());
 
         });
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
index 4b05ee563..98a76f93d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
@@ -4,11 +4,12 @@ import android.support.v4.util.Pair;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
 
 import javax.inject.Inject;
 
@@ -21,35 +22,31 @@ import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
 public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues, Stats> {
 
     public static final int MIN_LEVEL_FOR_SKILLS = 11;
+    private final UserRepository userRepository;
     private LevelUpUseCase levelUpUseCase;
 
     @Inject
     public NotifyUserUseCase(ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread,
-                             LevelUpUseCase levelUpUseCase) {
+                             LevelUpUseCase levelUpUseCase, UserRepository userRepository) {
         super(threadExecutor, postExecutionThread);
         this.levelUpUseCase = levelUpUseCase;
+        this.userRepository = userRepository;
     }
 
     @Override
-    protected Observable<Stats> buildUseCaseObservable(RequestValues r) {
+    protected Observable<Stats> buildUseCaseObservable(RequestValues requestValues) {
         return Observable.defer(() -> {
-            Stats stats = r.user.getStats();
+            Stats stats = requestValues.user.getStats();
 
-            if (r.lvl > stats.getLvl()) {
-                levelUpUseCase.observable(new LevelUpUseCase.RequestValues(r.user, r.lvl, r.context))
-                        .subscribe(aVoid -> {
-                            r.retrieveUser.call();
-                            stats.setLvl(r.lvl);
-                        }, throwable -> {
-                        });
+            if (requestValues.lvl > stats.getLvl()) {
+                return levelUpUseCase.observable(new LevelUpUseCase.RequestValues(requestValues.user, requestValues.lvl, requestValues.context))
+                        .flatMap(aVoid -> userRepository.retrieveUser(false))
+                        .map(HabitRPGUser::getStats);
             } else {
-
-                Pair<String, UiUtils.SnackbarDisplayType> pair = getNotificationAndAddStatsToUser(r.user, r.xp, r.hp, r.gold, r.mp);
-
-                showSnackbar(r.context, r.snackbarTargetView, pair.first, pair.second);
+                Pair<String, UiUtils.SnackbarDisplayType> pair = getNotificationAndAddStatsToUser(requestValues.user, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp);
+                showSnackbar(requestValues.context, requestValues.snackbarTargetView, pair.first, pair.second);
+                return Observable.just(stats);
             }
-
-            return Observable.just(stats);
         });
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
index df6803fec..2ec2dd8a3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
@@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import javax.inject.Inject;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Achievement.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Achievement.java
similarity index 84%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Achievement.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/Achievement.java
index 0cf22edd2..8ffa6bbcc 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Achievement.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Achievement.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 public class Achievement {
     public String type;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/AchievementGroup.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java
similarity index 73%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/AchievementGroup.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java
index 0e87a65ee..c38cc2853 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/AchievementGroup.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 import java.util.HashMap;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/AchievementResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java
similarity index 73%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/AchievementResult.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java
index 0259b14b4..af31891a7 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/AchievementResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 public class AchievementResult {
     public AchievementGroup basic;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
new file mode 100644
index 000000000..654fcda88
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
@@ -0,0 +1,11 @@
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.models.tasks.ItemData;
+
+import java.util.List;
+
+public class ContentGear {
+
+    public List<ItemData> flat;
+
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContentResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
similarity index 61%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContentResult.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
index db72e864f..d828b2bfb 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContentResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
@@ -1,12 +1,13 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Mount;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/FAQArticle.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/FAQArticle.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
index 9e0d75a20..6c7717e1e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/FAQArticle.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRpgClass.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java
similarity index 72%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRpgClass.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java
index 71eee8036..c6bb1702a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRpgClass.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 /**
  * Created by MagicMicky on 16/03/14.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/LeaveChallengeBody.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java
similarity index 73%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/LeaveChallengeBody.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java
index 868990871..30ce46289 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/LeaveChallengeBody.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 public class LeaveChallengeBody {
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Notification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Notification.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.java
index 3b95cfee5..d3494c9a9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Notification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.java
@@ -1,10 +1,10 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 /**
  * Created by krh12 on 11/28/2016.
  */
 
-import com.magicmicky.habitrpgwrapper.lib.models.notifications.NotificationData;
+import com.habitrpg.android.habitica.models.notifications.NotificationData;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PurchaseValidationRequest.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationRequest.java
similarity index 70%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PurchaseValidationRequest.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationRequest.java
index 550eef1f7..a2ef8b81e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PurchaseValidationRequest.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationRequest.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 /**
  * Created by Negue on 26.11.2015.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PurchaseValidationResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java
similarity index 63%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PurchaseValidationResult.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java
index 36a6a9703..b74789428 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PurchaseValidationResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 public class PurchaseValidationResult {
     public boolean ok;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PushDevice.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PushDevice.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java
index c70ec2a06..2216f48e6 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PushDevice.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SetupCustomization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
similarity index 98%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SetupCustomization.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
index e25ab6cca..bd0109e01 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SetupCustomization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 
 public class SetupCustomization {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
index a348195b7..47af1926f 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionValidationRequest.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SubscriptionValidationRequest.java
similarity index 68%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionValidationRequest.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/SubscriptionValidationRequest.java
index 8f54368a6..9b88f69f4 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionValidationRequest.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SubscriptionValidationRequest.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 
 public class SubscriptionValidationRequest {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Tag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
similarity index 90%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Tag.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
index 7e266ad03..f3c627180 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Tag.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
@@ -1,7 +1,7 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 import com.habitrpg.android.habitica.HabitDatabase;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ModelContainer;
 import com.raizlabs.android.dbflow.annotation.NotNull;
@@ -89,4 +89,12 @@ public class Tag extends BaseModel {
         }
         return super.equals(o);
     }
+
+    @Override
+    public void save() {
+        if (user_id == null) {
+            return;
+        }
+        super.save();
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Transaction.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java
similarity index 63%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Transaction.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java
index a41aae5cb..a8d15e63a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Transaction.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 public class Transaction {
     public String receipt;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TutorialStep.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
similarity index 87%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TutorialStep.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
index 4b377f85d..8b0601de8 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TutorialStep.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
@@ -74,4 +74,8 @@ public class TutorialStep extends BaseModel {
     public void setDisplayedOn(Date displayedOn) {
         this.displayedOn = displayedOn;
     }
+
+    public boolean shouldDisplay() {
+        return  !this.getWasCompleted() && (this.getDisplayedOn() == null || (new Date().getTime() - this.getDisplayedOn().getTime()) > 86400000);
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/LocalAuthentication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
similarity index 93%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/LocalAuthentication.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
index 9cb0a75a8..df4b08b3d 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/LocalAuthentication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.auth;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
@@ -16,6 +16,7 @@ public class LocalAuthentication extends BaseModel {
     @Column
     @PrimaryKey
     @NotNull
+    public
     String user_id;
 
     @Column
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuth.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuth.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java
index e72478c35..f3bf6ef6e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuth.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.auth;
 
 /**
  * Created by magicmicky on 04/02/15.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthResponse.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthResponse.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthResponse.java
index d2aa5cc36..3779a8fe9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthResponse.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.auth;
 
 /**
  * Created by magicmicky on 04/02/15.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthSocial.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java
similarity index 90%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthSocial.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java
index 9173b30f4..20c75c2ac 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthSocial.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.auth;
 
 /**
  * Created by viirus on 13/11/15.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthSocialTokens.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java
similarity index 90%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthSocialTokens.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java
index 8145ca9a6..5e2d38dd1 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthSocialTokens.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.auth;
 
 /**
  * Created by viirus on 13/11/15.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Animal.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Animal.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
index 945e734f9..9e4ffdb1c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Animal.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Customization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Customization.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
index 71ee1d566..37ea875f7 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Customization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
@@ -1,4 +1,6 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.inventory;
+
+import android.support.annotation.Nullable;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
@@ -19,7 +21,7 @@ public class Customization extends BaseModel {
     private String identifier, category, type, notes, customizationSet, customizationSetName, text;
 
     @Column
-    private boolean purchased;
+    private boolean purchased, isBuyable;
 
     @Column
     private Integer price, setPrice;
@@ -27,7 +29,7 @@ public class Customization extends BaseModel {
     @Column
     private Date availableFrom, availableUntil;
 
-    public void updateID() {
+    private void updateID() {
         this.id = this.identifier + "_" + this.type + "_" + this.category;
     }
 
@@ -86,7 +88,7 @@ public class Customization extends BaseModel {
         return this.customizationSetName;
     }
 
-    public void setCustomizationSetName(String customizationSetName) {
+    public void setCustomizationSetName(@Nullable String customizationSetName) {
         this.customizationSetName = customizationSetName;
     }
 
@@ -196,4 +198,12 @@ public class Customization extends BaseModel {
         return path;
 
     }
+
+    public boolean getIsBuyable() {
+        return isBuyable;
+    }
+
+    public void setIsBuyable(boolean buyable) {
+        isBuyable = buyable;
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/CustomizationSet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
similarity index 77%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/CustomizationSet.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
index 07443ddba..90acdd63b 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/CustomizationSet.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.inventory;
 
 /**
  * Created by viirus on 19/01/16.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Egg.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Egg.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
index 12ac796b0..74292b73c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Egg.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Food.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
similarity index 93%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Food.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
index dd796aa16..8c78c8fdb 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Food.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/HatchingPotion.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/HatchingPotion.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
index a5de9ceb8..83f080970 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/HatchingPotion.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Item.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Item.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
index 92ed5789a..013e603de 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Item.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Mount.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
similarity index 87%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Mount.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
index a9033f541..ed1d1a355 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Mount.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Pet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
similarity index 87%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Pet.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
index 827490669..657ed459f 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Pet.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Quest.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Quest.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
index 7fabd71a3..ccefa5d92 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Quest.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestBoss.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestBoss.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
index 0bd135dcb..cd5061c4e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestBoss.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestCollect.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestCollect.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
index 75091d54f..1a33a47d3 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestCollect.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/QuestContent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/QuestContent.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
index d7ba4506e..f0211a1c6 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/QuestContent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
@@ -1,8 +1,6 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
-import com.magicmicky.habitrpgwrapper.lib.models.QuestBoss;
-import com.magicmicky.habitrpgwrapper.lib.models.QuestCollect;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestProgress.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestProgress.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
index 21cc8fc7f..b9e5b8d9a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/QuestProgress.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.inventory;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
similarity index 92%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
index 26c3f05bb..d53ee2915 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.inventory;
+package com.habitrpg.android.habitica.models.inventory;
 
 
 import com.habitrpg.android.habitica.R;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/GuildInvite.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/GuildInvite.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
index a070c5ffe..30809350a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/GuildInvite.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.invitations;
+package com.habitrpg.android.habitica.models.invitations;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/Invitations.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
similarity index 95%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/Invitations.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
index b37765fa8..5da091282 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/Invitations.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.invitations;
+package com.habitrpg.android.habitica.models.invitations;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/PartyInvite.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/PartyInvite.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
index 7f0e85e07..b4d4f0267 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/PartyInvite.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.invitations;
+package com.habitrpg.android.habitica.models.invitations;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/notifications/NotificationData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/NotificationData.java
similarity index 81%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/notifications/NotificationData.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/NotificationData.java
index 866f28866..be459a232 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/notifications/NotificationData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/NotificationData.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.notifications;
+package com.habitrpg.android.habitica.models.notifications;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/notifications/Reward.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java
similarity index 58%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/notifications/Reward.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java
index 7b9f83f76..9e295c9f6 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/notifications/Reward.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.notifications;
+package com.habitrpg.android.habitica.models.notifications;
 
 /**
  * Created by krh12 on 12/1/2016.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BuyResponse.java
similarity index 61%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BuyResponse.java
index 6554ba1c9..5dfd22495 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BuyResponse.java
@@ -1,6 +1,6 @@
-package com.magicmicky.habitrpgwrapper.lib.models.responses;
+package com.habitrpg.android.habitica.models.responses;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
+import com.habitrpg.android.habitica.models.user.Items;
 
 import java.util.HashMap;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/FeedResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/FeedResponse.java
new file mode 100644
index 000000000..fe2e9be21
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/FeedResponse.java
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.models.responses;
+
+public class FeedResponse {
+
+    public Integer value;
+
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/HabitResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabitResponse.java
similarity index 81%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/HabitResponse.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabitResponse.java
index 933abf3ba..24f7a647c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/HabitResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabitResponse.java
@@ -1,6 +1,6 @@
-package com.magicmicky.habitrpgwrapper.lib.models.responses;
+package com.habitrpg.android.habitica.models.responses;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Notification;
+import com.habitrpg.android.habitica.models.Notification;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabiticaError.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabiticaError.java
new file mode 100644
index 000000000..827af108d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabiticaError.java
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.models.responses;
+
+public class HabiticaError {
+    public String message;
+    public String param;
+    public String value;
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/MaintenanceResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/MaintenanceResponse.java
similarity index 75%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/MaintenanceResponse.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/MaintenanceResponse.java
index bd93243d1..c1dcbacb6 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/MaintenanceResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/MaintenanceResponse.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.responses;
+package com.habitrpg.android.habitica.models.responses;
 
 public class MaintenanceResponse {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/PostChatMessageResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/PostChatMessageResult.java
new file mode 100644
index 000000000..285469fb9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/PostChatMessageResult.java
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class PostChatMessageResult {
+    public ChatMessage message;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
new file mode 100644
index 000000000..4c7470dd4
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import java.util.List;
+
+public class SkillResponse {
+
+    public HabitRPGUser user;
+    public List<HabitRPGUser> partyMembers;
+    public Task task;
+
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Status.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java
similarity index 81%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Status.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java
index 5687a40e8..6413a0c6a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Status.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.responses;
 
 /**
  * Created by MagicMicky on 10/06/2014.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirection.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirection.java
similarity index 82%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirection.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirection.java
index 94bb1bb6d..b4c38c3a4 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirection.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirection.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.responses;
 
 /**
  * Created by MagicMicky on 16/03/14.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
similarity index 85%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionData.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
index 069c6a927..e30036d3e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
@@ -1,4 +1,6 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.user.PlayerMinStats;
 
 /**
  * This class represent the data sent back from the API when calling /user/tasks/{id}/{direction}.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataDrop.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataDrop.java
similarity index 92%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataDrop.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataDrop.java
index c122b21f2..d20470215 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataDrop.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataDrop.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.responses;
 
 /**
  * Created by viirus on 14/11/15.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataTemp.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.java
similarity index 83%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataTemp.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.java
index 2cb62c504..3425acf75 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataTemp.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.responses;
 
 /**
  * Created by viirus on 14/11/15.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/UnlockResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/UnlockResponse.java
new file mode 100644
index 000000000..1d091381f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/UnlockResponse.java
@@ -0,0 +1,18 @@
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.models.user.Purchases;
+
+/**
+ * Created by viirus on 16/01/16.
+ */
+public class UnlockResponse {
+
+    public Preferences preferences;
+
+    public Purchases purchased;
+
+    public Items items;
+
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Shop.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.java
similarity index 95%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Shop.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.java
index cd46876bb..72ff0d521 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Shop.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.shops;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopCategory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopCategory.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.java
index 3b4035a9f..d4617dd22 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopCategory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.shops;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
index 5c819da1e..df51c4908 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
@@ -1,8 +1,9 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.shops;
 
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import android.content.res.Resources;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItemUnlockCondition.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java
similarity index 86%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItemUnlockCondition.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java
index 30aa83662..2afdc498d 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItemUnlockCondition.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.shops;
 
 import com.habitrpg.android.habitica.R;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Backer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
similarity index 57%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Backer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
index 542767735..4a692860c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Backer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.social;
 
 public class Backer {
     public int level;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Challenge.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Challenge.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
index 433c23f3a..71f373348 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Challenge.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
@@ -1,6 +1,8 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.social;
 
 import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.NotNull;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
index c1acf2ed7..cc6ef34bf 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
@@ -1,6 +1,7 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.social;
 
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.user.ContributorInfo;
 
 import android.content.res.Resources;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Contributor.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
similarity index 72%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Contributor.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
index 66f6f0f2b..1770d450c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Contributor.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.social;
 
 public class Contributor {
     public boolean admin;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Group.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
similarity index 90%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Group.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
index f68995111..5b1dec96c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Group.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
@@ -1,7 +1,9 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.social;
 
 import com.google.gson.annotations.SerializedName;
 
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.NotNull;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserParty.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserParty.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
index 9d8384661..5372965e1 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserParty.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
@@ -1,8 +1,9 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.social;
 
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ChecklistItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ChecklistItem.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
index 4c44a1c3f..d7e28c0ef 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ChecklistItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Days.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
similarity index 98%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Days.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
index afc88cf96..94721d3fc 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Days.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ItemData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ItemData.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ItemData.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ItemData.java
index 4a27a4078..9f17f994c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ItemData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ItemData.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/RemindersItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
similarity index 98%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/RemindersItem.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
index c05a37292..a07870ebd 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/RemindersItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
index 319138eca..a4632744b 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
@@ -1,10 +1,11 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.TaskDeleteEvent;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
@@ -616,11 +617,15 @@ public class Task extends BaseModel implements Parcelable {
         return this.isDisplayedActive(offset) && (this.checklist.size() != this.getCompletedChecklistCount());
     }
 
-    public Date getNextActiveDateAfter(Date oldTime) {
+    public Date getNextReminderOccurence(Date oldTime) {
         Calendar today = Calendar.getInstance();
 
         Calendar newTime = new GregorianCalendar();
         newTime.setTime(oldTime);
+        newTime.set(today.get(Calendar.YEAR), today.get(Calendar.MONTH), today.get(Calendar.DAY_OF_MONTH));
+        if (today.before(newTime)) {
+            today.add(Calendar.DAY_OF_MONTH, -1);
+        }
 
         if (this.getFrequency().equals(FREQUENCY_DAILY)) {
             Calendar startDate = new GregorianCalendar();
@@ -671,6 +676,19 @@ public class Task extends BaseModel implements Parcelable {
         return false;
     }
 
+    public void parseMarkdown() {
+        try {
+            this.parsedText = MarkdownParser.parseMarkdown(this.getText());
+        } catch (NullPointerException e) {
+            this.parsedText = this.getText();
+        }
+        try {
+            this.parsedNotes = MarkdownParser.parseMarkdown(this.getNotes());
+        } catch (NullPointerException e) {
+            this.parsedNotes = this.getNotes();
+        }
+    }
+
     @Override
     public int describeContents() {
         return 0;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskGroupPlan.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskGroupPlan.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
index 0914b8e82..2d90cbf3e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskGroupPlan.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 
 import com.habitrpg.android.habitica.HabitDatabase;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskList.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java
similarity index 60%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskList.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java
index 2449df02f..8eb291a71 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskList.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 import java.util.Map;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskTag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskTag.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
index 115bb7293..6c9b5a093 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskTag.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
@@ -1,7 +1,7 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 import com.habitrpg.android.habitica.HabitDatabase;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
+import com.habitrpg.android.habitica.models.Tag;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TasksOrder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java
similarity index 93%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TasksOrder.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java
index 4d06168a1..34d23af9e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TasksOrder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+package com.habitrpg.android.habitica.models.tasks;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Authentication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Authentication.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
index a8532569e..ddfcc3b2a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Authentication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
@@ -1,8 +1,9 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.auth.LocalAuthentication;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/BasicStats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/BasicStats.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java
index 8551051a8..b417a4fdc 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/BasicStats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -24,6 +24,7 @@ public class BasicStats extends BaseModel {
     @Column
     @PrimaryKey
     @NotNull
+    protected
     String id;
 
     public Float getCon() {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Buffs.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Buffs.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
index 489a70876..ed48a7261 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Buffs.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContributorInfo.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
similarity index 98%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContributorInfo.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
index 04d38aa76..8ff5fd2fe 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContributorInfo.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Flags.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
similarity index 95%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Flags.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
index 6fb1340e2..3027f3e4e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Flags.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
@@ -1,6 +1,7 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.TutorialStep;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.NotNull;
 import com.raizlabs.android.dbflow.annotation.OneToMany;
@@ -132,6 +133,10 @@ public class Flags extends BaseModel {
     @Override
     public void save() {
 
+        if (user_id == null) {
+            return;
+        }
+
         for (TutorialStep step : this.getTutorial()) {
             step.user_id = user_id;
         }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Gear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Gear.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
index 8c29b40ce..dce2c0d55 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Gear.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
index 0ed094b43..24f3bb25c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
@@ -1,12 +1,16 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.PushDevice;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.invitations.Invitations;
+import com.habitrpg.android.habitica.models.social.UserParty;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.ui.AvatarView;
-import com.magicmicky.habitrpgwrapper.lib.models.invitations.Invitations;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
@@ -355,6 +359,9 @@ public class HabitRPGUser extends BaseModel {
     @Override
     public void save() {
         // We need to set the user_id to all other objects
+        if (id == null) {
+            return;
+        }
         preferences.user_id = id;
         stats.id = id;
         profile.user_Id = id;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Hair.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Hair.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
index fb6c6fe01..25518d7ec 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Hair.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Inbox.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Inbox.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
index 83cfbec65..7018f6109 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Inbox.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
@@ -1,9 +1,10 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.annotation.Table;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Items.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
similarity index 98%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Items.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
index 5c3f0eb65..f32f26da0 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Items.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Outfit.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Outfit.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
index 7264b71ff..afd02ff2f 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Outfit.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
index d2d5f73c7..c3890bed6 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
@@ -1,8 +1,9 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.HabitRpgClass;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
similarity index 99%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
index a17ffc235..15d495d18 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Profile.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Profile.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
index ab2479d62..c023af8e2 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Profile.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 /**
  * Created by MagicMicky on 16/03/14.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
index 9b1070f71..40497c68d 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
@@ -1,6 +1,7 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SpecialItems.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SpecialItems.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
index a45f5e60c..5d7039ec1 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SpecialItems.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 
 import com.habitrpg.android.habitica.HabitDatabase;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Stats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Stats.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
index 9deb2cf18..f6c29e276 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Stats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
index 091864398..d9c86e1a3 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
index 6e2f4e1c6..e436a9ce9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SuppressedModals.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
similarity index 95%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SuppressedModals.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
index 15fd6bab0..b342688b3 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SuppressedModals.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models.user;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
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 3d3be6006..b26c3e40e 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
@@ -1,11 +1,12 @@
 package com.habitrpg.android.habitica.modules;
 
+import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
 import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.ContentCache;
 import com.habitrpg.android.habitica.HostConfig;
-import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService;
+import com.habitrpg.android.habitica.api.MaintenanceApiService;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -29,7 +30,7 @@ public class ApiModule {
 
     @Provides
     public GsonConverterFactory providesGsonConverterFactory() {
-        return com.habitrpg.android.habitica.ApiClientImpl.createGsonFactory();
+        return ApiClientImpl.createGsonFactory();
     }
 
     @Provides
@@ -41,7 +42,7 @@ public class ApiModule {
     @Provides
     @Singleton
     public ApiClient providesApiHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, PopupNotificationsManager popupNotificationsManager, Context context) {
-        return new com.habitrpg.android.habitica.ApiClientImpl(gsonConverter, hostConfig, crashlyticsProxy, popupNotificationsManager, context);
+        return new ApiClientImpl(gsonConverter, hostConfig, crashlyticsProxy, popupNotificationsManager, context);
     }
 
     @Provides
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.java
index c6efeee54..7a8cc25b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.java
@@ -1,13 +1,16 @@
 package com.habitrpg.android.habitica.modules;
 
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.executors.JobExecutor;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.executors.UIThread;
 import com.habitrpg.android.habitica.helpers.SoundFileLoader;
 import com.habitrpg.android.habitica.helpers.SoundManager;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
 
 import android.app.Application;
 import android.content.Context;
@@ -83,4 +86,16 @@ public class AppModule {
     PostExecutionThread providePostExecutionThread(UIThread uiThread) {
         return uiThread;
     }
+
+    @Provides
+    @Singleton
+    TaskAlarmManager providesTaskAlarmManager(Context context) {
+        return new TaskAlarmManager(context);
+    }
+
+    @Provides
+    @Singleton
+    PushNotificationManager pushNotificationManager(ApiClient apiClient, SharedPreferences sharedPreferences, Context context) {
+        return new PushNotificationManager(apiClient, sharedPreferences, context);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
index 63e7338b1..e3edcb54e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -5,17 +5,21 @@ import com.habitrpg.android.habitica.data.ChallengeRepository;
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
 import com.habitrpg.android.habitica.data.TagRepository;
 import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.data.implementation.ChallengeRepositoryImpl;
 import com.habitrpg.android.habitica.data.implementation.SetupCustomizationRepositoryImpl;
 import com.habitrpg.android.habitica.data.implementation.TagRepositoryImpl;
 import com.habitrpg.android.habitica.data.implementation.TaskRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.UserRepositoryImpl;
 import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository;
 import com.habitrpg.android.habitica.data.local.TagLocalRepository;
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
+import com.habitrpg.android.habitica.data.local.UserLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowChallengeLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowTaskLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.TagLocalRepositoryImpl;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowTagLocalRepository;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowUserLocalRepository;
 
 import android.content.Context;
 
@@ -59,11 +63,21 @@ public class RepositoryModule {
 
     @Provides
     TagLocalRepository providesTagLocalRepository() {
-        return new TagLocalRepositoryImpl();
+        return new DbFlowTagLocalRepository();
     }
 
     @Provides
     TagRepository providesTagRepository(TagLocalRepository localRepository, ApiClient apiClient) {
         return new TagRepositoryImpl(localRepository, apiClient);
     }
+
+    @Provides
+    UserLocalRepository providesUserLocalRepository() {
+        return new DbFlowUserLocalRepository();
+    }
+
+    @Provides
+    UserRepository providesUserRepository(UserLocalRepository localRepository, ApiClient apiClient) {
+        return new UserRepositoryImpl(localRepository, apiClient);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java
index a73661b47..5e1ef2580 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java
@@ -7,11 +7,11 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 
-import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import javax.inject.Inject;
 
@@ -30,7 +30,7 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        HabiticaApplication.getInstance(context).getComponent().inject(this);
+        HabiticaBaseApplication.getComponent().inject(this);
         this.resources = context.getResources();
 
         this.action = intent.getAction();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java
index 87b4931c8..a2489fcb8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java
@@ -1,16 +1,22 @@
 package com.habitrpg.android.habitica.receivers;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import javax.inject.Inject;
+
 public class TaskAlarmBootReceiver extends BroadcastReceiver {
 
+    @Inject
+    TaskAlarmManager taskAlarmManager;
+
     @Override
     public void onReceive(Context context, Intent arg1) {
-        TaskAlarmManager taskAlarmManager = TaskAlarmManager.getInstance(context);
+        HabiticaApplication.getComponent().inject(this);
         taskAlarmManager.scheduleAllSavedAlarms();
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java
index c38a0d693..6fef0b0d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.receivers;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
@@ -14,6 +15,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 
+import javax.inject.Inject;
+
 /**
  * Created by keithholliday on 5/29/16.
  */
@@ -23,12 +26,13 @@ public class TaskReceiver extends BroadcastReceiver {
 
     private String taskId;
     private String taskTitle;
-    private TaskAlarmManager taskAlarmManager;
+    @Inject
+    TaskAlarmManager taskAlarmManager;
 
     @Override
     public void onReceive(Context arg0, Intent arg1) {
         context = arg0;
-        taskAlarmManager = TaskAlarmManager.getInstance(context);
+        HabiticaApplication.getComponent().inject(this);
 
         Bundle extras = arg1.getExtras();
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
index 5f46ddd3b..36f969e01 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
@@ -9,7 +9,7 @@ import com.facebook.drawee.view.DraweeHolder;
 import com.facebook.drawee.view.MultiDraweeHolder;
 import com.facebook.imagepipeline.image.ImageInfo;
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index 5bf0d07cf..7d15c9ef5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -6,8 +6,8 @@ import com.habitrpg.android.habitica.events.BoughtGemsEvent;
 import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java
index c4a6db86e..f4e8c8ab3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui;
 
 
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.ui.views.Typewriter;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -9,6 +10,8 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -16,13 +19,13 @@ import android.widget.TextView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class SpeechBubbleView extends FrameLayout {
+public class SpeechBubbleView extends FrameLayout implements View.OnClickListener {
 
     @BindView(R.id.name_plate)
     TextView namePlate;
 
     @BindView(R.id.textView)
-    TextView textView;
+    Typewriter textView;
 
     @BindView(R.id.npc_image_view)
     ImageView npcImageView;
@@ -30,6 +33,10 @@ public class SpeechBubbleView extends FrameLayout {
     @BindView(R.id.confirmation_buttons)
     ViewGroup confirmationButtons;
 
+    @BindView(R.id.continue_indicator)
+    View continueIndicator;
+    private ShowNextListener showNextListener;
+
     public SpeechBubbleView(Context context, AttributeSet attrs) {
         super(context, attrs);
 
@@ -51,7 +58,43 @@ public class SpeechBubbleView extends FrameLayout {
         }
 
         confirmationButtons.setVisibility(View.GONE);
+
+        this.setOnClickListener(this);
     }
 
 
+    public void setConfirmationButtonVisibility(int visibility) {
+        confirmationButtons.setVisibility(visibility);
+    }
+
+    public void animateText(String text) {
+        this.textView.animateText(text);
+    }
+
+    public void setText(String text) {
+        this.textView.setText(text);
+    }
+
+    public void setHasMoreContent(Boolean hasMoreContent) {
+        continueIndicator.setVisibility(hasMoreContent ? View.VISIBLE : View.GONE);
+    }
+
+    public void setShowNextListener(ShowNextListener listener) {
+        showNextListener = listener;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (textView.isAnimating()) {
+            textView.stopTextAnimation();
+        } else {
+            if (showNextListener != null) {
+                showNextListener.showNextStep();
+            }
+        }
+    }
+
+    public interface ShowNextListener {
+        void showNextStep();
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java
index 824bbbd43..8c1fc3520 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java
@@ -1,27 +1,29 @@
 package com.habitrpg.android.habitica.ui;
 
-import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
-
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
-import java.util.Objects;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 
-public class TutorialView extends FrameLayout implements View.OnClickListener {
+public class TutorialView extends FrameLayout {
 
     public TutorialStep step;
+    @Nullable
     public OnTutorialReaction onReaction;
-    @BindView(R.id.textView)
-    TextView tutorialTextView;
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
     @BindView(R.id.background)
     RelativeLayout background;
     @BindView(R.id.dismissButton)
@@ -29,31 +31,75 @@ public class TutorialView extends FrameLayout implements View.OnClickListener {
     @BindView(R.id.completeButton)
     Button completeButton;
 
-    public TutorialView(Context context, TutorialStep step, OnTutorialReaction onReaction) {
+    private List<String> tutorialTexts;
+    private int currentTextIndex;
+
+    public TutorialView(Context context, TutorialStep step, @Nullable OnTutorialReaction onReaction) {
         super(context);
         LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mInflater.inflate(R.layout.overlay_tutorial, this, true);
         ButterKnife.bind(this);
-        background.setOnClickListener(this);
-        dismissButton.setOnClickListener(this);
-        completeButton.setOnClickListener(this);
+        speechBubbleView.setConfirmationButtonVisibility(View.GONE);
+        speechBubbleView.setShowNextListener(this::displayNextTutorialText);
         this.step = step;
         this.onReaction = onReaction;
     }
 
     public void setTutorialText(String text) {
-        this.tutorialTextView.setText(text);
+        this.speechBubbleView.animateText(text);
+        speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE);
     }
 
-    @Override
-    public void onClick(View v) {
-        if (Objects.equals(v, background) || Objects.equals(v, completeButton)) {
+    public void setTutorialTexts(List<String> texts) {
+        tutorialTexts = texts;
+        currentTextIndex = -1;
+        displayNextTutorialText();
+    }
+
+    public void setCanBeDeferred(boolean canBeDeferred) {
+        dismissButton.setVisibility(canBeDeferred ? View.VISIBLE : View.GONE);
+    }
+
+    private void displayNextTutorialText() {
+        currentTextIndex++;
+        if (currentTextIndex < tutorialTexts.size()) {
+            speechBubbleView.animateText(tutorialTexts.get(currentTextIndex));
+            if (isDisplayingLastStep()) {
+                speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE);
+                speechBubbleView.setHasMoreContent(false);
+            } else {
+                speechBubbleView.setHasMoreContent(true);
+            }
+        } else {
+            if (this.onReaction != null) {
+                this.onReaction.onTutorialCompleted(this.step);
+            }
+        }
+    }
+
+    @OnClick(R.id.completeButton)
+    public void completeButtonClicked() {
+        if (this.onReaction != null) {
             this.onReaction.onTutorialCompleted(this.step);
-        } else if (Objects.equals(v, dismissButton)) {
+        }
+    }
+
+    @OnClick(R.id.dismissButton)
+    public void dismissButtonClicked() {
+        if (this.onReaction != null) {
             this.onReaction.onTutorialDeferred(this.step);
         }
     }
 
+    @OnClick(R.id.background)
+    public void backgroundClicked() {
+        speechBubbleView.onClick(speechBubbleView);
+    }
+
+    private boolean isDisplayingLastStep() {
+        return currentTextIndex == (tutorialTexts.size()-1);
+    }
+
     public interface OnTutorialReaction {
         void onTutorialCompleted(TutorialStep step);
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.java
index f6496e5a7..d8fe7a92a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui.activities;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.appwidget.AppWidgetManager;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
index cdc630927..486cd9363 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
@@ -19,11 +19,11 @@ import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeDet
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeTasksRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.LeaveChallengeBody;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java
index d4c6a8844..37892fc97 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java
@@ -1,15 +1,15 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.AvatarView;
-import com.magicmicky.habitrpgwrapper.lib.models.Gear;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Hair;
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
-import com.magicmicky.habitrpgwrapper.lib.models.Outfit;
-import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
+import com.habitrpg.android.habitica.models.user.Gear;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Hair;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Outfit;
+import com.habitrpg.android.habitica.models.user.Preferences;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java
index 956b00a0a..4d02e6a54 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java
@@ -4,7 +4,7 @@ import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.drawee.controller.BaseControllerListener;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.facebook.imagepipeline.image.ImageInfo;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.ContentCache;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
@@ -15,15 +15,15 @@ import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.adapter.social.AchievementAdapter;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.Achievement;
-import com.magicmicky.habitrpgwrapper.lib.models.AchievementGroup;
-import com.magicmicky.habitrpgwrapper.lib.models.AchievementResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Buffs;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Outfit;
-import com.magicmicky.habitrpgwrapper.lib.models.Profile;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.Achievement;
+import com.habitrpg.android.habitica.models.AchievementGroup;
+import com.habitrpg.android.habitica.models.AchievementResult;
+import com.habitrpg.android.habitica.models.user.Buffs;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Outfit;
+import com.habitrpg.android.habitica.models.user.Profile;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 
 import net.pherth.android.emoji_library.EmojiEditText;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
index f46a22c2f..8defc3d1b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.appwidget.AppWidgetManager;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java
index 44855bc37..98ae28b33 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java
@@ -1,11 +1,10 @@
 package com.habitrpg.android.habitica.ui.activities;
 
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
-import com.viewpagerindicator.CirclePageIndicator;
 import com.viewpagerindicator.IconPageIndicator;
 import com.viewpagerindicator.IconPagerAdapter;
 
@@ -60,9 +59,11 @@ public class IntroActivity extends BaseActivity implements View.OnClickListener,
         apiClient.getContent()
                 .subscribe(contentResult -> {}, throwable -> {});
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             Window window = getWindow();
-            window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
+            }
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
index 391bd52c6..853c321c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
@@ -26,9 +26,9 @@ import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 import com.habitrpg.android.habitica.ui.views.login.LockableScrollView;
 import com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -178,9 +178,11 @@ public class LoginActivity extends BaseActivity
         backgroundContainer.post(() -> backgroundContainer.scrollTo(0, backgroundContainer.getBottom()));
         backgroundContainer.setScrollingEnabled(false);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             Window window = getWindow();
-            window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
+            }
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
         }
     }
@@ -348,7 +350,7 @@ public class LoginActivity extends BaseActivity
         if (requestCode == FacebookSdk.getCallbackRequestCodeOffset()) {
             //This is necessary because the regular login callback is not called for some reason
             AccessToken accessToken = AccessToken.getCurrentAccessToken();
-            if (accessToken.getToken() != null) {
+            if (accessToken != null && accessToken.getToken() != null) {
                 apiClient.connectSocial("facebook", accessToken.getUserId(), accessToken.getToken())
                         .subscribe(LoginActivity.this, throwable -> hideProgress());
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index fa9c038b9..5ae518fa6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -2,14 +2,12 @@ package com.habitrpg.android.habitica.ui.activities;
 
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
-import android.database.sqlite.SQLiteDoneException;
 import android.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -19,18 +17,16 @@ import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
+import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
 import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.Display;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,13 +40,14 @@ import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.callbacks.ItemsCallback;
-import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
-import com.habitrpg.android.habitica.callbacks.TaskCreationCallback;
 import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
 import com.habitrpg.android.habitica.callbacks.TaskUpdateCallback;
 import com.habitrpg.android.habitica.callbacks.UnlockCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.TagRepository;
 import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.events.ContentReloadedEvent;
 import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
@@ -63,7 +60,6 @@ import com.habitrpg.android.habitica.events.SelectClassEvent;
 import com.habitrpg.android.habitica.events.ShareEvent;
 import com.habitrpg.android.habitica.events.TaskRemovedEvent;
 import com.habitrpg.android.habitica.events.TaskSaveEvent;
-import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
 import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
 import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
@@ -106,29 +102,26 @@ 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 com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
-import com.magicmicky.habitrpgwrapper.lib.models.Shop;
-import com.magicmicky.habitrpgwrapper.lib.models.SpecialItems;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Item;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.MaintenanceResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.api.MaintenanceApiService;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.user.SpecialItems;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.mikepenz.materialdrawer.AccountHeader;
 import com.mikepenz.materialdrawer.Drawer;
 import com.mikepenz.materialdrawer.holder.BadgeStyle;
@@ -136,15 +129,9 @@ import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
 import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 import com.mikepenz.materialdrawer.model.interfaces.IProfile;
 import com.raizlabs.android.dbflow.runtime.TransactionManager;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
 import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Delete;
-import com.raizlabs.android.dbflow.sql.language.From;
 import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
 import com.raizlabs.android.dbflow.structure.BaseModel;
 import com.roughike.bottombar.BottomBar;
 
@@ -199,6 +186,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     protected SharedPreferences sharedPreferences;
     @Inject
     CrashlyticsProxy crashlyticsProxy;
+    @BindView(R.id.appbar)
+    AppBarLayout appBar;
     @BindView(R.id.toolbar)
     Toolbar toolbar;
     @BindView(R.id.detail_tabs)
@@ -207,6 +196,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     View avatar_with_bars;
     @BindView(R.id.overlayFrameLayout)
     ViewGroup overlayLayout;
+
+    @Inject
     PushNotificationManager pushNotificationManager;
     // region UseCases
 
@@ -236,6 +227,13 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Inject
     TaskRepository taskRepository;
+    @Inject
+    UserRepository userRepository;
+    @Inject
+    TagRepository tagRepository;
+
+    @Inject
+    TaskAlarmManager taskAlarmManager;
 
     // endregion
 
@@ -248,23 +246,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     private Date lastSync;
     private TutorialView activeTutorialView;
     private boolean isloadingContent;
-    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
-        @Override
-        public void onResultReceived(HabitRPGUser habitRPGUser) {
-            MainActivity.this.user = habitRPGUser;
-            MainActivity.this.setUserData(true);
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
-            return true;
-        }
-    };
 
 
     @Override
@@ -293,9 +274,11 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             return;
         }
 
-        pushNotificationManager = PushNotificationManager.getInstance(this);
-
-        new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).async().querySingle(userTransactionListener);
+        userRepository.getUser(hostConfig.getUser())
+                .subscribe(newUser -> {
+                    MainActivity.this.user = newUser;
+                    MainActivity.this.setUserData(true);
+                }, throwable -> {});
 
         setupToolbar(toolbar);
 
@@ -306,9 +289,11 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         drawer.setSelectionAtPosition(1, false);
         sideAvatarView = new AvatarView(this, true, false, false);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             Window window = getWindow();
-            window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_10_alpha));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_10_alpha));
+            }
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
             toolbar.setPadding(0, getStatusBarHeight(), 0, 0);
             float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, getResources().getDisplayMetrics());
@@ -316,7 +301,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
 
         EventBus.getDefault().register(this);
-
     }
 
     public int getStatusBarHeight() {
@@ -346,7 +330,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
 
         if (this.sharedPreferences.getLong("lastReminderSchedule", 0) < new Date().getTime() - 86400000) {
-            TaskAlarmManager taskAlarmManager = TaskAlarmManager.getInstance(this);
             try {
                 taskAlarmManager.scheduleAllSavedAlarms();
             } catch (Exception e) {
@@ -453,8 +436,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             if (offset != user.getPreferences().getTimezoneOffset()) {
                 Map<String, Object> updateData = new HashMap<>();
                 updateData.put("preferences.timezoneOffset", String.valueOf(offset));
-                apiClient.updateUser(updateData)
-                        .subscribe(new MergeUserCallback(this, user), throwable -> {
+                userRepository.updateUser(user, updateData)
+                        .subscribe(this::onUserReceived, throwable -> {
                         });
             }
             runOnUiThread(() -> {
@@ -486,7 +469,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                         allTasks.addAll(user.getHabits());
                         allTasks.addAll(user.getRewards());
 
-                        loadAndRemoveOldTasks(user.getId(), allTasks);
+                        taskRepository.removeOldTasks(user.getId(), allTasks);
 
                         ArrayList<ChecklistItem> allChecklistItems = new ArrayList<>();
                         for (Task t : allTasks) {
@@ -494,7 +477,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                                 allChecklistItems.addAll(t.checklist);
                             }
                         }
-                        loadAndRemoveOldChecklists(allChecklistItems);
+                        taskRepository.removeOldChecklists(allChecklistItems);
 
                         ArrayList<TaskTag> allTaskTags = new ArrayList<>();
                         for (Task t : allTasks) {
@@ -502,7 +485,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                                 allTaskTags.addAll(t.getTags());
                             }
                         }
-                        loadAndRemoveOldTaskTags(allTaskTags);
+                        taskRepository.removeOldTaskTags(allTaskTags);
 
                         ArrayList<RemindersItem> allReminders = new ArrayList<>();
                         for (Task t : allTasks) {
@@ -510,9 +493,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                                 allReminders.addAll(t.getReminders());
                             }
                         }
-                        loadAndRemoveOldReminders(allReminders);
+                        taskRepository.removeOldReminders(allReminders);
 
-                        loadAndRemoveOldTags(user.getTags());
+                        tagRepository.removeOldTags(user.getTags());
 
                         updateOwnedDataForUser(user);
                     }
@@ -521,63 +504,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
     }
 
-    private void loadAndRemoveOldTasks(String userId, final List<Task> onlineEntries) {
-        final ArrayList<String> onlineTaskIdList = new ArrayList<>();
-
-        for (Task oTask : onlineEntries) {
-            onlineTaskIdList.add(oTask.getId());
-        }
-
-        Where<Task> query = new Select().from(Task.class).where(Condition.column("user_id").eq(userId));
-        try {
-            if (query.count() != onlineEntries.size()) {
-
-                // Load Database Tasks
-                query.async().queryList(new TransactionListener<List<Task>>() {
-                    @Override
-                    public void onResultReceived(List<Task> tasks) {
-
-                        ArrayList<Task> tasksToDelete = new ArrayList<>();
-
-                        for (Task dbTask : tasks) {
-                            if (!onlineTaskIdList.contains(dbTask.getId())) {
-                                tasksToDelete.add(dbTask);
-                            }
-                        }
-
-                        for (Task delTask : tasksToDelete) {
-                            // TaskTag
-                            new Delete().from(TaskTag.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // ChecklistItem
-                            new Delete().from(ChecklistItem.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // Days
-                            new Delete().from(Days.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // TASK
-                            delTask.async().delete();
-
-                            EventBus.getDefault().post(new TaskRemovedEvent(delTask.getId()));
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<Task>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<Task>> baseTransaction, List<Task> tasks) {
-                        return tasks != null && tasks.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
     private void displayNewInboxMessagesBadge() {
         Integer numberOfUnreadPms = this.user.getInbox().getNewMessages();
         IDrawerItem newInboxItem;
@@ -602,191 +528,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         this.drawer.updateItemAtPosition(newInboxItem, this.drawer.getPosition(MainDrawerBuilder.SIDEBAR_INBOX));
     }
 
-
-    private void loadAndRemoveOldChecklists(final List<ChecklistItem> onlineEntries) {
-        final ArrayList<String> onlineChecklistItemIdList = new ArrayList<>();
-
-        for (ChecklistItem item : onlineEntries) {
-            onlineChecklistItemIdList.add(item.getId());
-        }
-
-        From<ChecklistItem> query = new Select().from(ChecklistItem.class);
-        try {
-            if (query.count() != onlineEntries.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<ChecklistItem>>() {
-                    @Override
-                    public void onResultReceived(List<ChecklistItem> items) {
-
-                        ArrayList<ChecklistItem> checkListItemsToDelete = new ArrayList<>();
-
-                        for (ChecklistItem chItem : items) {
-                            if (!onlineChecklistItemIdList.contains(chItem.getId())) {
-                                checkListItemsToDelete.add(chItem);
-                            }
-                        }
-
-                        for (ChecklistItem chItem : checkListItemsToDelete) {
-                            chItem.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<ChecklistItem>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<ChecklistItem>> baseTransaction, List<ChecklistItem> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-
-    }
-
-    private void loadAndRemoveOldTaskTags(final List<TaskTag> onlineEntries) {
-        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
-
-        for (TaskTag item : onlineEntries) {
-            onlineTaskTagItemIdList.add(item.getId());
-        }
-
-        From<TaskTag> query = new Select().from(TaskTag.class);
-        try {
-            if (query.count() != onlineEntries.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<TaskTag>>() {
-                    @Override
-                    public void onResultReceived(List<TaskTag> items) {
-
-                        ArrayList<TaskTag> checkListItemsToDelete = new ArrayList<>();
-
-                        for (TaskTag ttag : items) {
-                            if (!onlineTaskTagItemIdList.contains(ttag.getId())) {
-                                checkListItemsToDelete.add(ttag);
-                            }
-                        }
-
-                        for (TaskTag ttag : checkListItemsToDelete) {
-                            ttag.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<TaskTag>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<TaskTag>> baseTransaction, List<TaskTag> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-
-    }
-
-    private void loadAndRemoveOldReminders(final List<RemindersItem> onlineEntries) {
-        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
-
-        for (RemindersItem item : onlineEntries) {
-            onlineTaskTagItemIdList.add(item.getId());
-        }
-
-        From<RemindersItem> query = new Select().from(RemindersItem.class);
-        try {
-            if (query.count() != onlineEntries.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<RemindersItem>>() {
-                    @Override
-                    public void onResultReceived(List<RemindersItem> items) {
-
-                        ArrayList<RemindersItem> remindersToDelete = new ArrayList<>();
-
-                        for (RemindersItem reminder : items) {
-                            if (!onlineTaskTagItemIdList.contains(reminder.getId())) {
-                                remindersToDelete.add(reminder);
-                            }
-                        }
-
-                        for (RemindersItem reminder : remindersToDelete) {
-                            reminder.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<RemindersItem>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<RemindersItem>> baseTransaction, List<RemindersItem> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-
-    }
-
-    private void loadAndRemoveOldTags(final List<Tag> onlineEntries) {
-        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
-
-        for (Tag item : onlineEntries) {
-            onlineTaskTagItemIdList.add(item.getId());
-        }
-
-        From<Tag> query = new Select().from(Tag.class);
-        try {
-            if (query.count() != onlineEntries.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<Tag>>() {
-                    @Override
-                    public void onResultReceived(List<Tag> items) {
-
-                        ArrayList<Tag> tagsToDelete = new ArrayList<>();
-
-                        for (Tag tag : items) {
-                            if (!onlineTaskTagItemIdList.contains(tag.getId())) {
-                                tagsToDelete.add(tag);
-                            }
-                        }
-
-                        for (Tag tag : tagsToDelete) {
-                            tag.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<Tag>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<Tag>> transaction, List<Tag> result) {
-                        return result != null && result.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-
-    }
-
     private void updateOwnedDataForUser(HabitRPGUser user) {
         if (user == null || user.getItems() == null) {
             return;
@@ -952,17 +693,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == SELECT_CLASS_RESULT) {
-            if (this.apiClient != null) {
-                this.apiClient.retrieveUser(true)
-
-                        .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                        });
-            }
+            retrieveUser();
         } else if (requestCode == GEM_PURCHASE_REQUEST) {
-            this.apiClient.retrieveUser(true)
-
-                    .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                    });
+            retrieveUser();
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
@@ -982,8 +715,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void onEvent(UpdateUserCommand event) {
-        apiClient.updateUser(event.updateData)
-                .subscribe(new MergeUserCallback(this, user), throwable -> {
+        userRepository.updateUser(user, event.updateData)
+                .subscribe(this::onUserReceived, throwable -> {
                 });
     }
 
@@ -999,7 +732,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         this.user.setBalance(this.user.getBalance() - event.balanceDiff);
         this.setUserData(false);
         apiClient.unlockPath(event.path)
-
                 .subscribe(new UnlockCallback(this, this.user), throwable -> {
                 });
     }
@@ -1025,10 +757,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                 observable = apiClient.purchaseItem(event.item.purchaseType, event.item.key);
             }
             observable
-
                     .doOnNext(aVoid -> showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL))
-                    .subscribe(buyResponse -> apiClient.retrieveUser(false)
-
+                    .subscribe(buyResponse -> userRepository.retrieveUser(false)
                             .subscribe(new HabitRPGUserCallback(this), throwable -> {
                             }), throwable -> {
                         HttpException error = (HttpException) throwable;
@@ -1124,16 +854,14 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             return;
         }
 
-        apiClient.deleteTask(cmd.TaskIdToDelete)
-                .subscribe(aVoid -> {
-                    EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete));
-                }, throwable -> {});
+        taskRepository.deleteTask(cmd.TaskIdToDelete)
+                .subscribe(aVoid -> EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete)), throwable -> {});
     }
 
     @Subscribe
     public void openMysteryItem(OpenMysteryItemEvent event) {
         apiClient.openMysteryItem()
-                .subscribe(mysteryItem -> apiClient.retrieveUser(false)
+                .subscribe(mysteryItem -> userRepository.retrieveUser(false)
                         .subscribe(new HabitRPGUserCallback(user1 -> {
                             OpenedMysteryItemEvent openedEvent = new OpenedMysteryItemEvent();
                             openedEvent.numberLeft = user1.getPurchased().getPlan().mysteryItems.size();
@@ -1152,7 +880,11 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void onEvent(DisplayTutorialEvent tutorialEvent) {
-        this.displayTutorialStep(tutorialEvent.step, tutorialEvent.tutorialText);
+        if (tutorialEvent.tutorialText != null) {
+            this.displayTutorialStep(tutorialEvent.step, tutorialEvent.tutorialText, tutorialEvent.canBeDeferred);
+        } else {
+            this.displayTutorialStep(tutorialEvent.step, tutorialEvent.tutorialTexts, tutorialEvent.canBeDeferred);
+        }
     }
 
     @Subscribe
@@ -1163,7 +895,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     @Subscribe
     public void onEvent(SellItemCommand event) {
         this.apiClient.sellItem(event.item.getType(), event.item.getKey())
-
                 .subscribe(habitRPGUser -> {
                     user.setItems(habitRPGUser.getItems());
                     user.save();
@@ -1179,7 +910,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             return;
         }
         this.apiClient.hatchPet(event.usingEgg.getKey(), event.usingHatchingPotion.getKey())
-
                 .subscribe(new ItemsCallback(user1 -> {
                     FrameLayout petWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null);
                     SimpleDraweeView petImageView = (SimpleDraweeView) petWrapper.findViewById(R.id.pet_imageview);
@@ -1215,7 +945,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
         final Pet pet = event.usingPet;
         this.apiClient.feedPet(event.usingPet.getKey(), event.usingFood.getKey())
-
                 .subscribe(feedResponse -> {
                     MainActivity.this.user.getItems().getPets().put(pet.getKey(), feedResponse.value);
                     MainActivity.this.user.getItems().getFood().put(event.usingFood.getKey(), event.usingFood.getOwned() - 1);
@@ -1285,6 +1014,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                             user.getStats().exp = data.getExp();
                             user.getStats().mp = data.getMp();
                             user.getStats().gp = data.getGp();
+                            user.getStats().lvl = data.getLvl();
                             setUserData(true);
                         }, throwable -> {});
             }
@@ -1321,9 +1051,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                     .setView(customView)
                     .setPositiveButton(R.string.faint_button, (dialog, which) -> {
                         faintDialog = null;
-                        apiClient.revive()
-
-                                .subscribe(new MergeUserCallback(MainActivity.this, MainActivity.this.user), throwable -> {
+                        userRepository.revive(user)
+                                .subscribe(this::onUserReceived, throwable -> {
                                 });
                     })
                     .create();
@@ -1349,9 +1078,11 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     }
 
     protected void retrieveUser() {
-        this.apiClient.retrieveUser(true)
-                .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                });
+        if (this.userRepository != null) {
+            this.userRepository.retrieveUser(true)
+                    .subscribe(this::onUserReceived, throwable -> {
+                    });
+        }
     }
 
     @Subscribe
@@ -1362,10 +1093,26 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                 });
     }
 
-    private void displayTutorialStep(TutorialStep step, String text) {
+    private void displayTutorialStep(TutorialStep step, String text, boolean canBeDeferred) {
         TutorialView view = new TutorialView(this, step, this);
         view.setTutorialText(text);
         view.onReaction = this;
+        view.setCanBeDeferred(canBeDeferred);
+        this.overlayLayout.addView(view);
+        this.activeTutorialView = view;
+
+        Map<String, Object> additionalData = new HashMap<>();
+        additionalData.put("eventLabel", step.getIdentifier() + "-android");
+        additionalData.put("eventValue", step.getIdentifier());
+        additionalData.put("complete", false);
+        AmplitudeManager.sendEvent("tutorial", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
+    }
+
+    private void displayTutorialStep(TutorialStep step, List<String> texts, boolean canBeDeferred) {
+        TutorialView view = new TutorialView(this, step, this);
+        view.setTutorialTexts(texts);
+        view.onReaction = this;
+        view.setCanBeDeferred(canBeDeferred);
         this.overlayLayout.addView(view);
         this.activeTutorialView = view;
 
@@ -1381,9 +1128,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         String path = "flags.tutorial." + step.getTutorialGroup() + "." + step.getIdentifier();
         Map<String, Object> updateData = new HashMap<>();
         updateData.put(path, true);
-        apiClient.updateUser(updateData)
-
-                .subscribe(new MergeUserCallback(this, user), throwable -> {
+        userRepository.updateUser(user,  updateData)
+                .subscribe(this::onUserReceived, throwable -> {
                 });
         this.overlayLayout.removeView(this.activeTutorialView);
         this.removeActiveTutorialView();
@@ -1473,12 +1219,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
         Task task = event.task;
         if (event.created) {
-            this.taskRepository.createTask(task).subscribe(new TaskCreationCallback(), throwable -> {
-                    });
+            this.taskRepository.createTask(task).subscribe(task1 -> {}, throwable -> {});
         } else {
-            this.taskRepository.updateTask(task)
-                    .subscribe(new TaskUpdateCallback(), throwable -> {
-                    });
+            this.taskRepository.updateTask(task).subscribe(task1 -> {}, throwable -> {});
         }
     }
 
@@ -1523,18 +1266,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     }
 
-    public void unlockDrawer(int gravity) {
-        if (this.drawer != null) {
-            this.drawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, gravity);
-        }
-    }
-
-    public void lockDrawer(int gravity) {
-        if (this.drawer != null) {
-            this.drawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, gravity);
-        }
-    }
-
     @Subscribe
     public void onEvent(OpenFullProfileCommand cmd) {
         if (cmd.MemberId.equals("system"))
@@ -1548,4 +1279,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
         startActivity(intent);
     }
+
+    public boolean isAppBarExpanded() {
+        return (appBar.getHeight() - appBar.getBottom()) == 0;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
index 973ecb35a..af299b1bf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
@@ -1,11 +1,11 @@
 package com.habitrpg.android.habitica.ui.activities;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService;
+import com.habitrpg.android.habitica.api.MaintenanceApiService;
 
 import net.pherth.android.emoji_library.EmojiTextView;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
index 0a484df5f..a28b97531 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
@@ -1,13 +1,13 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -53,8 +53,8 @@ public class PartyInviteActivity extends BaseActivity {
     private String userIdToInvite;
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
         @Override
-        public void onResultReceived(HabitRPGUser habitRPGUser) {
-            handleUserRecieved(habitRPGUser);
+        public void onResultReceived(HabitRPGUser user) {
+            handleUserRecieved(user);
         }
 
         @Override
@@ -63,7 +63,7 @@ public class PartyInviteActivity extends BaseActivity {
         }
 
         @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
             return true;
         }
     };
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
index 5646609aa..9056b8c2e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
@@ -1,45 +1,11 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.preference.PreferenceManager;
-import android.view.View;
-import android.widget.Button;
-
-import com.habitrpg.android.habitica.ui.views.FadingViewPager;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.callbacks.ItemsCallback;
-import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.commands.EquipCommand;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.helpers.AmplitudeManager;
-import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
-import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
-import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
-import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.viewpagerindicator.IconPageIndicator;
-import com.viewpagerindicator.IconPagerAdapter;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
@@ -51,6 +17,29 @@ import android.view.View;
 import android.view.Window;
 import android.widget.Button;
 
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.callbacks.ItemsCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.commands.EquipCommand;
+import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.helpers.AmplitudeManager;
+import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment;
+import com.habitrpg.android.habitica.ui.views.FadingViewPager;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.viewpagerindicator.IconPageIndicator;
+import com.viewpagerindicator.IconPagerAdapter;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
@@ -61,6 +50,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import rx.Observable;
 
 public class SetupActivity extends BaseActivity implements ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
 
@@ -68,6 +58,10 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
     public ApiClient apiClient;
     @Inject
     protected HostConfig hostConfig;
+    @Inject
+    protected UserRepository userRepository;
+    @Inject
+    protected TaskRepository taskRepository;
     @BindView(R.id.view_pager)
     FadingViewPager pager;
     @BindView(R.id.nextButton)
@@ -78,8 +72,9 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
     IconPageIndicator indicator;
     AvatarSetupFragment avatarSetupFragment;
     TaskSetupFragment taskSetupFragment;
+    @Nullable
     HabitRPGUser user;
-    Boolean completedSetup;
+    boolean completedSetup = false;
 
     @Override
     protected int getLayoutResId() {
@@ -89,9 +84,17 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        this.user = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).querySingle();
+        userRepository.getUser(hostConfig.getUser())
+                .flatMap(user -> {
+                    if (user == null) {
+                        return userRepository.retrieveUser(true);
+                    } else {
+                        return Observable.just(user);
+                    }
+                })
+                .subscribe(this::onUserReceived, throwable -> {
 
-        this.completedSetup = false;
+        });
 
         Map<String, Object> additionalData = new HashMap<>();
         additionalData.put("status", "displayed");
@@ -101,7 +104,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
         for (String language : getResources().getStringArray(R.array.LanguageValues)) {
             if (language.equals(currentDeviceLanguage)) {
                 apiClient.registrationLanguage(currentDeviceLanguage)
-                        .subscribe(new MergeUserCallback(this, user), throwable -> {
+                        .subscribe(habitRPGUser -> {}, throwable -> {
                         });
             }
         }
@@ -129,16 +132,6 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
     protected void onStart() {
         super.onStart();
         EventBus.getDefault().register(this);
-
-        if (this.pager.getAdapter() == null) {
-            if (this.user != null) {
-                setupViewpager();
-            } else {
-                this.apiClient.getUser()
-                        .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                        });
-            }
-        }
     }
 
     @Override
@@ -158,8 +151,8 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
 
     @Subscribe
     public void onEvent(UpdateUserCommand event) {
-        this.apiClient.updateUser(event.updateData)
-                .subscribe(new MergeUserCallback(this, user), throwable -> {
+        this.userRepository.updateUser(user, event.updateData)
+                .subscribe(this::onUserReceived, throwable -> {
                 });
     }
 
@@ -180,10 +173,8 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
         if (isLastPage()) {
             List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
             this.completedSetup = true;
-            this.apiClient.createTasks(newTasks)
-                    .subscribe(tasks -> {
-                        onUserReceived(user);
-                    }, throwable -> {
+            this.taskRepository.createTasks(newTasks)
+                    .subscribe(tasks -> onUserReceived(user), throwable -> {
                     });
             //this.apiHelper.apiService.batchOperation(operations, new HabitRPGUserCallback(this));
         }
@@ -244,6 +235,9 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
             if (this.avatarSetupFragment != null) {
                 this.avatarSetupFragment.setUser(user);
             }
+            if (this.taskSetupFragment != null) {
+                this.taskSetupFragment.setUser(user);
+            }
         }
 
         Map<String, Object> additionalData = new HashMap<>();
@@ -266,13 +260,9 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
 
         @Override
         public Fragment getItem(int position) {
-            Fragment fragment = null;
+            Fragment fragment;
 
             switch (position) {
-                case 0: {
-                    fragment = new WelcomeFragment();
-                    break;
-                }
                 case 1: {
                     avatarSetupFragment = new AvatarSetupFragment();
                     avatarSetupFragment.activity = SetupActivity.this;
@@ -287,6 +277,10 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
                     fragment = taskSetupFragment;
                     break;
                 }
+                default: {
+                    fragment = new WelcomeFragment();
+                    break;
+                }
             }
 
             return fragment;
@@ -304,6 +298,6 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
     }
 
     private boolean isLastPage() {
-        return this.pager.getCurrentItem() == this.pager.getAdapter().getCount()-1;
+        return this.pager == null || this.pager.getCurrentItem() == this.pager.getAdapter().getCount() - 1;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
index 405835ff3..49e0c6469 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
index 0ce5604e2..896bef5cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
@@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index 3241fa69e..f7c6b0e59 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -1,33 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
-import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
-import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
-import com.habitrpg.android.habitica.helpers.RemindersManager;
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-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.MarkdownParser;
-import com.habitrpg.android.habitica.ui.helpers.SimpleItemTouchHelperCallback;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import net.pherth.android.emoji_library.EmojiEditText;
-import net.pherth.android.emoji_library.EmojiPopup;
-
-import org.greenrobot.eventbus.EventBus;
-
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -63,6 +35,33 @@ import android.widget.Spinner;
 import android.widget.TableRow;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.events.TaskSaveEvent;
+import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
+import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
+import com.habitrpg.android.habitica.helpers.RemindersManager;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+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.tasks.TaskTag;
+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.MarkdownParser;
+import com.habitrpg.android.habitica.ui.helpers.SimpleItemTouchHelperCallback;
+import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiPopup;
+
+import org.greenrobot.eventbus.EventBus;
+
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -222,7 +221,6 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
     private List<Tag> selectedTags;
 
     private RemindersManager remindersManager;
-    private TaskAlarmManager taskAlarmManager;
     private FirstDayOfTheWeekHelper firstDayOfTheWeekHelper;
     private boolean saveToDb;
 
@@ -261,7 +259,6 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         }
 
         remindersManager = new RemindersManager(taskType);
-        taskAlarmManager = TaskAlarmManager.getInstance(this);
 
         dueDateListener = new DateEditTextListener(dueDatePickerText);
         startDateListener = new DateEditTextListener(startDatePickerText);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
index 21da38078..2a2755afd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
@@ -7,8 +7,8 @@ import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
-import com.magicmicky.habitrpgwrapper.lib.models.Customization;
-import com.magicmicky.habitrpgwrapper.lib.models.CustomizationSet;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.inventory.CustomizationSet;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java
index a22f0fd42..04c5106e3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java
@@ -3,46 +3,73 @@ package com.habitrpg.android.habitica.ui.adapter;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
+import com.habitrpg.android.habitica.models.FAQArticle;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import rx.Observable;
+import rx.subjects.PublishSubject;
 
-public class FAQOverviewRecyclerAdapter extends RecyclerView.Adapter<FAQOverviewRecyclerAdapter.FAQArticleViewHolder> {
+public class FAQOverviewRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private static final int VIEW_TYPE_JUSTIN = 0;
+    private static final int VIEW_TYPE_FAQ = 1;
 
     public MainActivity activity;
     private List<FAQArticle> articles;
 
+    private PublishSubject<Void> resetWalkthroughEvents = PublishSubject.create();
+
     public void setArticles(List<FAQArticle> articles) {
         this.articles = articles;
         this.notifyDataSetChanged();
     }
 
     @Override
-    public FAQArticleViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.plain_list_item, parent, false);
-
-        return new FAQArticleViewHolder(view);
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (viewType == VIEW_TYPE_JUSTIN) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.button_list_item, parent, false);
+            return new ResetWalkthroughViewHolder(view);
+        } else {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.plain_list_item, parent, false);
+            return new FAQArticleViewHolder(view);
+        }
     }
 
     @Override
-    public void onBindViewHolder(FAQArticleViewHolder holder, int position) {
-        holder.bind(this.articles.get(position));
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        if (getItemViewType(position) == VIEW_TYPE_FAQ) {
+            ((FAQArticleViewHolder) holder).bind(this.articles.get(position-1));
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 0) {
+            return VIEW_TYPE_JUSTIN;
+        } else {
+            return VIEW_TYPE_FAQ;
+        }
     }
 
     @Override
     public int getItemCount() {
-        return this.articles == null ? 0 : this.articles.size();
+        return this.articles == null ? 1 : this.articles.size()+1;
+    }
+
+    public Observable<Void> getResetWalkthroughEvents() {
+        return resetWalkthroughEvents.asObservable();
     }
 
     class FAQArticleViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -54,7 +81,7 @@ public class FAQOverviewRecyclerAdapter extends RecyclerView.Adapter<FAQOverview
 
         Context context;
 
-        public FAQArticleViewHolder(View itemView) {
+        FAQArticleViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
 
@@ -75,4 +102,14 @@ public class FAQOverviewRecyclerAdapter extends RecyclerView.Adapter<FAQOverview
             activity.displayFragment(fragment);
         }
     }
+
+    private class ResetWalkthroughViewHolder extends RecyclerView.ViewHolder {
+
+        ResetWalkthroughViewHolder(View itemView) {
+            super(itemView);
+            Button button = (Button)itemView;
+            button.setText(itemView.getContext().getString(R.string.reset_walkthrough));
+            button.setOnClickListener(v -> resetWalkthroughEvents.onNext(null));
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/IReceiveNewEntries.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/IReceiveNewEntries.java
index 5e229d828..f60e32455 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/IReceiveNewEntries.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/IReceiveNewEntries.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.adapter;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
index fede5c856..a56bbf32f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.adapter;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding;
 import com.habitrpg.android.habitica.ui.activities.TaskClickActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.OrderBy;
 import com.raizlabs.android.dbflow.sql.language.Select;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
index 61cc403aa..170ee6b9d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
@@ -4,7 +4,7 @@ import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
+import com.habitrpg.android.habitica.models.Skill;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
index 6924848a9..fa98c225d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.adapter.inventory;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.EquipCommand;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
index aef2973db..96a07fa07 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
@@ -11,13 +11,13 @@ import com.habitrpg.android.habitica.events.commands.SellItemCommand;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Item;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.SpecialItem;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.inventory.SpecialItem;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
index 349777d7f..29f563c24 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.events.commands.EquipCommand;
 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.magicmicky.habitrpgwrapper.lib.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Mount;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -87,7 +87,7 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetail
             itemView.setOnClickListener(this);
         }
 
-        public Boolean isOwned() {
+        Boolean isOwned() {
             if (ownedMapping != null && animal != null) {
                 if (ownedMapping.containsKey(animal.getKey()) && ownedMapping.get(animal.getKey())) {
                     return true;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
index 1c0a56dde..50e14b3fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
@@ -7,7 +7,7 @@ import com.habitrpg.android.habitica.events.commands.FeedCommand;
 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.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.Pet;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
index e96b7e884..b047b024c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
@@ -6,9 +6,9 @@ import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
 import com.habitrpg.android.habitica.ui.ItemDetailDialog;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.Shop;
-import com.magicmicky.habitrpgwrapper.lib.models.ShopCategory;
-import com.magicmicky.habitrpgwrapper.lib.models.ShopItem;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.shops.ShopCategory;
+import com.habitrpg.android.habitica.models.shops.ShopItem;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
index 6d11b9b01..35920de17 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
@@ -7,7 +7,7 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRe
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Animal;
+import com.habitrpg.android.habitica.models.inventory.Animal;
 
 import android.content.res.Resources;
 import android.support.v7.widget.CardView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
index 057ce0c28..96e70050d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
@@ -1,16 +1,11 @@
 package com.habitrpg.android.habitica.ui.adapter.setup;
 
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.facebook.imagepipeline.request.ImageRequest;
-import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.EquipCommand;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.Customization;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
-import com.magicmicky.habitrpgwrapper.lib.models.SetupCustomization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.models.SetupCustomization;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -18,16 +13,13 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -67,6 +59,9 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
     }
 
     private boolean isCustomizationActive(SetupCustomization customization) {
+        if (this.user == null) {
+            return false;
+        }
         Preferences prefs = this.user.getPreferences();
         switch (customization.category) {
             case "body": {
@@ -99,7 +94,7 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
             case "extras": {
                 switch (customization.subcategory) {
                     case "glasses":
-                        return customization.key.equals(this.user.getItems().getGear().getEquipped().getEyeWear()) || (this.user.getItems().getGear().getEquipped().getEyeWear() == null && customization.key.length() == 0);
+                        return customization.key.equals(this.user.getItems().getGear().getEquipped().getEyeWear()) || ("eyewear_base_0".equals(this.user.getItems().getGear().getEquipped().getEyeWear()) && customization.key.length() == 0);
                     case "flower":
                         return Integer.parseInt(customization.key) == prefs.getHair().getFlower();
                     case "wheelchair":
@@ -110,14 +105,6 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
         return false;
     }
 
-    private String getHairColor() {
-        if (this.user != null) {
-            return this.user.getPreferences().getHair().getColor();
-        } else {
-            return "";
-        }
-    }
-
     class CustomizationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
         @BindView(R.id.imageView)
@@ -154,7 +141,7 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
                 imageView.setImageDrawable(null);
             }
             textView.setText(customization.text);
-            if ("flowers".equals(customization.subcategory)) {
+            if (!"0".equals(customization.key) && "flower".equals(customization.subcategory)) {
                 if (isCustomizationActive(customization)) {
                     imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg_selected);
                 } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java
index 486d4c3c8..f97980460 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java
@@ -1,20 +1,18 @@
 package com.habitrpg.android.habitica.ui.adapter.setup;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.support.graphics.drawable.VectorDrawableCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -73,8 +71,10 @@ public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.Task
 
             itemView.setOnClickListener(this);
 
-            icon = ContextCompat.getDrawable(context, R.drawable.ic_check_white_18dp);
-            icon.setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY);
+            icon = VectorDrawableCompat.create(context.getResources(), R.drawable.ic_check_white_18dp, null);
+            if (icon != null) {
+                icon.setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY);
+            }
         }
 
         public void bind(String[] taskGroup, Boolean isChecked) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
index 0356a14d4..22f886220 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.Achievement;
+import com.habitrpg.android.habitica.models.Achievement;
 
 import android.content.res.Resources;
 import android.support.v7.app.AlertDialog;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
index 068c09c7a..e517f61bf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
@@ -5,8 +5,8 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import net.pherth.android.emoji_library.EmojiParser;
 import net.pherth.android.emoji_library.EmojiTextView;
@@ -55,16 +55,15 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
     }
 
     public void setFilterByGroups(ChallengeFilterOptions filterOptions){
-        this.challenges = $.filter(challengesSource, arg ->
-        {
+        this.challenges = $.filter(challengesSource, arg -> {
             boolean showChallenge = $.find(filterOptions.showByGroups, g -> g.id.contains(arg.groupId)).isPresent();
 
             boolean showByOwnership = true;
             if(filterOptions.showOwned == filterOptions.notOwned && this.user != null){
                 if (filterOptions.showOwned) {
-                    showByOwnership = Objects.equals(arg.leaderId, this.user.getId());
+                    showByOwnership = arg.leaderId.equals(this.user.getId());
                 } else {
-                    showByOwnership = !Objects.equals(arg.leaderId, this.user.getId());
+                    showByOwnership = !arg.leaderId.equals(this.user.getId());
                 }
             }
 
@@ -164,11 +163,11 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
         }
 
         public static String getLabelByTypeAndCount(Context context, String type, int count) {
-            if (Objects.equals(type, Challenge.TASK_ORDER_DAILYS)) {
+            if (Challenge.TASK_ORDER_DAILYS.equals(type)) {
                 return context.getString(count == 1 ? R.string.daily : R.string.dailies);
-            } else if (Objects.equals(type, Challenge.TASK_ORDER_HABITS)) {
+            } else if (Challenge.TASK_ORDER_HABITS.equals(type)) {
                 return context.getString(count == 1 ? R.string.habit : R.string.habits);
-            } else if (Objects.equals(type, Challenge.TASK_ORDER_REWARDS)) {
+            } else if (Challenge.TASK_ORDER_REWARDS.equals(type)) {
                 return context.getString(count == 1 ? R.string.reward : R.string.rewards);
             } else {
                 return context.getString(count == 1 ? R.string.todo : R.string.todos);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
index bccc4919c..49959771a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
@@ -15,8 +15,8 @@ import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.habitrpg.android.habitica.ui.helpers.EmojiKeyboard;
 import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import net.pherth.android.emoji_library.EmojiEditText;
 import net.pherth.android.emoji_library.EmojiTextView;
@@ -24,7 +24,10 @@ import net.pherth.android.emoji_library.EmojiTextView;
 import org.greenrobot.eventbus.EventBus;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Resources;
+import android.graphics.Paint;
+import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
@@ -181,6 +184,10 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
         @BindView(R.id.tvLikes)
         @Nullable
         TextView tvLikes;
+        @BindView(R.id.community_guidelines_view)
+        @Nullable
+        TextView communityGuidelinesView;
+
         Context context;
         Resources res;
         int likeCount = 0;
@@ -241,6 +248,15 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
                     }
                 }
             }
+
+            if (communityGuidelinesView != null) {
+                communityGuidelinesView.setPaintFlags(communityGuidelinesView.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+                communityGuidelinesView.setOnClickListener(v -> {
+                    Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(Uri.parse("https://habitica.com/static/community-guidelines"));
+                    context.startActivity(i);
+                });
+            }
         }
 
         public void bind(final ChatMessage msg) {
@@ -316,8 +332,8 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
                 tvLikes.setText("+" + likeCount);
             }
 
-            int backgroundColorRes = 0;
-            int foregroundColorRes = 0;
+            int backgroundColorRes;
+            int foregroundColorRes;
 
             if (likeCount != 0) {
                 if (currentUserLikedPost) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
index 1570624de..c56a5adbb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
@@ -7,7 +7,7 @@ import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java
index 7b2c592d1..761bb8c43 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.ui.adapter.social;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
+import com.habitrpg.android.habitica.models.social.Group;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
index 66bcdd1db..c1e626767 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
@@ -2,8 +2,8 @@ package com.habitrpg.android.habitica.ui.adapter.social;
 
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.QuestProgress;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.inventory.QuestProgress;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
 
 import android.net.Uri;
 import android.support.v7.widget.RecyclerView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java
index d879c0c9e..cfeabd044 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java
@@ -9,9 +9,8 @@ import android.widget.TextView;
 
 import com.github.underscore.$;
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
+import com.habitrpg.android.habitica.models.social.Group;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java
index e7f239bfb..dc3a05ba3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java
@@ -1,16 +1,5 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import android.content.Context;
 import android.databinding.ObservableArrayList;
 import android.support.annotation.Nullable;
@@ -19,6 +8,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,6 +31,8 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
     public String taskType;
     @Inject
     protected CrashlyticsProxy crashlyticsProxy;
+    @Inject
+    protected TaskRepository taskRepository;
     protected List<Task> content;
     protected List<Task> filteredContent;
     private int layoutResource;
@@ -118,33 +117,16 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
 
     public void loadContent(boolean forced) {
         if (this.content == null || forced) {
-            List<Task> tasks = new ArrayList<>();
-            Observable.defer(() -> Observable.just(new Select().from(Task.class)
-                    .where(Condition.column("type").eq(this.taskType))
-                    .and(Condition.CombinedCondition
-                            .begin(Condition.column("completed").eq(false))
-                            .or(Condition.column("type").eq("daily"))
-                    )
-                    .and(Condition.column("user_id").eq(this.userID))
-                    .orderBy(OrderBy.columns("position", "dateCreated").descending())
-                    .queryList()))
+            taskRepository.getTasks(this.taskType, this.userID)
                     .flatMap(Observable::from)
                     .map(task -> {
-                        try {
-                            task.parsedText = MarkdownParser.parseMarkdown(task.getText());
-                        } catch (NullPointerException e) {
-                            task.parsedText = task.getText();
-                        }
-                        try {
-                            task.parsedNotes = MarkdownParser.parseMarkdown(task.getNotes());
-                        } catch (NullPointerException e) {
-                            task.parsedNotes = task.getNotes();
-                        }
+                        task.parseMarkdown();
                         return task;
                     })
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(tasks::add, crashlyticsProxy::logException, () -> setTasks(tasks));
+                    .toList()
+                    .subscribe(this::setTasks, crashlyticsProxy::logException);
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
index 19f2a92d6..35b5681c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.adapter.tasks;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 
 import net.pherth.android.emoji_library.EmojiEditText;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
index 8de05c4f5..3de2e6358 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.helpers.RemindersManager;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 
 import android.graphics.Color;
 import android.support.annotation.Nullable;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java
index 18f3012e7..f2e135d53 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java
@@ -7,10 +7,10 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
@@ -43,7 +43,6 @@ public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter<Rew
     private void loadEquipmentRewards() {
         if (apiClient != null) {
             apiClient.getInventoryBuyableGear()
-
                     .flatMap(items -> {
                         // get itemdata list
                         ArrayList<String> itemKeys = new ArrayList<>();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/SortableTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/SortableTasksRecyclerViewAdapter.java
index 3cb18cbd7..efb6f5123 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/SortableTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/SortableTasksRecyclerViewAdapter.java
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperDropCallback;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
@@ -27,6 +27,9 @@ public abstract class SortableTasksRecyclerViewAdapter<VH extends BaseTaskViewHo
 
     @Override
     public void onItemMove(int fromPosition, int toPosition) {
+        if (filteredContent.size() <= fromPosition || filteredContent.size() <= toPosition) {
+            return;
+        }
         Collections.swap(filteredContent, fromPosition, toPosition);
         notifyItemMoved(fromPosition, toPosition);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
index f310ca61f..d91d325e3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
@@ -107,7 +107,7 @@ public class AboutFragment extends Fragment {
         String bodyOfEmail = "Device: " + device +
                 " \nAndroid Version: " + version +
                 " \nAppVersion: " + getString(R.string.version_info, versionName, versionCode) +
-                " \nUser ID: " + userId +
+                " \nHabitRPGUser ID: " + userId +
                 " \nDetails: ";
 
         Intent emailIntent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
index 4f3c3a59b..31dd4db65 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
-import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
+import com.habitrpg.android.habitica.models.TutorialStep;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -23,8 +23,8 @@ import com.squareup.leakcanary.RefWatcher;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBusException;
 
-import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import butterknife.ButterKnife;
@@ -35,13 +35,19 @@ public abstract class BaseFragment extends DialogFragment {
     public String tutorialStepIdentifier;
     public String tutorialText;
     public Unbinder unbinder;
+    protected boolean tutorialCanBeDeferred = true;
     private TransactionListener<TutorialStep> tutorialStepTransactionListener = new TransactionListener<TutorialStep>() {
         @Override
         public void onResultReceived(TutorialStep step) {
-            if (step != null && !step.getWasCompleted() && (step.getDisplayedOn() == null || (new Date().getTime() - step.getDisplayedOn().getTime()) > 86400000)) {
+            if (step != null && step.shouldDisplay()) {
                 DisplayTutorialEvent event = new DisplayTutorialEvent();
                 event.step = step;
-                event.tutorialText = tutorialText;
+                if (tutorialText != null) {
+                    event.tutorialText = tutorialText;
+                } else {
+                    event.tutorialTexts = tutorialTexts;
+                }
+                event.canBeDeferred = tutorialCanBeDeferred;
                 EventBus.getDefault().post(event);
             }
         }
@@ -56,6 +62,7 @@ public abstract class BaseFragment extends DialogFragment {
             return true;
         }
     };
+    public List<String> tutorialTexts;
 
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
index f0a999e90..91581e4d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
@@ -2,8 +2,8 @@ package com.habitrpg.android.habitica.ui.fragments;
 
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 import com.roughike.bottombar.BottomBar;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
index 3d89b1767..dac10da15 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
@@ -19,9 +19,9 @@ import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.solovyev.android.checkout.ActivityCheckout;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java
index f7491642b..ca9b94b3a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
+import com.habitrpg.android.habitica.models.FAQArticle;
 
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
index 2c4a466f9..391fc8a7c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
@@ -2,10 +2,11 @@ package com.habitrpg.android.habitica.ui.fragments.faq;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.ui.adapter.FAQOverviewRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
+import com.habitrpg.android.habitica.models.FAQArticle;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import android.os.Bundle;
@@ -17,10 +18,15 @@ import android.view.ViewGroup;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class FAQOverviewFragment extends BaseMainFragment {
+    @Inject
+    UserRepository userRepository;
+
     @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
 
@@ -34,6 +40,7 @@ public class FAQOverviewFragment extends BaseMainFragment {
 
         unbinder = ButterKnife.bind(this, view);
         adapter = new FAQOverviewRecyclerAdapter();
+        adapter.getResetWalkthroughEvents().subscribe(aVoid -> this.userRepository.resetTutorial(user), throwable -> {});
         adapter.activity = activity;
         recyclerView.setLayoutManager(new LinearLayoutManager(activity));
         recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index ac2e30a63..ba56075f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -5,9 +5,9 @@ import com.habitrpg.android.habitica.components.AppComponent;
 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.magicmicky.habitrpgwrapper.lib.models.Customization;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.OrderBy;
 import com.raizlabs.android.dbflow.sql.language.Select;
@@ -93,6 +93,8 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
                 .and(Condition.CombinedCondition.begin(Condition.column("purchased").eq(true))
                         .or(Condition.column("price").eq(0))
                         .or(Condition.column("price").isNull())
+                        .or(Condition.column("isBuyable").eq(true))
+                        .or(Condition.column("isBuyable").isNull())
                         .or(Condition.CombinedCondition.begin(
                                 Condition.CombinedCondition.begin(Condition.column("availableUntil").isNull())
                                         .or(Condition.column("availableUntil").greaterThanOrEq(new Date().getTime())))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java
index 8f9a1b4ba..631e23091 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
@@ -117,7 +117,7 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
     @Override
     public void updateUserData(HabitRPGUser user) {
         super.updateUserData(user);
-        if (user != null) {
+        if (user != null && viewBinding != null) {
             viewBinding.setPreferences(user.getPreferences());
             this.setSize(user.getPreferences().getSize());
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
index c75e60120..ced7840db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
index f43cf9aff..c414ba8d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.databinding.FragmentEquipmentOverviewBinding;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
index 766ed3a93..345b7c9c6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
@@ -12,15 +12,15 @@ import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
 import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Item;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.SpecialItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.inventory.SpecialItem;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -72,6 +72,7 @@ public class ItemRecyclerFragment extends BaseFragment {
     public Item hatchingItem;
     public Pet feedingPet;
     public HashMap<String, Integer> ownedPets;
+    @Nullable
     public HabitRPGUser user;
     LinearLayoutManager layoutManager = null;
 
@@ -156,7 +157,7 @@ public class ItemRecyclerFragment extends BaseFragment {
 
     @Override
     public void onResume() {
-        if (this.isHatching != null && this.isHatching) {
+        if (this.isHatching != null && this.isHatching && getDialog().getWindow() != null) {
             ViewGroup.LayoutParams params = getDialog().getWindow().getAttributes();
             params.width = ViewGroup.LayoutParams.MATCH_PARENT;
             params.height = ViewGroup.LayoutParams.MATCH_PARENT;
@@ -202,7 +203,7 @@ public class ItemRecyclerFragment extends BaseFragment {
         }
 
         if (this.itemType.equals("special")) {
-            if (user.getPurchased() != null && user.getPurchased().getPlan().isActive()) {
+            if (user != null && user.getPurchased() != null && user.getPurchased().getPlan().isActive()) {
                 Item mysterItem = SpecialItem.makeMysteryItem(getContext());
                 mysterItem.setOwned(user.getPurchased().getPlan().mysteryItems.size());
                 items.add(mysterItem);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
index 9fe33024e..38a3af4b3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.shops;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.UpdateGoldGemsPurchasedevent;
@@ -8,10 +8,10 @@ import com.habitrpg.android.habitica.ui.adapter.inventory.ShopRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Shop;
-import com.magicmicky.habitrpgwrapper.lib.models.ShopCategory;
-import com.magicmicky.habitrpgwrapper.lib.models.ShopItem;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.shops.ShopCategory;
+import com.habitrpg.android.habitica.models.shops.ShopItem;
 
 import org.greenrobot.eventbus.Subscribe;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java
index ab1e0f370..9c0d4c87c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.shops;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.Shop;
+import com.habitrpg.android.habitica.models.shops.Shop;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
index 4c63cdf6f..3f7702e52 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
index f2c8dbcc0..694d1d942 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
@@ -7,8 +7,8 @@ import com.habitrpg.android.habitica.ui.adapter.inventory.PetDetailRecyclerAdapt
 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.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index 157e1cdf4..f07caa0d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -9,10 +9,10 @@ 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.RecyclerViewEmptySupport;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Animal;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Mount;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.inventory.Animal;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.raizlabs.android.dbflow.sql.language.Select;
 import com.raizlabs.android.dbflow.sql.language.Where;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index 670d1b6c9..4f35979be 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
 import com.habitrpg.android.habitica.helpers.QrCodeManager;
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -31,8 +31,8 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
     private HabitRPGUser user;
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
         @Override
-        public void onResultReceived(HabitRPGUser habitRPGUser) {
-            AccountDetailsFragment.this.setUser(habitRPGUser);
+        public void onResultReceived(HabitRPGUser user) {
+            AccountDetailsFragment.this.setUser(user);
         }
 
         @Override
@@ -41,7 +41,7 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
         }
 
         @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
             return true;
         }
     };
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index 733fd88c1..cde3a63e3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -1,9 +1,11 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.helpers.SoundManager;
@@ -12,8 +14,8 @@ import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManag
 import com.habitrpg.android.habitica.prefs.TimePreference;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -44,18 +46,20 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     public ApiClient apiClient;
     @Inject
     public SoundManager soundManager;
-    public MainActivity activity;
+    @Inject
+    UserRepository userRepository;
     private Context context;
     private TimePreference timePreference;
     private PreferenceScreen pushNotificationsPreference;
     private Preference classSelectionPreference;
     private HabitRPGUser user;
-    private PushNotificationManager pushNotificationManager;
+    @Inject
+    PushNotificationManager pushNotificationManager;
 
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
         @Override
-        public void onResultReceived(HabitRPGUser habitRPGUser) {
-            PreferencesFragment.this.setUser(habitRPGUser);
+        public void onResultReceived(HabitRPGUser user) {
+            PreferencesFragment.this.setUser(user);
         }
 
         @Override
@@ -64,7 +68,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
         }
 
         @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
             return true;
         }
     };
@@ -73,15 +77,13 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ((HabiticaApplication) getActivity().getApplication()).getComponent().inject(this);
+        HabiticaBaseApplication.getComponent().inject(this);
         context = getActivity();
 
         String userID = getPreferenceManager().getSharedPreferences().getString(context.getString(R.string.SP_userID), null);
         if (userID != null) {
             new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).async().querySingle(userTransactionListener);
         }
-
-        pushNotificationManager = PushNotificationManager.getInstance(this.getActivity());
     }
 
     @Override
@@ -152,6 +154,8 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                 startActivityForResult(intent, MainActivity.SELECT_CLASS_RESULT);
             }
             return true;
+        } else if (preference.getKey().equals("reload_content")) {
+            apiClient.getContent().subscribe(contentResult -> {}, throwable -> {});
         }
         return super.onPreferenceTreeClick(preference);
     }
@@ -200,13 +204,8 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             }
             getActivity().getResources().updateConfiguration(configuration,
                     getActivity().getResources().getDisplayMetrics());
-
-            Map<String, Object> updateData = new HashMap<>();
-            updateData.put("preferences.language", languageHelper.getLanguageCode());
-            apiClient.updateUser(updateData)
-
-                    .subscribe(new MergeUserCallback(activity, user), throwable -> {
-                    });
+            userRepository.updateUser(user, "preferences.language", languageHelper.getLanguageCode())
+                    .subscribe(habitRPGUser -> {}, throwable -> {});
 
             Preferences preferences = user.getPreferences();
             preferences.setLanguage(languageHelper.getLanguageCode());
@@ -229,12 +228,8 @@ public class PreferencesFragment extends BasePreferencesFragment implements
 
         } else if (key.equals("audioTheme")) {
             String newAudioTheme = sharedPreferences.getString(key, "off");
-
-            Map<String, Object> updateData = new HashMap<>();
-            updateData.put("preferences.sound", newAudioTheme);
-            MergeUserCallback mergeUserCallback = new MergeUserCallback(activity, user);
-            apiClient.updateUser(updateData)
-                    .subscribe(mergeUserCallback, throwable -> {
+            userRepository.updateUser(user, "preferences.sound", newAudioTheme)
+                    .subscribe(habitRPGUser -> {}, throwable -> {
                     });
 
             Preferences preferences = user.getPreferences();
@@ -243,6 +238,9 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             soundManager.setSoundTheme(newAudioTheme);
 
             soundManager.preloadAllFiles();
+        } else if (key.equals("dailyDueDefaultView")) {
+            userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
+                    .subscribe(habitRPGUser -> {}, throwable -> {});
         }
     }
 
@@ -286,6 +284,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
         if (user != null && user.getPreferences() != null) {
             TimePreference cdsTimePreference = (TimePreference) findPreference("cds_time");
             cdsTimePreference.setText(user.getPreferences().getDayStart() + ":00");
+            findPreference("dailyDueDefaultView").setDefaultValue(user.getPreferences().getDailyDueDefaultView());
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
index 881ab60b0..cbb83d5cb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
@@ -1,17 +1,18 @@
 package com.habitrpg.android.habitica.ui.fragments.setup;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.SpeechBubbleView;
 import com.habitrpg.android.habitica.ui.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.SetupCustomization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.SetupCustomization;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -63,6 +64,8 @@ public class AvatarSetupFragment extends BaseFragment {
     AvatarCategoryView extrasButton;
     @BindView(R.id.caret_view)
     ImageView caretView;
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
 
     CustomizationSetupAdapter adapter;
     LinearLayoutManager layoutManager;
@@ -131,6 +134,14 @@ public class AvatarSetupFragment extends BaseFragment {
         return view;
     }
 
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser && getContext() != null) {
+            speechBubbleView.animateText(getContext().getString(R.string.avatar_setup_description));
+        }
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
@@ -144,7 +155,7 @@ public class AvatarSetupFragment extends BaseFragment {
         this.adapter.setCustomizationList(customizationRepository.getCustomizations(activeCategory, activeSubCategory, user));
     }
 
-    public void setUser(HabitRPGUser user) {
+    public void setUser(@Nullable HabitRPGUser user) {
         this.user = user;
         if (avatarView != null) {
             updateAvatar();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java
index c030378fb..89ac4b104 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java
@@ -11,12 +11,13 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.SpeechBubbleView;
 import com.habitrpg.android.habitica.ui.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.Days;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -35,6 +36,8 @@ public class TaskSetupFragment extends BaseFragment {
     RecyclerView recyclerView;
     @BindView(R.id.avatarView)
     AvatarView avatarView;
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
     TaskSetupAdapter adapter;
     private String[][] taskGroups;
     private Object[][] tasks;
@@ -62,7 +65,15 @@ public class TaskSetupFragment extends BaseFragment {
         return view;
     }
 
-    public void setUser(HabitRPGUser user) {
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser && getContext() != null) {
+            speechBubbleView.animateText(getContext().getString(R.string.task_setup_description));
+        }
+    }
+
+    public void setUser(@Nullable HabitRPGUser user) {
         this.user = user;
         if (avatarView != null) {
             updateAvatar();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
index 1c6f44d1e..e191769a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
@@ -2,18 +2,25 @@ package com.habitrpg.android.habitica.ui.fragments.setup;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.ui.SpeechBubbleView;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 
+import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class WelcomeFragment extends BaseFragment {
 
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -22,6 +29,8 @@ public class WelcomeFragment extends BaseFragment {
 
         unbinder = ButterKnife.bind(this, v);
 
+        speechBubbleView.animateText(getContext().getString(R.string.welcome_text));
+
         return v;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
index 649b60ed4..5b24344ab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
@@ -11,11 +11,11 @@ import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
 import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
-import com.magicmicky.habitrpgwrapper.lib.models.SpecialItems;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.user.SpecialItems;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
@@ -37,15 +37,13 @@ import java.util.List;
 import butterknife.BindView;
 import rx.Observable;
 
-import static com.habitrpg.android.habitica.helpers.MathHelper.round;
-
 public class SkillsFragment extends BaseMainFragment {
 
     private final int TASK_SELECTION_ACTIVITY = 10;
     private final int MEMBER_SELECTION_ACTIVITY = 11;
 
     @BindView(R.id.recyclerView)
-    RecyclerView mRecyclerView;
+    RecyclerView recyclerView;
     SkillsRecyclerViewAdapter adapter;
     private View view;
     private Skill selectedSkill;
@@ -80,8 +78,10 @@ public class SkillsFragment extends BaseMainFragment {
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
-        mRecyclerView.setAdapter(adapter);
+        recyclerView.invalidateItemDecorations();
+        recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+        recyclerView.setLayoutManager(new LinearLayoutManager(activity));
+        recyclerView.setAdapter(adapter);
     }
 
     private void checkUserLoadSkills() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
index 83888b56f..2f53778e5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.social;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
@@ -16,8 +15,8 @@ import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index c5b82b7d0..a323a3fc2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -22,10 +22,10 @@ import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.helpers.QrCodeManager;
 import com.habitrpg.android.habitica.ui.adapter.social.QuestCollectRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
 
 import javax.inject.Inject;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
index d5c1b284a..d62538108 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
+import com.habitrpg.android.habitica.models.social.Group;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java
index 01991928c..e51636fd4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
+import com.habitrpg.android.habitica.models.social.Group;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
index 99776caaa..a467668e2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
@@ -7,8 +7,8 @@ import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java
index d72636b1f..a680cda1f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.social;
 
-import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
@@ -8,8 +7,8 @@ import com.habitrpg.android.habitica.events.commands.SendNewInboxMessageCommand;
 import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import org.greenrobot.eventbus.Subscribe;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java
index 032e795a7..c20c54b55 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewA
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
+import com.habitrpg.android.habitica.models.social.Group;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -43,7 +43,7 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         if (view == null) {
-            view = inflater.inflate(R.layout.fragment_guild_recyclerview, container, false);
+            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
 
             unbinder = ButterKnife.bind(this, view);
             recyclerView.setLayoutManager(new LinearLayoutManager(this.activity));
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
index c351a77fa..e2a29df19 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.ContentCache;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
+import com.habitrpg.android.habitica.models.social.Group;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
index e9a2cf76c..5e3a76dcd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
@@ -16,11 +16,11 @@ import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
 import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
 import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.LeaveChallengeBody;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import net.pherth.android.emoji_library.EmojiParser;
 import net.pherth.android.emoji_library.EmojiTextView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.java
index 0ffeaaeb4..c1e51786d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.java
@@ -2,8 +2,8 @@ package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengesFilterRecyclerViewAdapter;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.Group;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.java
index 3427d3ff9..3518fb0da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
+import com.habitrpg.android.habitica.models.social.Group;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
index 4db1af389..fe831a326 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.ui.activities.CreateChallengeActivity;
 import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
 import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
+import com.habitrpg.android.habitica.models.social.Challenge;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 import com.raizlabs.android.dbflow.sql.language.Where;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
index 116050a67..b9034b656 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
 
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter;
@@ -14,8 +14,8 @@ import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.content.Context;
 import android.databinding.ObservableList;
@@ -92,7 +92,7 @@ public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
 
         challengeTasksRecyclerViewAdapter.setDailyResetOffset(user.getPreferences().getDayStart());
 
-        if (tasksOnInitialize.size() != 0 && recyclerAdapter != null && recyclerAdapter.getItemCount() == 0) {
+        if (tasksOnInitialize != null && tasksOnInitialize.size() != 0 && recyclerAdapter != null && recyclerAdapter.getItemCount() == 0) {
             recyclerAdapter.setTasks(tasksOnInitialize);
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
index d60b09c5f..7a1b3747e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
@@ -1,13 +1,12 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
-import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
 import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
+import com.habitrpg.android.habitica.models.social.Challenge;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
index 26e60e8fc..c7307dce5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
@@ -8,8 +8,8 @@ import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
-import com.magicmicky.habitrpgwrapper.lib.models.UserParty;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.social.UserParty;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
index cdbd62b28..78c0457a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
index b89bee8ff..bd997a18c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
@@ -1,20 +1,10 @@
 package com.habitrpg.android.habitica.ui.fragments.tasks;
 
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.TaskCreatedEvent;
 import com.habitrpg.android.habitica.events.TaskRemovedEvent;
 import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
@@ -32,13 +22,31 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperDropCallback;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -61,28 +69,75 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     ApiClient apiClient;
     @Inject
     TaskFilterHelper taskFilterHelper;
-    LinearLayoutManager layoutManager = null;
+    @Inject
+    UserRepository userRepository;
 
+    LinearLayoutManager layoutManager = null;
 
     @BindView(R.id.refresh_layout)
     SwipeRefreshLayout swipeRefreshLayout;
     @BindView(R.id.recyclerView)
-    public RecyclerView recyclerView;
+    public RecyclerViewEmptySupport recyclerView;
 
+    @BindView(R.id.empty_view)
+    ViewGroup emptyView;
+    @BindView(R.id.empty_view_title)
+    TextView emptyViewTitle;
+    @BindView(R.id.empty_view_description)
+    TextView emptyViewDescription;
+
+    @Nullable
     String classType;
+    @Nullable
     private HabitRPGUser user;
     private View view;
     @Nullable
     private SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback;
     private ItemTouchHelper.Callback mItemTouchCallback;
 
-    public static TaskRecyclerViewFragment newInstance(@Nullable HabitRPGUser user, String classType,
+    public static TaskRecyclerViewFragment newInstance(Context context, @Nullable HabitRPGUser user, String classType,
                                                        @Nullable SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback) {
         TaskRecyclerViewFragment fragment = new TaskRecyclerViewFragment();
         fragment.setRetainInstance(true);
         fragment.user = user;
         fragment.classType = classType;
         fragment.sortCallback = sortCallback;
+        List<String> tutorialTexts = null;
+        switch (fragment.classType) {
+            case Task.TYPE_HABIT: {
+                fragment.tutorialStepIdentifier = "habits";
+                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_overview),
+                        context.getString(R.string.tutorial_habits_1),
+                        context.getString(R.string.tutorial_habits_2),
+                        context.getString(R.string.tutorial_habits_3),
+                        context.getString(R.string.tutorial_habits_4));
+                break;
+            }
+            case Task.FREQUENCY_DAILY: {
+                fragment.tutorialStepIdentifier = "dailies";
+                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_dailies_1),
+                        context.getString(R.string.tutorial_dailies_2));
+                break;
+            }
+            case Task.TYPE_TODO: {
+                fragment.tutorialStepIdentifier = "todos";
+                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_todos_1),
+                        context.getString(R.string.tutorial_todos_2));
+                break;
+            }
+            case Task.TYPE_REWARD: {
+                fragment.tutorialStepIdentifier = "rewards";
+                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_rewards_1),
+                        context.getString(R.string.tutorial_rewards_2));
+                break;
+            }
+        }
+
+        if (tutorialTexts != null) {
+            fragment.tutorialTexts = new ArrayList<>(tutorialTexts);
+        }
+        fragment.tutorialCanBeDeferred = false;
+
         return fragment;
     }
 
@@ -127,8 +182,8 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        if (classType.equals(Task.TYPE_DAILY)) {
-            if (user.getPreferences().getDailyDueDefaultView()) {
+        if (Task.TYPE_DAILY.equals(classType)) {
+            if (user != null && user.getPreferences().getDailyDueDefaultView()) {
                 taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE);
             }
         }
@@ -142,11 +197,12 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
                 if (viewHolder != null) {
                     viewHolder.itemView.setBackgroundColor(Color.LTGRAY);
                 }
-                swipeRefreshLayout.setEnabled(false);
+                if (swipeRefreshLayout != null) {
+                    swipeRefreshLayout.setEnabled(false);
+                }
             }
 
             public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
-                swipeRefreshLayout.setEnabled(true);
                 if (mFromPosition == null) mFromPosition = viewHolder.getAdapterPosition();
                 ((ItemTouchHelperAdapter) recyclerAdapter).onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
                 return true;
@@ -166,7 +222,10 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
             @Override
             public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
                 super.clearView(recyclerView, viewHolder);
-
+                if (swipeRefreshLayout != null) {
+                    swipeRefreshLayout.setEnabled(true);
+                }
+                
                 viewHolder.itemView.setBackgroundColor(Color.WHITE);
                 if (mFromPosition != null) {
                     ((ItemTouchHelperDropCallback) recyclerAdapter).onDrop(mFromPosition, viewHolder.getAdapterPosition());
@@ -196,35 +255,46 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
             recyclerView.setPadding(0, 0, 0, bottomPadding);
 
             swipeRefreshLayout.setOnRefreshListener(this);
+
+            recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+                @Override
+                public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                    super.onScrollStateChanged(recyclerView, newState);
+                    if (newState == RecyclerView.SCROLL_STATE_IDLE && swipeRefreshLayout != null) {
+                        swipeRefreshLayout.setEnabled(((MainActivity)getActivity()).isAppBarExpanded());
+                    }
+                }
+            });
+
+            if (this.classType != null) {
+                switch (this.classType) {
+                    case Task.TYPE_HABIT: {
+                        this.emptyViewTitle.setText(R.string.empty_title_habits);
+                        this.emptyViewDescription.setText(R.string.empty_description_habits);
+                        break;
+                    }
+                    case Task.FREQUENCY_DAILY: {
+                        this.emptyViewTitle.setText(R.string.empty_title_dailies);
+                        this.emptyViewDescription.setText(R.string.empty_description_dailies);
+                        break;
+                    }
+                    case Task.TYPE_TODO: {
+                        this.emptyViewTitle.setText(R.string.empty_title_todos);
+                        this.emptyViewDescription.setText(R.string.empty_description_todos);
+                        break;
+                    }
+                    case Task.TYPE_REWARD: {
+                        this.emptyViewTitle.setText(R.string.empty_title_rewards);
+                        break;
+                    }
+                }
+            }
         }
 
         if (savedInstanceState != null) {
             this.classType = savedInstanceState.getString(CLASS_TYPE_KEY, "");
         }
 
-        switch (this.classType) {
-            case Task.TYPE_HABIT: {
-                this.tutorialStepIdentifier = "habits";
-                this.tutorialText = getString(R.string.tutorial_habits);
-                break;
-            }
-            case Task.FREQUENCY_DAILY: {
-                this.tutorialStepIdentifier = "dailies";
-                this.tutorialText = getString(R.string.tutorial_dailies);
-                break;
-            }
-            case Task.TYPE_TODO: {
-                this.tutorialStepIdentifier = "todos";
-                this.tutorialText = getString(R.string.tutorial_todos);
-                break;
-            }
-            case Task.TYPE_REWARD: {
-                this.tutorialStepIdentifier = "rewards";
-                this.tutorialText = getString(R.string.tutorial_rewards);
-                break;
-            }
-        }
-
         return view;
     }
 
@@ -259,7 +329,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     }
 
     String getClassName() {
-        return this.classType;
+        return this.classType != null ? this.classType : "";
     }
 
     @Subscribe
@@ -290,7 +360,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     @Override
     public void onRefresh() {
         swipeRefreshLayout.setRefreshing(true);
-        apiClient.retrieveUser(true)
+        userRepository.retrieveUser(true)
                 .doOnTerminate(() -> swipeRefreshLayout.setRefreshing(false))
                 .subscribe(
                         new HabitRPGUserCallback((MainActivity)getActivity()),
@@ -299,7 +369,9 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     }
 
     public void setActiveFilter(String activeFilter) {
-        taskFilterHelper.setActiveFilter(classType, activeFilter);
+        if (classType != null) {
+            taskFilterHelper.setActiveFilter(classType, activeFilter);
+        }
         recyclerAdapter.filter();
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
index cee8b4651..4908b9448 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
@@ -7,7 +7,6 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.GravityCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.view.ViewPager;
 import android.util.SparseArray;
@@ -30,8 +29,10 @@ import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.habitrpg.android.habitica.events.TaskTappedEvent;
 import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
 import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
@@ -39,15 +40,15 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
 import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.roughike.bottombar.BottomBarTab;
 
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -100,13 +101,10 @@ public class TasksFragment extends BaseMainFragment {
         reward_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_REWARD));
         floatingMenu.setOnMenuButtonLongClickListener(this::onFloatingMenuLongClicked);
 
-        if (this.activity != null) {
-            this.activity.unlockDrawer(GravityCompat.END);
-        }
-
         loadTaskLists();
 
         if (bottomNavigation != null) {
+            bottomNavigation.setBadgesHideWhenActive(true);
             bottomNavigation.setOnTabSelectListener(tabId -> {
                 if (tabId == R.id.tab_habits) {
                     viewPager.setCurrentItem(0);
@@ -117,6 +115,7 @@ public class TasksFragment extends BaseMainFragment {
                 } else if (tabId == R.id.tab_rewards) {
                     viewPager.setCurrentItem(3);
                 }
+                updateBottomBarBadges();
             });
         }
 
@@ -171,22 +170,20 @@ public class TasksFragment extends BaseMainFragment {
         dialog.setActiveTags(taskFilterHelper.getTags());
         if (getActiveFragment() != null) {
             String taskType = getActiveFragment().classType;
-            dialog.setTaskType(taskType, taskFilterHelper.getActiveFilter(taskType));
+            if (taskType != null) {
+                dialog.setTaskType(taskType, taskFilterHelper.getActiveFilter(taskType));
+            }
         }
         dialog.setListener((activeTaskFilter, activeTags) -> {
             int activePos = viewPager.getCurrentItem();
             if (activePos >= 1 && viewFragmentsDictionary.get(activePos-1).recyclerAdapter != null) {
                 viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
             }
-            if (activePos < viewPager.getAdapter().getCount() && viewFragmentsDictionary.get(activePos+1).recyclerAdapter != null) {
+            if (activePos < viewPager.getAdapter().getCount()-1 && viewFragmentsDictionary.get(activePos+1).recyclerAdapter != null) {
                 viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
             }
             if (getActiveFragment() != null) {
                 getActiveFragment().setActiveFilter(activeTaskFilter);
-                if (Task.TYPE_DAILY.equals(getActiveFragment().classType)) {
-                    updateDailyDueDefaultSetting(activeTaskFilter);
-                }
-
             }
             taskFilterHelper.setTags(activeTags);
             updateFilterIcon();
@@ -195,19 +192,6 @@ public class TasksFragment extends BaseMainFragment {
         dialog.show();
     }
 
-    private void updateDailyDueDefaultSetting(String activeTaskFilter) {
-        Boolean showDueDefault = Task.FILTER_ACTIVE.equals(activeTaskFilter);
-        if (user != null) {
-            if (user.getPreferences().getDailyDueDefaultView() != showDueDefault) {
-                UpdateUserCommand command = new UpdateUserCommand();
-                Map<String, Object> data = new HashMap<>();
-                data.put("preferences.dailyDueDefaultView", showDueDefault);
-                command.updateData = data;
-                EventBus.getDefault().post(command);
-            }
-        }
-    }
-
     public void refresh() {
         if (getActiveFragment() != null) {
             getActiveFragment().onRefresh();
@@ -234,16 +218,16 @@ public class TasksFragment extends BaseMainFragment {
 
                 switch (position) {
                     case 0:
-                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_HABIT, sortCallback);
+                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_HABIT, sortCallback);
                         break;
                     case 1:
-                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_DAILY, sortCallback);
+                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_DAILY, sortCallback);
                         break;
                     case 3:
-                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_REWARD, null);
+                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_REWARD, null);
                         break;
                     default:
-                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_TODO,sortCallback);
+                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_TODO,sortCallback);
                 }
 
                 viewFragmentsDictionary.put(position, fragment);
@@ -312,6 +296,53 @@ public class TasksFragment extends BaseMainFragment {
         }
 
     }
+
+    private void updateBottomBarBadges() {
+        if (bottomNavigation == null) {
+            return;
+        }
+        List<TutorialStep> tutorialSteps = new Select().from(TutorialStep.class).where(Condition.column("identifier").in("habits", "dailies", "todos", "rewards")).queryList();
+
+        List<String> activeTutorialFragments = new ArrayList<>();
+        for (TutorialStep step : tutorialSteps) {
+            int id = -1;
+            String taskType = null;
+            switch (step.getIdentifier()) {
+                case "habits":
+                    id = R.id.tab_habits;
+                    taskType = Task.TYPE_HABIT;
+                    break;
+                case "dailies":
+                    id = R.id.tab_dailies;
+                    taskType = Task.TYPE_DAILY;
+                    break;
+                case "todos":
+                    id = R.id.tab_todos;
+                    taskType = Task.TYPE_TODO;
+                    break;
+                case "rewards":
+                    id = R.id.tab_rewards;
+                    taskType = Task.TYPE_REWARD;
+                    break;
+            }
+            BottomBarTab tab = bottomNavigation.getTabWithId(id);
+            if (step.shouldDisplay()) {
+                tab.setBadgeCount(1);
+                activeTutorialFragments.add(taskType);
+            } else {
+                tab.removeBadge();
+            }
+        }
+        if (activeTutorialFragments.size() == 1) {
+            TaskRecyclerViewFragment fragment = viewFragmentsDictionary.get(indexForTaskType(activeTutorialFragments.get(0)));
+            if (fragment != null && fragment.tutorialTexts != null) {
+                String finalText = getContext().getString(R.string.tutorial_tasks_complete);
+                if (!fragment.tutorialTexts.contains(finalText)) {
+                    fragment.tutorialTexts.add(finalText);
+                }
+            }
+        }
+    }
     // endregion
 
     //region Events
@@ -433,14 +464,23 @@ public class TasksFragment extends BaseMainFragment {
     }
 
     private void switchToTaskTab(String taskType) {
-        if (taskType == null) {
-            return;
+        int index = indexForTaskType(taskType);
+        if (viewPager != null && index != -1) {
+            viewPager.setCurrentItem(index);
+            updateBottomBarBadges();
         }
-        for (int index = 0; index < viewFragmentsDictionary.size(); index++) {
-            if (taskType.equals(viewFragmentsDictionary.get(index).getClassName()) && viewPager != null) {
-                viewPager.setCurrentItem(index);
+    }
+
+    private int indexForTaskType(String taskType) {
+        if (taskType != null) {
+            for (int index = 0; index < viewFragmentsDictionary.size(); index++) {
+                TaskRecyclerViewFragment fragment = viewFragmentsDictionary.get(index);
+                if (fragment != null && taskType.equals(fragment.getClassName())) {
+                    return index;
+                }
             }
         }
+        return -1;
     }
 
     @Nullable
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
index 07e8a01aa..86cd2a913 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
@@ -6,10 +6,10 @@ import com.github.clans.fab.FloatingActionMenu;
 import com.habitrpg.android.habitica.R;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
 import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorListener;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +27,8 @@ public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
     private Context context;
     private boolean isAnimating;
     private boolean isOffScreen;
+    @Nullable
+    private FloatingActionMenu fab;
 
     public FloatingActionMenuBehavior(Context context, AttributeSet attrs) {
         super();
@@ -84,6 +86,12 @@ public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
 
     @Override
     public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, View child, View directTargetChild, View target, int nestedScrollAxes) {
+        ViewGroup fabContainer = (ViewGroup) child.findViewById(R.id.floating_menu_wrapper);
+        if (fabContainer.getChildCount() > 0) {
+            if (fabContainer.getChildAt(0).getClass().equals(FloatingActionMenu.class)) {
+                fab = (FloatingActionMenu) fabContainer.getChildAt(0);
+            }
+        }
         return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL ||
                 super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, nestedScrollAxes);
     }
@@ -92,6 +100,10 @@ public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
     public void onNestedScroll(CoordinatorLayout coordinatorLayout, final View child, View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
         super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
 
+        if (fab == null) {
+            return;
+        }
+
         /*
         Logic:
             - If we're scrolling downwards or we're at the bottom of the screen
@@ -99,8 +111,8 @@ public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
          */
         if ((dyConsumed > 20 || (dyConsumed == 0 && dyUnconsumed > 0)) && !isAnimating && !isOffScreen) {
             isAnimating = true;
-            slideFabOffScreen(child);
-            resetAnimatingStatusWithDelay(child);
+            slideFabOffScreen(fab);
+            resetAnimatingStatusWithDelay(fab);
             isOffScreen = true;
 
         /*
@@ -110,37 +122,26 @@ public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
          */
         } else if (isOffScreen && ((dyConsumed < -10 && !isAnimating) || dyUnconsumed < 0)) {
             isAnimating = true;
-            slideFabOnScreen(child);
-            resetAnimatingStatusWithDelay(child);
+            slideFabOnScreen(fab);
+            resetAnimatingStatusWithDelay(fab);
             isOffScreen = false;
         }
     }
 
-    private void resetAnimatingStatusWithDelay(final View child) {
+    private void resetAnimatingStatusWithDelay(final FloatingActionMenu child) {
         child.postDelayed(() -> {
             isAnimating = false;
-            FloatingActionMenu fab = (FloatingActionMenu) ((ViewGroup) child).getChildAt(0);
             if (isOffScreen && fab != null) {
-                fab.hideMenu(false);
+                child.hideMenu(false);
             }
         }, FAB_ANIMATION_DURATION);
     }
 
-    private void slideFabOffScreen(View view) {
-        Animation slideOff = AnimationUtils.loadAnimation(context, R.anim.fab_slide_out);
-        slideOff.setDuration(FAB_ANIMATION_DURATION);
-        slideOff.setFillAfter(true);
-        view.startAnimation(slideOff);
+    private void slideFabOffScreen(FloatingActionMenu view) {
+        view.hideMenu(true);
     }
 
-    private void slideFabOnScreen(View view) {
-        Animation slideIn = AnimationUtils.loadAnimation(context, R.anim.fab_slide_in);
-        slideIn.setDuration(FAB_ANIMATION_DURATION);
-        slideIn.setFillAfter(true);
-        FloatingActionMenu fab = (FloatingActionMenu) ((ViewGroup) view).getChildAt(0);
-        view.startAnimation(slideIn);
-        if (fab != null) {
-            fab.showMenu(false);
-        }
+    private void slideFabOnScreen(FloatingActionMenu view) {
+        view.showMenu(true);
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
index 13cad0186..bcf970b2a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
@@ -4,14 +4,17 @@ import com.commonsware.cwac.anddown.AndDown;
 
 import net.pherth.android.emoji_library.EmojiParser;
 
+import android.support.annotation.Nullable;
 import android.text.Html;
 
+import static android.text.Html.FROM_HTML_MODE_LEGACY;
+
 /**
  * @author data5tream
  */
 public class MarkdownParser {
 
-    static AndDown processor = new AndDown();
+    private static AndDown processor = new AndDown();
 
     /**
      * Parses formatted markdown and returns it as styled CharSequence
@@ -20,7 +23,15 @@ public class MarkdownParser {
      * @return Stylized CharSequence
      */
     public static CharSequence parseMarkdown(String input) {
-        CharSequence output = Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim())));
+        if (input == null) {
+            return "";
+        }
+        CharSequence output;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+            output = Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim())), FROM_HTML_MODE_LEGACY);
+        } else {
+            output = Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim())));
+        }
         if (output.length() >= 2) output = output.subSequence(0, output.length() - 2);
         return output;
     }
@@ -31,6 +42,7 @@ public class MarkdownParser {
      * @param input Stylized CharSequence
      * @return Markdown formatted String
      */
+    @Nullable
     public static String parseCompiled(CharSequence input) {
         return EmojiParser.convertToCheatCode(input.toString());
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.java
index 8353967d0..f9b3e5389 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.java
@@ -5,6 +5,7 @@ import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.WindowInsets;
+import android.view.animation.AlphaAnimation;
 
 //http://stackoverflow.com/a/27801394/1315039
 public class RecyclerViewEmptySupport extends RecyclerView {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
index 1b100c586..4e467bc5e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.TaskTappedEvent;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
index 7d8fd515f..233216c3f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
@@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
 import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import net.pherth.android.emoji_library.EmojiTextView;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
index 9c1d89192..2053291f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks;
 
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.view.View;
 import android.widget.TextView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
index 679719c81..e70d64863 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.HabitScoreEvent;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
index 1412c1032..268f0f3ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
@@ -6,10 +6,12 @@ import com.habitrpg.android.habitica.events.TaskTappedEvent;
 import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
 import com.habitrpg.android.habitica.ui.ItemDetailDialog;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.Button;
 
@@ -27,10 +29,13 @@ public class RewardViewHolder extends BaseTaskViewHolder {
     @BindView(R.id.btnReward)
     Button rewardButton;
 
+    private Drawable customRewardIcon;
+
     public RewardViewHolder(View itemView) {
         super(itemView);
         priceFormat = new DecimalFormat("0.##");
 
+        customRewardIcon = ContextCompat.getDrawable(itemView.getContext(), R.drawable.custom_reward);
     }
 
     @Override
@@ -40,10 +45,9 @@ public class RewardViewHolder extends BaseTaskViewHolder {
         this.rewardButton.setText(this.priceFormat.format(this.task.value));
 
         if (this.isItem()) {
-            this.rewardImageView.setVisibility(View.VISIBLE);
             DataBindingUtils.loadImage(this.rewardImageView, "shop_" + this.task.getId());
         } else {
-            this.rewardImageView.setVisibility(View.GONE);
+            this.rewardImageView.setImageDrawable(customRewardIcon);
         }
     }
 
@@ -57,7 +61,7 @@ public class RewardViewHolder extends BaseTaskViewHolder {
     }
 
     @OnClick(R.id.btnReward)
-    public void buyReward() {
+    void buyReward() {
         BuyRewardCommand event = new BuyRewardCommand();
         event.Reward = task;
         EventBus.getDefault().post(event);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
index 8d00268fb..0bf418d3d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.view.View;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.java
new file mode 100644
index 000000000..97ac12100
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.java
@@ -0,0 +1,72 @@
+package com.habitrpg.android.habitica.ui.views;
+
+
+import android.content.Context;
+import android.os.Handler;
+import android.support.v4.content.ContextCompat;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.ForegroundColorSpan;
+import android.util.AttributeSet;
+
+import com.habitrpg.android.habitica.R;
+
+// http://stackoverflow.com/a/6700718/1315039
+public class Typewriter extends android.support.v7.widget.AppCompatTextView {
+
+    private SpannableStringBuilder stringBuilder;
+    private Object visibleSpan;
+    private Object hiddenSpan;
+    private int index;
+    private long delay = 30;
+
+
+    public Typewriter(Context context) {
+        super(context);
+        setupTextColors(context);
+    }
+
+    public Typewriter(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setupTextColors(context);
+    }
+
+    private void setupTextColors(Context context) {
+        visibleSpan = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.textColorLight));
+        hiddenSpan = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.transparent));
+    }
+
+    private Handler handler = new Handler();
+    private Runnable characterAdder = new Runnable() {
+        @Override
+        public void run() {
+            stringBuilder.setSpan(visibleSpan, 0, index++, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+            setText(stringBuilder);
+            if(index <= stringBuilder.length()) {
+                handler.postDelayed(characterAdder, delay);
+            }
+        }
+    };
+
+    public void animateText(CharSequence text) {
+        stringBuilder = new SpannableStringBuilder(text);
+        stringBuilder.setSpan(hiddenSpan, 0, stringBuilder.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+        index = 0;
+
+        setText(stringBuilder);
+        handler.removeCallbacks(characterAdder);
+        handler.postDelayed(characterAdder, delay);
+    }
+
+    public void setCharacterDelay(long millis) {
+        delay = millis;
+    }
+
+    public boolean isAnimating() {
+        return index < stringBuilder.length();
+    }
+
+    public void stopTextAnimation() {
+        index = stringBuilder.length();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
index 34f704a9e..f84fdcd9b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
@@ -39,6 +39,7 @@ public class LoginBackgroundView extends RelativeLayout {
     private int width;
     private int height;
     private boolean didLayoutStars = false;
+    private FrameLayout.LayoutParams params;
 
     public LoginBackgroundView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
@@ -50,6 +51,7 @@ public class LoginBackgroundView extends RelativeLayout {
         super.onFinishInflate();
         ButterKnife.bind(this, this);
         starViews = new ArrayList<>();
+        params = new FrameLayout.LayoutParams(0, 0);
         generateStars();
         animateClouds();
     }
@@ -72,7 +74,9 @@ public class LoginBackgroundView extends RelativeLayout {
         this.width = parentWidth;
         this.height = (int)(parentHeight*SIZE_FACTOR);
         this.setMeasuredDimension(width, height);
-        this.setLayoutParams(new FrameLayout.LayoutParams(width, height));
+        params.width = width;
+        params.height = height;
+        this.setLayoutParams(params);
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
@@ -83,7 +87,7 @@ public class LoginBackgroundView extends RelativeLayout {
     }
 
     public void generateStars() {
-        generateStars(1, 10, 20);
+        generateStars(1, 12, 25);
     }
 
     private void generateStars(int largeCount, int mediumCount, int smallCount) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.java
index 3f9491d8b..1b422d389 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.views.subscriptions;
 
 import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
index fab4765c0..ff7f9002e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
@@ -3,8 +3,10 @@ package com.habitrpg.android.habitica.ui.views.tasks;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.CompoundButtonCompat;
 import android.support.v7.app.AlertDialog;
@@ -26,8 +28,8 @@ import android.widget.TextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.TagRepository;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -74,11 +76,13 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
     private Map<String, Tag> createdTags = new HashMap<>();
     private List<String> deletedTags = new ArrayList<>();
 
+    private Drawable addIcon;
     private boolean isEditing;
 
     public TaskFilterDialog(Context context, AppComponent component) {
         super(context);
         component.inject(this);
+        addIcon = ContextCompat.getDrawable(context, R.drawable.ic_add_purple_300_36dp);
 
         LayoutInflater inflater = LayoutInflater.from(context);
         View view = inflater.inflate(R.layout.dialog_task_filter, null);
@@ -117,7 +121,6 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
             });
             clearButton.setEnabled(hasActiveFilters());
         }
-
     }
 
     @Override
@@ -136,21 +139,25 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
     private void createTagViews() {
         ColorStateList colorStateList = new ColorStateList(
                 new int[][]{
-
                         new int[]{-android.R.attr.state_checked}, //disabled
                         new int[]{android.R.attr.state_checked} //enabled
                 },
                 new int[] {
-
-                        Color.GRAY, //disabled
+                        Color.LTGRAY, //disabled
                         ContextCompat.getColor(getContext(), R.color.brand_400) //enabled
-
                 }
         );
+        int leftPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, getContext().getResources().getDisplayMetrics());
+        int verticalPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12, getContext().getResources().getDisplayMetrics());
         for (Tag tag : tags) {
             AppCompatCheckBox tagCheckbox = new AppCompatCheckBox(getContext());
             tagCheckbox.setText(tag.getName());
-            tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,14);
+            tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,16);
+            tagCheckbox.setPadding(tagCheckbox.getPaddingLeft()+ leftPadding,
+                    verticalPadding,
+                    tagCheckbox.getPaddingRight(),
+                    verticalPadding);
+            tagCheckbox.setTextColor(ContextCompat.getColor(getContext(), R.color.textColorLight));
             CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList);
             tagCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 if (isChecked) {
@@ -173,6 +180,9 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
         Button button = new Button(getContext());
         button.setText(R.string.add_tag);
         button.setOnClickListener(v -> createTag());
+        button.setCompoundDrawablesWithIntrinsicBounds(addIcon, null, null, null);
+        button.setBackgroundResource(R.drawable.layout_rounded_bg_lighter_gray);
+        button.setTextColor(ContextCompat.getColor(getContext(), R.color.text_light));
         tagsList.addView(button);
     }
 
@@ -228,6 +238,9 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (index >= tags.size()) {
+                    return;
+                }
                 Tag tag = tags.get(index);
                 tag.setName(s.toString());
                 if (createdTags.containsKey(tag.getId())) {
@@ -258,7 +271,7 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
         tagsList.addView(wrapper);
     }
 
-    public void setActiveTags(List<String> tagIds) {
+    public void setActiveTags(@Nullable List<String> tagIds) {
         if (tagIds == null) {
             this.activeTags.clear();
         } else {
@@ -313,7 +326,7 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
         setActiveFilter(activeFilter);
     }
 
-    private void setActiveFilter(String activeFilter) {
+    private void setActiveFilter(@Nullable String activeFilter) {
         filterType = activeFilter;
         int checkedId = -1;
         if (activeFilter == null) {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/BooleanAsIntAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java
similarity index 95%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/BooleanAsIntAdapter.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java
index 1c5ecf577..c1b2b8149 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/BooleanAsIntAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChallengeDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChallengeDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java
index 6c5865754..3d73ca1d1 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChallengeDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
+import com.habitrpg.android.habitica.models.social.Challenge;
 
 import android.text.TextUtils;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChatMessageDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
similarity index 86%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChatMessageDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
index d6a4a3dbc..df12a6457 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChatMessageDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -7,9 +7,9 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Backer;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.Contributor;
+import com.habitrpg.android.habitica.models.social.Backer;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Contributor;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -22,7 +22,7 @@ public class ChatMessageDeserializer implements JsonDeserializer<ChatMessage> {
         if (obj.has("id")) {
             message.id = obj.get("id").getAsString();
         }
-        if (obj.has("text") && !obj.get("text").isJsonNull()) {
+        if (obj.has("text") && !obj.get("text").isJsonNull() && obj.get("text").isJsonPrimitive()) {
             message.text = obj.get("text").getAsString();
         }
         if (obj.has("timestamp")) {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChecklistItemSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChecklistItemSerializer.java
similarity index 84%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChecklistItemSerializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChecklistItemSerializer.java
index e1e1ecaa9..3834609a9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChecklistItemSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChecklistItemSerializer.java
@@ -1,11 +1,11 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 
 import java.lang.reflect.Type;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ContentDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
similarity index 85%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ContentDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
index e6cde8568..f947421f4 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ContentDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,19 +6,18 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
-
-import com.magicmicky.habitrpgwrapper.lib.models.ContentGear;
-import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Customization;
-import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Mount;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.ContentGear;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.FAQArticle;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 import com.raizlabs.android.dbflow.runtime.TransactionManager;
 import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
 import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
@@ -27,8 +26,8 @@ import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class ContentDeserializer implements JsonDeserializer<ContentResult> {
 
@@ -61,21 +60,21 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
         items.addAll(result.food);
         items.addAll(result.hatchingPotions);
 
-        result.pets = context.deserialize(object.get("pets"), new TypeToken<HashMap<String, Pet>>() {
+        result.pets = context.deserialize(object.get("pets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
-        result.specialPets = context.deserialize(object.get("specialPets"), new TypeToken<HashMap<String, Pet>>() {
+        result.specialPets = context.deserialize(object.get("specialPets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
-        result.premiumPets = context.deserialize(object.get("premiumPets"), new TypeToken<HashMap<String, Pet>>() {
+        result.premiumPets = context.deserialize(object.get("premiumPets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
-        result.questPets = context.deserialize(object.get("questPets"), new TypeToken<HashMap<String, Pet>>() {
+        result.questPets = context.deserialize(object.get("questPets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
-        result.mounts = context.deserialize(object.get("mounts"), new TypeToken<HashMap<String, Mount>>() {
+        result.mounts = context.deserialize(object.get("mounts"), new TypeToken<Map<String, Mount>>() {
         }.getType());
-        result.specialMounts = context.deserialize(object.get("specialMounts"), new TypeToken<HashMap<String, Mount>>() {
+        result.specialMounts = context.deserialize(object.get("specialMounts"), new TypeToken<Map<String, Mount>>() {
         }.getType());
-        result.premiumMounts = context.deserialize(object.get("premiumMounts"), new TypeToken<HashMap<String, Mount>>() {
+        result.premiumMounts = context.deserialize(object.get("premiumMounts"), new TypeToken<Map<String, Mount>>() {
         }.getType());
-        result.questMounts = context.deserialize(object.get("questMounts"), new TypeToken<HashMap<String, Mount>>() {
+        result.questMounts = context.deserialize(object.get("questMounts"), new TypeToken<Map<String, Mount>>() {
         }.getType());
 
         for (Egg egg : result.eggs) {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/CustomizationDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
similarity index 93%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/CustomizationDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
index 438bf855c..c12b971b2 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/CustomizationDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Customization;
+import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
@@ -133,11 +133,18 @@ public class CustomizationDeserializer implements JsonDeserializer<List<Customiz
             customization.setType("background");
             customization.setIdentifier(key);
         }
+        if ("incentiveBackgrounds".equals(setName)) {
+            customization.setCustomizationSetName("Login Incentive");
+            customization.setPrice(0);
+            customization.setSetPrice(0);
+            customization.setIsBuyable(false);
+        } else {
+            customization.setPrice(7);
+            customization.setSetPrice(15);
+        }
 
         customization.setText(entry.get("text").getAsString());
         customization.setNotes(entry.getAsJsonObject().get("notes").getAsString());
-        customization.setPrice(7);
-        customization.setSetPrice(15);
 
         return customization;
     }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.java
similarity index 97%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.java
index e93db33bc..30afa7a6b 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java
similarity index 90%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateSerializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java
index a9f32ae66..9caeb4448 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DaysUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java
similarity index 85%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DaysUtils.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java
index 31b6e2719..f63498a9e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DaysUtils.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java
@@ -1,6 +1,6 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
+import com.habitrpg.android.habitica.models.tasks.Days;
 
 /**
  * Created by magicmicky on 04/02/15.
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/EggListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
similarity index 95%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/EggListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
index d6eddd1b0..53d26db3a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/EggListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Egg;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FAQArticleListDeserilializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FAQArticleListDeserilializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
index 830903107..87768b6de 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FAQArticleListDeserilializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
+import com.habitrpg.android.habitica.models.FAQArticle;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FeedResponseDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java
similarity index 82%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FeedResponseDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java
index 4fdce5bd6..8b8648bf2 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FeedResponseDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java
@@ -1,11 +1,11 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
 
 import java.lang.reflect.Type;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FoodListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
similarity index 95%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FoodListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
index e9f6ceb0a..a7689b7e9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/FoodListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.Food;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/GroupSerialization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
similarity index 92%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/GroupSerialization.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
index 492f5d06f..bc09eb4c9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/GroupSerialization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
@@ -10,10 +10,10 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.google.gson.reflect.TypeToken;
 
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Quest;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.inventory.Quest;
 
 import java.lang.reflect.Type;
 import java.util.List;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/HatchingPotionListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
similarity index 95%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/HatchingPotionListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
index 6053a5175..ae52bcb17 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/HatchingPotionListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ItemDataListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
similarity index 93%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ItemDataListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
index ac78948e9..492f286e5 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ItemDataListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/MountListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
similarity index 88%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/MountListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
index c34ef64c1..b8d01c891 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/MountListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
@@ -1,11 +1,11 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Mount;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PetListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
similarity index 88%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PetListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
index aaa9137ef..7ef1ec2e3 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PetListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
@@ -1,11 +1,11 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.Pet;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PurchasedDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PurchasedDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
index ebbf6d1b5..8a1051025 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PurchasedDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,9 +6,9 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Customization;
-import com.magicmicky.habitrpgwrapper.lib.models.Purchases;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.user.Purchases;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
 import com.raizlabs.android.dbflow.runtime.TransactionManager;
 import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
 import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/QuestListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
similarity index 96%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/QuestListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
index f5cfd0e79..3fd331377 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/QuestListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.raizlabs.android.dbflow.runtime.TransactionManager;
 import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
 import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/RemindersItemSerializer.java
similarity index 86%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/RemindersItemSerializer.java
index 7618d4fba..6940923a0 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/RemindersItemSerializer.java
@@ -1,11 +1,11 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 
 import java.lang.reflect.Type;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
similarity index 94%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
index 88fd78c02..7ef241eeb 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -6,7 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
+import com.habitrpg.android.habitica.models.Skill;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskGroupPlanDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskGroupPlanDeserializer.java
similarity index 88%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskGroupPlanDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskGroupPlanDeserializer.java
index 072922684..97981c324 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskGroupPlanDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskGroupPlanDeserializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 
 import com.google.gson.JsonDeserializationContext;
@@ -7,7 +7,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskGroupPlan;
+import com.habitrpg.android.habitica.models.tasks.TaskGroupPlan;
 
 import java.lang.reflect.Type;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.java
similarity index 80%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.java
index c2d552259..b969399b6 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.java
@@ -1,11 +1,11 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
similarity index 92%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskSerializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
index 064022beb..2a930abf4 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -6,8 +6,8 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
 
 import java.lang.reflect.Type;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskTagDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskTagDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
index 369e80744..430cfc660 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskTagDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
@@ -1,12 +1,12 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TutorialStepListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
similarity index 91%
rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TutorialStepListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
index fcd49fe4b..1241fec46 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TutorialStepListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
@@ -1,11 +1,11 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 
-import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
+import com.habitrpg.android.habitica.models.TutorialStep;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java
index 451d90fac..41a8bda61 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.widget;
 
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
index 0ccb9e6d5..8815e0fbe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -32,8 +32,8 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
     private AppWidgetManager appWidgetManager;
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
         @Override
-        public void onResultReceived(HabitRPGUser habitRPGUser) {
-            updateData(habitRPGUser);
+        public void onResultReceived(HabitRPGUser user) {
+            updateData(user);
         }
 
         @Override
@@ -42,7 +42,7 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
         }
 
         @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
             return true;
         }
     };
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
index fec2a1886..6b661e334 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
@@ -1,8 +1,7 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
@@ -18,14 +17,6 @@ import android.widget.Toast;
 
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import static com.habitrpg.android.habitica.helpers.MathHelper.round;
-import static com.habitrpg.android.habitica.interactors.NotifyUserUseCase.MIN_LEVEL_FOR_SKILLS;
 
 
 public abstract class BaseWidgetProvider extends AppWidgetProvider {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java
index 3b5ed8dfb..513a635f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.widget;
 
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
index 583d745d1..76736aecb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
index 61b4dff9a..b84c58561 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
@@ -8,12 +8,12 @@ import android.os.Build;
 import android.os.Bundle;
 import android.widget.RemoteViews;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
index bea5e5e68..6a7472cd1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
@@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.widget;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirection;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.responses.TaskDirection;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
index 1ef5b7106..7a7adaf5e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
@@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.widget;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.OrderBy;
 import com.raizlabs.android.dbflow.sql.language.Select;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java
index ab73f7c48..98848a8ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java
@@ -1,13 +1,13 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirection;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.responses.TaskDirection;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java
index 5ba153e73..111ba7fa1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.widget;
 
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.Task;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContentGear.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContentGear.java
deleted file mode 100644
index 51b7c7d8e..000000000
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContentGear.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
-
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
-
-import java.util.List;
-
-public class ContentGear {
-
-    public List<ItemData> flat;
-
-}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/DefaultResponse.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/DefaultResponse.java
deleted file mode 100644
index 091ec2d09..000000000
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/DefaultResponse.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
-
-/**
- * Created by MagicMicky on 10/06/2014.
- */
-public class DefaultResponse {
-    private boolean result;
-    //   private HabitRPGData habitRPGData;
-
-    public boolean isResult() {
-        return result;
-    }
-
-    public void setResult(boolean result) {
-        this.result = result;
-    }
-/*
-    public HabitRPGData getHabitRPGData() {
-        return habitRPGData;
-    }
-
-    public void setHabitRPGData(HabitRPGData habitRPGData) {
-        this.habitRPGData = habitRPGData;
-    }
-*/
-}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PostChatMessageResult.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PostChatMessageResult.java
deleted file mode 100644
index 9191d746b..000000000
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PostChatMessageResult.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
-
-/**
- * Created by Negue on 30.08.2015.
- */
-public class PostChatMessageResult {
-    public ChatMessage message;
-}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/FeedResponse.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/FeedResponse.java
deleted file mode 100644
index 9aaf84e1a..000000000
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/FeedResponse.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.magicmicky.habitrpgwrapper.lib.models.responses;
-
-public class FeedResponse {
-
-    public Integer value;
-
-}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/SkillResponse.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/SkillResponse.java
deleted file mode 100644
index 9f47758e7..000000000
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/SkillResponse.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.magicmicky.habitrpgwrapper.lib.models.responses;
-
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-
-import java.util.List;
-
-public class SkillResponse {
-
-    public HabitRPGUser user;
-    public List<HabitRPGUser> partyMembers;
-    public Task task;
-
-}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/UnlockResponse.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/UnlockResponse.java
deleted file mode 100644
index 1ab853cb6..000000000
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/UnlockResponse.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.magicmicky.habitrpgwrapper.lib.models.responses;
-
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
-import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
-import com.magicmicky.habitrpgwrapper.lib.models.Purchases;
-
-/**
- * Created by viirus on 16/01/16.
- */
-public class UnlockResponse {
-
-    public Preferences preferences;
-
-    public Purchases purchased;
-
-    public Items items;
-
-}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java
index b173a1c52..e0334b7a5 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.api;
 
 
-import com.habitrpg.android.habitica.ApiClientImpl;
+import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
+import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
 import com.habitrpg.android.habitica.proxy.impl.EmptyCrashlyticsProxy;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.HostConfig;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
 
 import org.junit.After;
 import org.junit.Before;
@@ -20,7 +20,6 @@ import java.security.InvalidParameterException;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import rx.android.schedulers.AndroidSchedulers;
 import rx.observers.TestSubscriber;
 
 public class BaseAPITests {
@@ -41,7 +40,7 @@ public class BaseAPITests {
                 BuildConfig.PORT,
                 "",
                 "");
-        apiClient = new ApiClientImpl(ApiClientImpl.createGsonFactory(), hostConfig, new EmptyCrashlyticsProxy(), context);
+        apiClient = new ApiClientImpl(ApiClientImpl.createGsonFactory(), hostConfig, new EmptyCrashlyticsProxy(), new PopupNotificationsManager(context), context);
         generateUser();
     }
 
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/api/SocialAPITests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/api/SocialAPITests.java
index 36ba15963..9dc49c872 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/SocialAPITests.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/SocialAPITests.java
@@ -1,10 +1,9 @@
 package com.habitrpg.android.habitica.api;
 
 import com.habitrpg.android.habitica.BuildConfig;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.Group;
-import com.magicmicky.habitrpgwrapper.lib.models.PostChatMessageResult;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 
 import org.junit.After;
 import org.junit.Test;
@@ -19,7 +18,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import rx.android.schedulers.AndroidSchedulers;
 import rx.observers.TestSubscriber;
 
 @Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.M)
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/api/TagAPITests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/api/TagAPITests.java
index 4789f65ca..14b68649d 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/TagAPITests.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/TagAPITests.java
@@ -1,8 +1,7 @@
 package com.habitrpg.android.habitica.api;
 
 import com.habitrpg.android.habitica.BuildConfig;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.Tag;
 
 import junit.framework.Assert;
 
@@ -15,7 +14,6 @@ import android.os.Build;
 
 import java.util.UUID;
 
-import rx.android.schedulers.AndroidSchedulers;
 import rx.observers.TestSubscriber;
 
 @Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.M)
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/api/TaskAPITests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/api/TaskAPITests.java
index 9b4e2f2c6..cb62e9edb 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/TaskAPITests.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/TaskAPITests.java
@@ -2,10 +2,9 @@ package com.habitrpg.android.habitica.api;
 
 
 import com.habitrpg.android.habitica.BuildConfig;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,7 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import rx.android.schedulers.AndroidSchedulers;
 import rx.observers.TestSubscriber;
 
 import static org.junit.Assert.assertEquals;
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java
index 3d4d488ca..541b68a6e 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java
@@ -2,9 +2,8 @@ package com.habitrpg.android.habitica.api;
 
 
 import com.habitrpg.android.habitica.BuildConfig;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -15,7 +14,6 @@ import android.os.Build;
 
 import java.util.UUID;
 
-import rx.android.schedulers.AndroidSchedulers;
 import rx.observers.TestSubscriber;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManagerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManagerTest.java
index f4be83c73..edcea3079 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManagerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManagerTest.java
@@ -1,13 +1,13 @@
 package com.habitrpg.android.habitica.helpers;
 
-import com.habitrpg.android.habitica.ApiClientImpl;
+import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
 import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.proxy.impl.EmptyCrashlyticsProxy;
-import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
-import com.magicmicky.habitrpgwrapper.lib.models.Notification;
-import com.magicmicky.habitrpgwrapper.lib.models.notifications.NotificationData;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.Notification;
+import com.habitrpg.android.habitica.models.notifications.NotificationData;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
index e2cfee1eb..81c0bc5d3 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
@@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.helpers;
 
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.receivers.TaskReceiver;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+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.raizlabs.android.dbflow.config.FlowManager;
 
 import org.junit.After;
@@ -38,7 +38,7 @@ public class TaskAlarmManagerTest {
     @Before
     public void setUp() {
         context = ShadowApplication.getInstance().getApplicationContext();
-        taskAlarmManager = TaskAlarmManager.getInstance(context);
+        taskAlarmManager = new TaskAlarmManager(context);
     }
 
     @After
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
index 146b62a56..4c6dc34dd 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.helpers;
 
 import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRpgClass;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.HabitRpgClass;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.tasks.ItemData;
 
 import junit.framework.Assert;
 
diff --git a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.java
similarity index 91%
rename from Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanTest.java
rename to Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.java
index abaca898d..a2c15c490 100644
--- a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.java
@@ -1,4 +1,6 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUserTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
similarity index 90%
rename from Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUserTest.java
rename to Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
index 3ca02b5fc..e18901c5d 100644
--- a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUserTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
@@ -1,6 +1,8 @@
-package com.magicmicky.habitrpgwrapper.lib.models;
+package com.habitrpg.android.habitica.models;
 
 import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -14,7 +16,7 @@ import static org.junit.Assert.assertEquals;
 
 @Config(constants = BuildConfig.class)
 @RunWith(RobolectricTestRunner.class)
-public class HabitRPGUserTest {
+public class UserTest {
 
     private HabitRPGUser user;
 
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
index 4cc5ec2d9..c1261f046 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
@@ -1,9 +1,9 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.customization;
 
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Hair;
-import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Hair;
+import com.habitrpg.android.habitica.models.user.Preferences;
 
 public class AvatarCustomizationFragmentTest extends BaseFragmentTests<AvatarCustomizationFragment> {
 
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
index 0757603e9..7a29404b6 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
@@ -1,11 +1,11 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.equipment;
 
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.magicmicky.habitrpgwrapper.lib.models.Gear;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
-import com.magicmicky.habitrpgwrapper.lib.models.Outfit;
-import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
+import com.habitrpg.android.habitica.models.user.Gear;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Outfit;
+import com.habitrpg.android.habitica.models.user.Preferences;
 
 public class EquipmentOverviewFragmentTest extends BaseFragmentTests<EquipmentOverviewFragment> {
 
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
index e797a7bbc..cf86332b9 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
 
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
 
 import java.util.HashMap;
 
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
index 175da841f..4e6e639c1 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
 
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Items;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
 
 import java.util.HashMap;
 
diff --git a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
similarity index 98%
rename from Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializerTest.java
rename to Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
index 71eaddfe4..5e2a25944 100644
--- a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
@@ -1,4 +1,4 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
+package com.habitrpg.android.habitica.utils;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;
diff --git a/seeds-sdk/build.gradle b/seeds-sdk/build.gradle
index ed1673cdc..fee18da6c 100755
--- a/seeds-sdk/build.gradle
+++ b/seeds-sdk/build.gradle
@@ -12,6 +12,7 @@ buildscript {
 
 android {
     compileSdkVersion 25
+
     buildToolsVersion "25.0.2"
 
     defaultConfig {
diff --git a/store_strings.xml b/store_strings.xml
index 4c2ce7768..56dab0578 100644
--- a/store_strings.xml
+++ b/store_strings.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="store_title">Gamify Your Tasks</string>
     <string name="store_short_description">Treat your life like a game to stay motivated and organized!</string>
-    <string name="store_description">The NEW app from HabitRPG! Rewritten from the ground up for a smoother experience and more features.
-
-Treat your life like a game to stay motivated and organized! Habitica makes it simple to have fun while accomplishing goals.
-
+    <string name="store_description">Treat your life like a game to stay motivated and organized! Habitica makes it simple to have fun while accomplishing goals.
 Input your Habits, your Daily goals, and your To-Do list, and then create a custom avatar. Check off tasks to level up your avatar and unlock features such as armor, pets, skills, and even quests! Fight monsters with friends to keep each other accountable, and use your gold on in-game rewards, like equipment, or custom awards, like watching an episode of your favorite TV show. Flexible, social, and fun, Habitica is the perfect way to motivate yourself to accomplish anything.
-
-We are currently in beta, so please, feel free to send feedback to mobile@habitica.com!  And if you enjoy our app, we would really appreciate it if you would leave us a review.</string>
+If you have any questions, feel free to send feedback to mobile@habitica.com! And if you enjoy our app, we would really appreciate it if you would leave us a review.
+</string>
 </resources>
 
diff --git a/translations/store_strings-bg.xml b/translations/store_strings-bg.xml
index 2f0fe195e..68ae499f9 100644
--- a/translations/store_strings-bg.xml
+++ b/translations/store_strings-bg.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="store_title">Превърнете задачите си в игра</string>
   <string name="store_short_description">Превърнете живота си в игра за повече мотивация и по-добра организация!</string>
-  <string name="store_description">НОВОТО приложение на Хабитика! Пренаписано изцяло за по-добро преживяване и повече функционалности.
-
-Превърнете живота си в игра за повече мотивация и по-добра организация! С Хабитика е лесно да се забавлявате, докато изпълнявате целите си.
-
-Въведете навиците си, ежедневните си цели и дългосрочните си задачи, а след това си създайте герой. Изпълнявайте задачите си, за да вдигате нивото на героя си и отключвате функционалности като екипировка, любимци, умения и дори мисии! Бийте се с чудовища заедно с приятели, за да държите един другиго отговорен, и използвайте златото си за награди като екипировка, или дори свои собствени такива, като например да гледате епизод от любимия си сериал. Гъвкава, забавна и с голяма общност, Хабитика е перфектният начин да се мотивирате и да постигнете всичко, което искате.
-
-Версията в момента е „бета“, така че не се притеснявайте да ни изпращате отзивите си на mobile@habitica.com! А ако приложението Ви харесва, ще се радваме да оставите рецензията си.</string>
+  <string name="store_description">Превърнете живота си в игра за повече мотивация и по-добра организация! С Хабитика се забавлявате, докато постигате целите си.
+Въведете навиците си, ежедневните си цели и задачите, които имате да свършите, и си създайте герой. Отмятайте задачите си, за да качвате нивото на героя си и да отключвате различни функционалности като екипировка, любимци, умения и дори мисии! Бийте се с чудовища заедно с приятели, за да се подкрепяте взаимно и да се държите отговорни, и използвайте златото си за награди в играта, например екипировка; или създайте свои собствени награди, като например разрешение да гледате епизод от любимия си сериал. Хабитика е приспособим и забавен начин да мотивирате себе си, за да постигнете всичко, което искате.
+Ако имате въпроси, пишете на mobile@habitica.com! А ако приложението Ви харесва, ще се радваме да оставите коментар или рецензия.
+</string>
 </resources>
diff --git a/translations/store_strings-ca.xml b/translations/store_strings-ca.xml
index b79c49bee..885ca53c1 100644
--- a/translations/store_strings-ca.xml
+++ b/translations/store_strings-ca.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Viu la teva vida com un joc per mantenir-te motivat i organitzat!</string>
-  <string name="store_description">La nova aplicació de HabitRPG! Reescrita des de zero per oferir més funcions i una experiència més agradable!
-
-viu la teva vida com un joc per mantenir-te motivat i organitzat! Habitica permet divertir-se mentre aconsegueixes els teus objectius. 
-
-Introdueix els teus hàbits, els teus objectius diaris, i la teva llista de coses a fer, i crea el teu propi personatge. Completa les teves tasques per a que el teu personatge pugi de nivell i desbloquejar armadures, mascotes, habilitats i fins i tot missions! Combat monstres amb amics: si jugueu junts, us serà més fàcil ser responsables. I utilitza el teu or per recompenses dins del joc, com equipament, o recompenses personalitzades, com mirar un capítol de la teva sèrie preferida. Flexible, social, i divertida, Habitica és la manera perfecta de motivar-te per aconseguir el que sigui.
-
-Actualment estem en beta, així que pots enviar-nos els teus comentaris a mobile@habitica.com! I si t\'agrada l\'aplicació, t\'agrairíem que afegissis un comentari.</string>
 </resources>
diff --git a/translations/store_strings-cmn.xml b/translations/store_strings-cmn.xml
index 9c654a4d6..a8204f443 100644
--- a/translations/store_strings-cmn.xml
+++ b/translations/store_strings-cmn.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">让你的生活如同游戏，动力十足，井井有条！</string>
-  <string name="store_description">这是由HabitRPG发展而来的新应用！ 全新的设计将给您带来更流畅的体验和更多的特色。
-
-让你的生活如同游戏，动力十足、井井有条！Habitica让你在实现目标的过程中发现更多乐趣。
-
-在这里你可以记录你的习惯，每日任务和待办事项，自定义自己的的角色形象。通过完成任务，你可以提升角色等级，解锁新的装备、宠物、技能以及任务卷轴等各种奖励。与朋友一同击退怪兽，为团队做出贡献。你的金币可以用来购买游戏内奖励，比如装备，也可以设置自己的奖励，例如看一集你最喜欢的电视剧。Habitica灵活、有趣、连接你的朋友圈，是激励自我、提升自我的不二之选。
-
-软件目前还是测试版，我们欢迎您的任何意见或建议，请发送邮件至 mobile@habitica.com。如果喜欢我们的应用，您的点赞和评论是对我们最大的支持！</string>
 </resources>
diff --git a/translations/store_strings-cs.xml b/translations/store_strings-cs.xml
index 2f563c831..cbcd4dfaf 100644
--- a/translations/store_strings-cs.xml
+++ b/translations/store_strings-cs.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Berte život jako hru, načerpejte motivaci a mějte vše pod kontrolou!</string>
-  <string name="store_description">NOVÁ aplikace od HabitRPG! Přepsaná od základů pro příjemnější použití a více možností.
-
-Berte život jako hru, načerpejte motivaci a mějte vše pod kontrolou! Habitica Vám umožňuje dosahovat cílů a bavit se zároveň!
-
-Zadejte své cíle, každodenní úkoly, sepiště seznam úkolů a vytvořte si vlastní avatar. Odškrtávejte úkoly a tím získávejte zkušenosti a odemykejte herní prvky jako brnění, mazlíčky, dovednosti a skupinové cíle! Bojujte s přáteli proti nestvůrám a podporujte se navzájem v zodpovědnosti; utraťte své zlato za herní odměny, jako vybavení, nebo za vlastní odměny, jako další díl Vašeho oblíbeného seriálu. Flexibilní, společenská a zábavná, Habitica je skvělý způsob pro motivaci k dosažení čehokoli.
-
-Momentálně je aplikace v beta fázi, takže oceníme Vaši zpětnou vazbu na mobile@habitica.com! Zároveň, jestli rádi používate naši aplikaci, ocenili bychom Vaše hodnocení a recenzi.</string>
 </resources>
diff --git a/translations/store_strings-de.xml b/translations/store_strings-de.xml
index ff17e48a1..d132d5134 100644
--- a/translations/store_strings-de.xml
+++ b/translations/store_strings-de.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Betrachte Dein Leben als ein Spiel, um motiviert und organisiert zu bleiben!</string>
-  <string name="store_description">Die NEUE App von Habitica! Von Grund auf neu geschrieben für ein angenehmeres Erlebnis und mehr Features.
-
-Verwandle Dein Leben in ein Spiel, um motiviert und organisiert zu bleiben. Habitica macht es einfach, Spaß zu haben, während man Ziele erreicht.
-
-Füge Deine Gewohnheiten, täglichen Aufgaben und To-Do-Listen hinzu und dann schaffe Deinen eigenen Avatar. Hake Aufgaben ab, um mit Deinem Avatar aufzusteigen und neue Features wie Rüstung, Haustiere, Fähigkeiten oder sogar Quests freizuschalten. Bekämpfe mit Freunden Monster, um gegenseitig Verantwortung zu übernehmen. Benutze Gold um In-Game-Belohnungen, wie Ausrüstung oder persönliche Preise, wie das Schauen einer Episode Deiner Lieblingsserie zu gewinnen. Flexibel, sozial und spaßig. Habitica ist der perfekte Weg, dich selbst zu motivieren alles mögliche zu erreichen.
-
-Wir sind aktuell in der Beta-Phase, also schick uns Feedback an mobile@habitica.com! Und falls dir die App gefällt, würden wir uns freuen, wenn Du uns eine Bewertung schickst.</string>
 </resources>
diff --git a/translations/store_strings-en-rGB.xml b/translations/store_strings-en-rGB.xml
index 051d1412a..4e0303736 100644
--- a/translations/store_strings-en-rGB.xml
+++ b/translations/store_strings-en-rGB.xml
@@ -1,12 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Treat your life like a game to stay motivated and organised!</string>
-  <string name="store_description">The NEW app from HabitRPG! Rewritten from the ground up for a smoother experience and more features.
-
-Treat your life like a game to stay motivated and organised! Habitica makes it simple to have fun while accomplishing goals.
-
-Input your Habits, your Daily goals, and your To-Do list, and then create a custom avatar. Check off tasks to level up your avatar and unlock features such as armour, pets, skills, and even quests! Fight monsters with friends to keep each other accountable, and use your gold on in-game rewards, like equipment, or custom awards, like watching an episode of your favourite TV show. Flexible, social, and fun, Habitica is the perfect way to motivate yourself to accomplish anything.
-
-We are currently in beta, so please, feel free to send feedback to mobile@habitica.com! And if you enjoy our app, we would really appreciate it if you would leave us a review.
-</string>
 </resources>
diff --git a/translations/store_strings-es.xml b/translations/store_strings-es.xml
index 456567041..69ced6da6 100644
--- a/translations/store_strings-es.xml
+++ b/translations/store_strings-es.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">¡Vive tu vida como si fuese un juego para motivarte y organizarte!</string>
-  <string name="store_description">¡La NUEVA aplicación de HabitRPG! Reescrita desde cero para ofrecer más funciones y una experiencia más agradable.
-
-Vive tu vida como si fuese un juego para motivarte y organizarte. Con Habitica, es fácil conseguir tus objetivos y divertirte al mismo tiempo.
-
-Introduce tus hábitos, tus objetivos diarios y tu lista de tareas pendientes, y crea tu propio personaje. Completa tareas para que tu personaje suba de nivel y desbloquea armaduras, mascotas, habilidades y hasta misiones, entre otras cosas. Combate monstruos con tus amigos: si jugáis juntos, os resultará más fácil ser responsables. Usa el oro para comprar recompensas dentro del juego, como equipamiento o recompensas personalizadas: por ejemplo, ver un episodio de tu serie favorita. Habitica es flexible, social y divertida. Por eso es la mejor manera de motivarte y conseguir cualquier objetivo.
-
-Actualmente estamos en fase beta, así que puedes enviarnos tus comentarios a mobile@habitica.com. Y si te gusta nuestra aplicación, te agradeceríamos que añadieras una reseña.</string>
 </resources>
diff --git a/translations/store_strings-es_419.xml b/translations/store_strings-es_419.xml
index 730d99124..157bf3690 100644
--- a/translations/store_strings-es_419.xml
+++ b/translations/store_strings-es_419.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">¡Trata tu vida como un juego para mantenerte motivado y organizado!</string>
-  <string name="store_description">¡La NUEVA app de HabitRPG! Hecha de nuevo desde el principio para mejorar la experiencia y añadir más características.
-
-¡Trata a tu vida como un juego para mantenerte motivado y organizado! Habitica hace que sea fácil divertirse alcanzando objetivos.
-
-Ingresa tus Hábitos, tus objetivos Diarios y tu lista de Pendientes, y luego crea un avatar personalizado. ¡Marca tareas para que tu avatar suba de nivel y desbloquee características como armaduras, mascotas, habilidades e incluso misiones! Lucha contra monstruos con tus amigos para mantenerse responsables mutuamente frente a sus tareas, y usa tu oro para comprar recompensas en el juego, como equipamiento, o recompensas personalizadas, como ver un episodio de tu serie favorita. Flexible, social y divertida, Habitica es la forma perfecta de motivarte para lograr lo que quieras.
-
-Actualmente estamos utilizando una versión beta, ¡así que por favor siéntete libre de enviar tus opiniones a mobile@habitica.com! Y si te gusta nuestra app, de verdad apreciaríamos que nos dejaras tu comentario.</string>
 </resources>
diff --git a/translations/store_strings-fi.xml b/translations/store_strings-fi.xml
index 0ccb590b4..d1e96a342 100644
--- a/translations/store_strings-fi.xml
+++ b/translations/store_strings-fi.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Tee elämästäsi peli. Se auttaa sinua motivoitumaan ja organisoitumaan.</string>
-  <string name="store_description">Uusi sovellus saatavilla HabitRPGllä! Jotta käyttö sujuisi entistäkin sulavammin, on sovellus ohjelmoitu uudelleen alusta alkaen. Lisäksi se sisältää uusia toimintoja.
-
-Tee elämästäsi peli. Se auttaa sinua motivoitumaan ja organisoitumaan! Habitican avulla tavoitteiden saavuttamisesta tulee helppoa ja hauskaa.
-
-Lisää tapasi, päivittäiset tavoitteesi ja tehtävälistasi. Tämän jälkeen voit luoda mieleisesi hahmon. Kasvatat hahmosi tasoja suorittamalla päivittäisiä tavoitteitasi ja sinulle avautuu uusia asioita kuten haarniskoita, lemmikkejä, taitoja ja jopa seikkailuja! Voitte tukeutua toisiinne ystäviesi kanssa taistelemalla hirviöitä vastaan ja voit käyttää pelissä ansaitsemaasi kultaa pelin sisäisiin palkintoihin kuten tarvikkeisiin tai itsellesi räätälöimiin palkintoihin kuten lempi TV-sarjan katsomiseen. Habitica on joustava, sosialisoiva sekä hauska. Se on täydellinen keino motivoida itsensä saavuttamaan kaiken haluamansa.
-
-Olemme parhaillaan Beta-vaiheessa, joten toivomme palautetta juuri sinulta osoitteeseen mobile@habitica.com! Ja Olemme iloisia arvioinneista, mikäli pidät sovelluksestamme.</string>
 </resources>
diff --git a/translations/store_strings-fil.xml b/translations/store_strings-fil.xml
index 60a84daf5..5665fb6c1 100644
--- a/translations/store_strings-fil.xml
+++ b/translations/store_strings-fil.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Isipin mo na ang buhay mo ay isang laro para lalo kang nagaganyak at mas oranisado!</string>
-  <string name="store_description">Ito na ang bagong app mula sa HabitRPG!  Ginawang muli upang maging maskaaya-aya at masmadaling gamitin.
-
-Ituring mo\'ng ang buhay mo ay parang isang laro upang ang paggawa ay mas organisado. Pinapasimple ng Habitica ang masayang paggawa at pag abot ng mga layunin.
-
-Ilagay lang ang mga nakaugalian, mga layunin sa bawat araw, at ang listahan ng mga kailangang tapusin, at gumawa nang gusto mong avatar.  Markahan ang natapos nang gawin upang maglevel-up ang iyong avatar, madadagdagan ang iba pang mga bahagi ng laro gaya ng mga sakbat, alaga, kasanayan at pati pa mga misyon!
-
-Nasa beta pa lang ito, kaya, huwag mag atubiling ipadala ang anumang mungkahi sa mobile@habitica.com!  At kung na eenjoy ka sa aming app, ikasisiya namin kung ihayag mo ang iyong pagsusuri.</string>
 </resources>
diff --git a/translations/store_strings-fr.xml b/translations/store_strings-fr.xml
index 168b84fb7..39a26f0d6 100644
--- a/translations/store_strings-fr.xml
+++ b/translations/store_strings-fr.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Traitez votre vie comme un jeu afin de rester motivé·e et organisé·e !</string>
-  <string name="store_description">La NOUVELLE application d\'HabitRPG ! Réécrite entièrement pour une expérience plus fluide et plus de contenu.
-
-Traitez votre vie comme un jeu pour rester motivé·e et organisé·e ! Habitica rend simple le fait de s\'amuser en accomplissant ses objectifs.
-
-Saisissez vos Habitudes, Tâches Quotidiennes et liste de Tâches à Faire, puis créez votre avatar personnalisé. Accomplissez vos tâches pour faire progresser votre avatar et débloquer du nouveau contenu, comme des armures, des familiers, des compétences et même des quêtes ! Combattez des monstres avec vos amis afin de vous responsabiliser mutuellement et utilisez votre or pour obtenir des récompenses dans le jeu, comme de l\'équipement, ou des récompenses personnalisées, comme regarder un épisode de votre série télé préférée. Flexible, social, et amusant, Habitica est le moyen parfait pour se motiver à accomplir n\'importe quel but.
-
-Nous sommes actuellement en phase beta alors, s\'il-vous-plaît, n\'hésitez pas à nous envoyez vos commentaires à mobile@habitica.com ! Et si vous aimez notre application, nous vous serions vraiment reconnaissant si vous nous laissiez un avis.</string>
 </resources>
diff --git a/translations/store_strings-he.xml b/translations/store_strings-he.xml
index 318b09778..0846093d7 100644
--- a/translations/store_strings-he.xml
+++ b/translations/store_strings-he.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">התייחסו אל חייכם כאל משחק כדי להשאר מאורגנים עם מוטיבציה!</string>
-  <string name="store_description">האפליקציה החדשה מ HabitRPG! נכתבה מחדש לחוויה חלקה ואפשרויות נוספות.
-
-התייחסו אל חייכם כמו אל משחק כדי להשאר מאורגנים ועם מוטיבציה! האביטיקה גורמת לכך שתהנו מהגעה ליעדים.
-
-הזינו את ההרגלים שלכם, את המטלות היומיות שתרצו לבצע, ואת רשימת המשימות שלכם, וצרו דמות משלכם. סמנו שסיימתם משימות כדי להעלות את הדמות שלכם דרגות ולאפשר יכולות כמו שריון, חיות מחמד, מיומנויות, ואפילו הרפתקאות! הלחמו במפלצות עם חברים כדי לשמור אחד על השני מחוייבים, והשתמשו בזהב כדי לרכוש פרסים בתוך המשחק, כמו ציוד, או תגמול שהתאמתם לעצמכם - כמו צפייה בפרק של תוכנית הטלוויזיה האהובה עליכם. גמיש, חברתי, וכיפי, האביטיקה היא הדרך המושלמת לדרבן את עצמכם להשיג כל דבר שהוא.
-
-אנחנו כרגע בתקופת ניסיון, אז בבקשה, תרגישו חופשיים לשלוח משוב ל mobile@habitica.com! ואם אתם נהנים מהאפליקציה שלנו, ממש נעריך אם תוכלו להשאיר עלינו סקירה.</string>
 </resources>
diff --git a/translations/store_strings-hr_HR.xml b/translations/store_strings-hr_HR.xml
index dbfce4112..f91e4dda2 100644
--- a/translations/store_strings-hr_HR.xml
+++ b/translations/store_strings-hr_HR.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Pretvorite život u igru da ostanete motivirani i organizirani!</string>
-  <string name="store_description">Nova aplikacija od HabitRPG-a! Ponovo napravljena od nule za bolje iskustvo s više funkcija. 
-
-Pretvorite život u igru da ostanete motivirani i organizirani! S Habiticom se jednostavno zabavljati dok ostvarujete ciljeve. 
-
-Unesite svoje Navike, Dnevne ciljeve i Popis obaveza te kreirajte vlastitog avatara. Označite zadatke da bi se avatar popeo na novu razinu i otključajte funkcije poput oklopa, ljubimaca, vještina te čak i potraga! Borite se protiv čudovišta s prijateljima da možete jedni druge držati na oku i iskoristite svoje zlato na nagrade unutar igre, poput opreme, ili na osobne nagrade kao gledanje epizode najdraže serije. Habitica je savršen način da se motivirate za ostvarivanje bilo čega jer je fleksibilna, društvena i zabavna. 
-
-Trenutno smo u beta izdanju i ako želite, molimo Vas da šaljete povratne informacije na mobile@habitica.com! Ako uživate u našoj aplikaciji, cijenili bismo da nam ostavite recenziju. </string>
 </resources>
diff --git a/translations/store_strings-id.xml b/translations/store_strings-id.xml
index 43d139fbf..5ab730e4e 100644
--- a/translations/store_strings-id.xml
+++ b/translations/store_strings-id.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Perlakukan hidupmu seperti permainan untuk tetap termotivasi dan terorganisir!</string>
-  <string name="store_description">Aplikasi BARU dari HabitRPG! Ditulis ulang dari awal untuk pengalaman yang lebih menyenangkan dan lebih banyak fitur.
-
-Perlakukan hidupmu seperti permainan untuk tetap termotivasi dan terorganisir! Habitica membuatmu lebih mudah untuk bersenang-senang sambil meraih tujuan.
-
-Masukkan poin Kebiasaanmu, Keseharianmu, dan daftar Tugasmu, lalu buatlah avatar unikmu. Centang selesai tugas untuk meningkatkan level avatarmu dan membuka fitur seperti pakaian, peliharaan, keahlian, dan bahkan misi! Lawan monster bersama teman-teman untuk dapat saling membantu, dan gunakan emas dalam game sebagai hadiah, seperti perlengkapan avatar, atau hadiah unik buatan, seperti menonton satu episode program TV favoritmu. Fleksibel, sosial, dan menyenangkan, Habitica adalah cara yang sempurna untuk memotivasi dirimu untuk mencapai apapun.
-
-Kami masih sedang dalam versi beta, jadi silahkan mengirimkan feedback ke mobile@habitica.com! Dan jika Anda menyukai aplikasi kami, kami akan sangat menghargai jika Anda memberikan kami review.</string>
 </resources>
diff --git a/translations/store_strings-it.xml b/translations/store_strings-it.xml
index 3283682f5..c3da95a67 100644
--- a/translations/store_strings-it.xml
+++ b/translations/store_strings-it.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="store_title">Trasforma le tue attività in un gioco</string>
   <string name="store_short_description">Trasforma la tua vita in un gioco di ruolo per affrontarla motivato ed organizzato.</string>
-  <string name="store_description">La NUOVA app di HabitRPG! Riscritta da zero per un\'esperienza più fluida e maggiori funzionalità.
-
-Trasforma la tua vita in un gioco di ruolo per essere organizzato e motivato! Con Habitica raggiungere i propri obiettivi non è mai stato così divertente.
+  <string name="store_description">Trasforma la tua vita in un gioco di ruolo per essere organizzato e motivato! Con Habitica raggiungere i propri obiettivi non è mai stato così divertente.
 
 Imposta le tue abitudini (Habit), i tuoi obiettivi giornalieri (Daily) e la tua lista di cose da fare (To-Do), poi crea il tuo avatar personalizzato. Completa le attività per far salire di livello il tuo avatar e sbloccare funzionalità come armature, animali, abilità e persino missioni! Combatti i mostri con i tuoi amici per aiutarvi a vicenda ad essere responsabili, e usa il tuo oro per ricompense in-game come pezzi di equipaggiamento, o ricompense personalizzate, ad esempio guardare un episodio della tua serie TV preferita. Flessibile, sociale e soprattutto divertente, Habitica è il modo perfetto per motivarti a fare qualsiasi cosa.
 
-Al momento siamo in fase beta, quindi sentitevi liberi di scrivere eventuali suggerimenti a mobile@habitica.com! E se vi piace la nostra app, saremmo davvero felici se ci lasciaste una recensione.</string>
+Se avete una qualsiasi domanda o dei suggerimenti, sentitevi liberi di scrivere a mobile@habitica.com! E se vi piace la nostra app, saremmo davvero felici se ci lasciaste una recensione.
+</string>
 </resources>
diff --git a/translations/store_strings-ja.xml b/translations/store_strings-ja.xml
index 99d081378..9c000d819 100644
--- a/translations/store_strings-ja.xml
+++ b/translations/store_strings-ja.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">自分の人生をゲーム化して、やる気の維持とやるべきことの整理をしよう!</string>
-  <string name="store_description">HabitRPG 発の新しいアプリです!　スムーズな操作性とより多くの機能を実現するために、ゼロから書き直しました。
-
-自分の人生をゲーム化して、やる気の維持とやるべきことの整理をしましょう!　Habitica は目標達成を楽しく簡単にします。
-
-習慣、毎日の目標、そしてTo-Do の一覧を入力し、お好みのアバターをつくりましょう。タスクをこなして、レベルを上げていくと、防具、ペット、スキルやクエストなどの機能をアンロックしていくこともできます!　責任をもちながら友達といっしょにモンスターと戦い、ゲーム内でゴールドを稼いで、アバターの装備や、「好きなテレビ番組の 1 話分」などの自分好みのごほうびを買うこともできます。柔軟で、ソーシャルで、楽しい――Habitica は、あなたがご自身の目標を達成するのを励ますカンペキな方法です。
-
-このアプリはまだベータ扱いにしています。ぜひお気軽に mobile@habitica.com あてにフィードバックをお寄せください!　そしてもしこのアプリをお楽しみいただけたなら、レビューを残していただけると、たいへんうれしいです。</string>
 </resources>
diff --git a/translations/store_strings-ko.xml b/translations/store_strings-ko.xml
index df4542387..62daface6 100644
--- a/translations/store_strings-ko.xml
+++ b/translations/store_strings-ko.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">인생을 게임처럼 즐기면서 동기를 부여하고 계획적인 삶을 사세요!</string>
-  <string name="store_description">HabitRPG의 새로운 앱! 개선된 게임환경과 더 많은 기능을 위해 처음부터 끝까지 싹 바뀌어 돌아왔습니다.
-
-인생을 게임처럼 다루어서 동기를 부여하고 계획적인 삶을 사세요! Habitica는 목표를 달성하는 동시에 재미를 느낄 수 있게 해줍니다.
-
-당신의 습관, 일일과제, 할 일을 입력하고 당신만의 아바타를 만드세요. 과제달성을 체크해서 아바타 레벨을 올리고 새로운 방어구, 펫, 스킬, 퀘스트를 잠금해제하세요! 서로의 과제달성에 책임감을 갖기 위해 친구와 함께 몬스터를 무찌르며, 각종 장비 등의 게임 속 보상 혹은 좋아하는 TV프로그램 보기와 같은 맞춤형 보상에 골드를 사용하세요. 맞춤서비스, 친목, 재미. 스스로 동기부여를 할 수 있게 하는 Habitica는 무언가를 달성하기 위한 최고의 방법입니다.
-
-아직 베타 버전 이므로, mobile@habitica.com 로 의견을 보내주시기 바랍니다! Habitica를 즐기고 계신다면 리뷰를 남겨주세요. 리뷰 하나하나가 큰 도움이 됩니다!</string>
 </resources>
diff --git a/translations/store_strings-lt.xml b/translations/store_strings-lt.xml
index 00cf9fad2..cf51ca7ac 100644
--- a/translations/store_strings-lt.xml
+++ b/translations/store_strings-lt.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Žiūrėk į savo gyvenimą kaip į žaidimą ir išlaikyk motyvaciją ir organizuotumą!</string>
-  <string name="store_description">Tai nauja HabitRPG komandos programėlė! Perkurta nuo pagrindų, kad būtų daug patogesnė ir malonesnė naudotis.
-
-Žiūrėk į savo gyvenimą kaip į žaidimą ir išlaikyk motyvaciją ir organizuotumą! Su Habitica gali lengvai linksmintis siekiant savo tikslų.
-
-Įrašyk Įpročius, kuriuos norėtum užtvirtint, Užduotis kurias tau reikia atlikt kartą ar kasdien ir susikurk savo veikėją. Žymint šias užduotis, tavo veikėjas tobulės ir atsidengs jam nauja apranga, augintiniai, sugebėjimai ir misijos! Kartu su draugais kovok su pabaisomis, taip padėdami vienas kitam išlikti atsakingais, ir leisk surinktą auksą tobulinti savo žaidėjui, ar savo susigalvotiems atpildamas kaip televizoriaus žiūrėjimas. Tai patogus, smagus ir socialus būdas save motyvuoti, kad pasiektum bet kokių užsibrėžtų tikslų.
-
-Kol kas tai yra beta versija, taigi mielai lauksime atsiliepimų mobile@habitica.com (anglų kalba)! Na ir jeigu patinka programėlė, būtume dėkingi, jei paliktum mums atsiliepimą.</string>
 </resources>
diff --git a/translations/store_strings-nl.xml b/translations/store_strings-nl.xml
index e94b11c5d..519c008ba 100644
--- a/translations/store_strings-nl.xml
+++ b/translations/store_strings-nl.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="store_title">Maak van je taken een spel</string>
   <string name="store_short_description">Behandel je leven alsof het een spel is en blijf gemotiveerd en georganiseerd!</string>
-  <string name="store_description">De NIEUWE app van Habitica! Compleet herschreven voor een soepele ervaring met nog meer mogelijkheden.
-
-Behandel je leven alsof het een spel is en blijf gemotiveerd en georganiseerd!
-
-Vul zelf je gewoontes, je dagelijkse doelen en je to-do lijst in, en creëer een persoonlijke avatar. Om niveaus omhoog te gaan maak je je taken af, en maak je mogelijkheden beschikbaar zoals: huisdieren, vaardigheden en zelfs queesten! Vecht met monsters met je vrienden om elkaar verantwoordelijk te houden, en gebruik je goud voor in-game beloningen, zoals uitrustingsstukken, of zelf gekozen prijzen, zoals een aflevering van je favoriete tv-show. Flexibel, sociaal, en leuk; Habitica is de perfecte manier om jezelf te motiveren om alles te bereiken.
-
-Op dit moment is de app in de bèta-fase, dus stuur vooral je feedback naar mobile@habitica.com! En als je plezier hebt aan onze app, vergeet dan niet een beoordeling in de app-store te schrijven.</string>
+  <string name="store_description">Behandel je leven als een spel om gemotiveerd en georganiseerd te blijven! Habitica houdt het simpel om plezier te maken terwijl je doelen bereikt.
+Voer je gewoontes, dagelijkse taken en to-do\'s toe en maak dan een eigen avatar. Vink taken af om je avatar sterker te maken en functies vrij te spelen zoals uitrusting, huisdieren, vaardigheden en zelfs queesten! Vecht tegen monsters met vrienden om samen verantwoordelijk te blijven en gebruik je goud voor beloningen, zoals uitrusting of kies je eigen beloning, zoals een aflevering van je favoriete serie bekijken. Flexibel, sociaal en plezant, Habitica is de perfecte manier om jezelf te motiveren om alles te bereiken.
+Als je vragen hebt kan je ze stellen bij mobile@habitica.com! En als je de app leuk vindt, waarderen we het als je ons een recensie nalaat.
+</string>
 </resources>
diff --git a/translations/store_strings-no.xml b/translations/store_strings-no.xml
index 292a6515c..3f0ac02fe 100644
--- a/translations/store_strings-no.xml
+++ b/translations/store_strings-no.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Se på livet ditt som et spill for å holde deg motivert og organisert!</string>
-  <string name="store_description">Den NYE appen fra HabitRPG! Skrevet om fra grunnen av for en bedre opplevelse og med flere funksjoner.
-
-Se på livet ditt som et spill for å holde deg motivert og organiset! Habitica gjør det lett å ha det gøy samtidig som du når målene dine.
-
-Sett inn dine Vaner, dine Daglige Gjøremål, og din Gjøremålsliste, for å så lage en tilpasset avatar. Kryss av gjøremål for å øke nivået på avataren din og lås opp funksjoner som rustning, kjæledyr, ferdigheter, og til og med oppdrag! Slåss mot monstre med venner for å holde hverandre ansvarlige, og bruk gullet ditt på belønninger i spillet, som utstyr eller egendefinerte belønninger, som å se en episode av det TV-programmet du liker best. Fleksibelt, sosialt og moro, Habitica er den perfekte måten å motivere deg selv til å oppnå hva som helst.
-
-Vi er for øyeblikket i beta-stadiet, så føl deg fri til å gi tilbakemeldinger via mobile@habitica.com! Hvis du liker appen vår hadde vi virkelig satt pris på om du skrev en anmeldelse.</string>
 </resources>
diff --git a/translations/store_strings-pl.xml b/translations/store_strings-pl.xml
index d882ff953..6ae5bdd36 100644
--- a/translations/store_strings-pl.xml
+++ b/translations/store_strings-pl.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Traktuj życie jak grę, będziesz zmotywowany i zorganizowany!</string>
-  <string name="store_description">Nowa aplikacja od HabitRPG! Przepisana od zera, bardziej przyjazna i z nowymi funkcjami.
-
-Traktuj życie jako grę, będziesz zmotywowany i zorganizowany!
-
-Wpisz swoje Nawyki, swoje Codzienne cele, swoją listę Do-Zrobienia i stwórz własnego awatara. Odhaczaj zadania, aby zdobywać poziomy swojej postaci i odblokować takie opcje jak pancerz, zwierzaczki, zdolności, a nawet misje! Walcz z potworami razem z przyjaciółmi, aby wzajemnie się motywować i zdobywać złoto oraz nagrody: ekwipunek, odznaczenia, bilet na odcinek Twojego ulubionego serialu. Przyjazny, społeczny i zabawny, Habitica jest doskonałym sposobem by zmotywować się i osiągać postawione sobie cele.
-
-Obecnie mamy wersję beta, tak więc wszelkie opinie i sugestie będą mile widziane - wyślij maila pod adres mobile@habitica.com! A jeśli podoba ci się nasza aplikacja, będziemy wdzięczni za ocenę!</string>
 </resources>
diff --git a/translations/store_strings-pt-rBR.xml b/translations/store_strings-pt-rBR.xml
index 9c57eae20..a257a6980 100644
--- a/translations/store_strings-pt-rBR.xml
+++ b/translations/store_strings-pt-rBR.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Trate sua vida como um jogo para se manter motivado e organizado!</string>
-  <string name="store_description">O NOVO app do HabitRPG! Reescrito do zero para uma experiência mais agradável e com mais recursos.
-
-Trate sua vida como um jogo para se manter motivado e organizado! Habitica torna fácil se divertir enquanto se atinge metas.
-
-Insira seus Hábitos, suas Ações Diárias e sua lista de Tarefas, e então crie seu avatar customizado. Realize suas tarefas para evoluir seu avatar e desbloquear recursos como armaduras, animais de estimação, habilidades e até missões! Lute contra monstros com seus amigos para cada um se manter disciplinado, e use seu ouro para recompensas dentro do jogo, como equipamentos ou recompensas customizadas, como assistir um episódio da sua série favorita. Flexível, social e divertido, Habitica é a maneira perfeita de se motivar para completar qualquer coisa.
-
-Nós estamos atualmente em versão beta, então por favor, sinta-se à vontade para enviar seus feedbacks para mobile@habitica.com! E se você gostar do nosso aplicativo, nós gostaríamos muito que você deixasse uma revisão.</string>
 </resources>
diff --git a/translations/store_strings-pt_PT.xml b/translations/store_strings-pt_PT.xml
index b6df236d2..9e3bff208 100644
--- a/translations/store_strings-pt_PT.xml
+++ b/translations/store_strings-pt_PT.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Trate a sua vida como um jogo para manter-se motivado e organizado!</string>
-  <string name="store_description">A NOVA aplicação de HabitRPG! recreada a partir do zero para uma melhor experiência e mais funcionalidades.
-
-Trate a sua vida como um jogo para manter-se motivado e organizado! O Habitica torna-a simples para se divertir enquanto cumpre os objetivos.
-
-Insira os seus Hábitos, os seus objetivos Diários, e a sua lista de Afazeres, e depois crie um avatar personalizado. Verifique as tarefas para o seu avatar subir de nível e desbloqueie funcionalidades, tais como armaduras, animais de estimação, habilidades, e até novos desafios! Luta contra monstros com os amigos para se manterem responsáveis, e utilize o seu ouro nas recompensas do jogo, tal como equipamento, ou prémios personalizados, tal como ver um episódio da sua série de TV favorita. Flexível, social e divertido, o Habitica é a forma perfeita para se motivar para atingir qualquer coisa.
-
-Atualmente nós estamos na fase beta, por isso, por favor, fique à vontade para nos enviar o seu comentário para mobile@habitica.com! E se gostar da nossa aplicação, nós apreciaríamos se nos deixasse a sua opinião.</string>
 </resources>
diff --git a/translations/store_strings-ru.xml b/translations/store_strings-ru.xml
index 2d91c83ef..caa24d590 100644
--- a/translations/store_strings-ru.xml
+++ b/translations/store_strings-ru.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="store_title">Игронезируйте ваши задачи</string>
   <string name="store_short_description">Живите играючи и развивайте мотивацию и организованность!</string>
-  <string name="store_description">НОВОЕ приложение от HabitRPG! Оно переписано с нуля, стало удобнее и функциональнее.
-
-Живите играючи и развивайте мотивацию и организованность! С Habitica Вы будете легко и с удовольствием достигать поставленных целей.
-
-Укажите Ваши Привычки, Ежедневные задания и Задачи и создайте собственного аватара. Отмечайте выполнение заданий, чтобы повышать уровень своего аватара и открывать новые возможности, такие как броня, питомцы, умения и даже квесты! Побеждайте монстров плечом к плечу с друзьями и тратьте заработанное золото на внутри-игровые награды, такие как экипировка, или же на придуманные самостоятельно, например просмотр очередного выпуска любимого телешоу. Гибкая, социальная и весёлая Habitica - это отличный способ мотивировать себя на что угодно.
-
-Мы пока ещё на стадии бета-тестирования, так что не стесняйтесь присылать Ваши замечания и предложения на mobile@habitica.com! А если приложение Вам понравилось, мы будем очень благодарны Вам за отзыв.</string>
+  <string name="store_description">Относитесь к своей жизни, как к игре, чтобы оставаться мотивированным и организованным! Habitica позволяет легко развлекаться при достижении целей.
+Введите свои привычки, свои ежедневные цели и список дел, а затем создайте собственный аватар. Выполняйте задачи, чтобы повысить уровень вашего аватара и разблокировать такие функции, как снаряжение, питомцы, навыки и даже квесты! Сражайтесь против монстрами с друзьями, чтобы поддержать друг друга , и использовать свое золото в игре в качестве поощрения, например, на экипировку или специальные награды, или даже на просмотр эпизода вашего любимого телешоу. Гибкая, социальная и веселая, Habitica - это идеальный способ мотивировать себя к чему-либо ».
+Если у вас есть какие-либо вопросы, не стесняйтесь отправлять их на mobile@habitica.com! А если вам понравится наше приложение, мы будем очень признательны, если вы оставите нам отзыв ».
+</string>
 </resources>
diff --git a/translations/store_strings-tr.xml b/translations/store_strings-tr.xml
index fcb48f49e..9cecce597 100644
--- a/translations/store_strings-tr.xml
+++ b/translations/store_strings-tr.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Hayatını motive ve düzenli kalmak için oyun gibi düzenle!</string>
-  <string name="store_description">HabitRPG’den YENİ bir uygulama! Daha iyi bir deneyim ve yeni özellikler için tepeden tırnağa yenilendi. 
-
-Harekete geçmek ve düzenli olmak için hayatını bir oyun olarak gör! Habitica, hedefine ulaşmanı eğlenceli hale getirerek kolaylaştırır.
-
-Alışkanlıklarını, Günlük İşlerini, ve Yapılacak İşlerini yaz, ardından avatarını özelleştir. Görevlerini yapıldı olarak işaretleyerek seviye atla ve zırh, hayvan, yetenek, ve görev gibi yeni özellikler aç! Birbirinizi sorumlu tutmak için arkadaşlarınla birlikte canavarlara karşı savaş; ekipman ve özelleştirilmiş ödüller gibi oyun içi ödüller için altınlarını harca. Esnetilebilir, sosyal, ve eğlenceli olan Habitica, harekete geçmen ve zorlukları başarman için mükkemel bir uygulamadır.
-
-Şu an beta sürümündeyiz, bu yüzden lütfen mobile@habitica.com adresine geri bildirim göndermeyi unutma! Eğer uygulamayı yararlı bulursan, değerlendirmen bizi çok mutlu edecektir.</string>
 </resources>
diff --git a/translations/store_strings-zh-Hans.xml b/translations/store_strings-zh-Hans.xml
index 5bfcd07e7..a30094a87 100644
--- a/translations/store_strings-zh-Hans.xml
+++ b/translations/store_strings-zh-Hans.xml
@@ -1,11 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">把生活当游戏玩，保持积极与条理性！</string>
-  <string name="store_description">HabitRPG最新APP！更流畅的体验与更多的功能。
-
-把生活当成游戏玩，保持积极与条理！Habitica让你简单地边玩边完成目标。
-
-输入你的“习惯”、“每日目标”和“要做的事情”，再创造个角色。完成任务就能升级，并将武装、宠物、技能、任务等功能解锁！与朋友做任务确保彼此负责任，并用金币买游戏内的奖励，如装备，或自定奖励，如看一集你最喜欢的电视节目。Habitica是灵活的、社交的、好玩的，是鼓励自己完成任何事最棒的方法。
-
-APP还在测试中，所以请反馈至mobile@habitica.com！喜欢我们APP也请留个好评，我们会很感激。</string>
 </resources>
diff --git a/translations/store_strings-zh-rTW.xml b/translations/store_strings-zh-rTW.xml
index 11aa402e6..f8c383932 100644
--- a/translations/store_strings-zh-rTW.xml
+++ b/translations/store_strings-zh-rTW.xml
@@ -1,8 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">生活即遊戲，保持動力，讓生活井井有條！</string>
-  <string name="store_description">這是源自 HabitRPG 的全新應用！ 全新應用給你帶來更流暢的體驗和更多的特色。
-生活即遊戲，讓自己保持動力，生活井井有條！Habitica 令你在實現目標的過程中獲得更多樂趣。
-導入你的習慣，日常目標與你的待辦事項，在遊戲中創造自己的化身。檢查核對自己的任務令自己的化身等級提升，解鎖新的獎勵，比如得到盔甲 ，獲得寵物，施放技能，解鎖任務。與朋友一同大戰怪獸，承擔每個人的責任。你的金幣可以用在游戲內獎勵中，比如裝備，或者是個人習慣的獎勵，例如觀看一集電視劇。靈活機動，團隊協作，獲得樂趣。Habitica 是激勵自己完成任何事的最佳方案。
-我們目前仍在測試版，因此不要吝惜你的任何意見將它們發送至mobile@habitica.com！另外如果你真的喜歡我們的應用，歡迎你的評論。</string>
 </resources>