diff --git a/.travis.yml b/.travis.yml
index f8dcfb42e..eb3628d65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-24.0.3
+    - build-tools-25.0.2
 
     # The SDK version used to compile your project
     - android-25
diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 8974ca9dd..56207f35e 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="164"
+    android:versionCode="165"
     android:versionName="1.0"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
@@ -20,7 +20,6 @@
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" tools:node="remove" />
 
     <application
         android:name=".HabiticaApplication"
@@ -32,6 +31,7 @@
         <activity
             android:name=".ui.activities.MainActivity"
             android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar.Transparent"
             android:windowSoftInputMode="stateHidden|adjustPan"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -49,12 +49,13 @@
         <activity
             android:name=".ui.activities.LoginActivity"
             android:label="@string/LoginActivityName"
-            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:theme="@style/AppTheme.NoActionBar.Transparent"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait">
         </activity>
         <activity
             android:name=".ui.activities.IntroActivity"
+            android:theme="@style/AppTheme.NoActionBar.Transparent"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait">
         </activity>
diff --git a/Habitica/assets/migrations/Habitica/34.sql b/Habitica/assets/migrations/Habitica/34.sql
new file mode 100644
index 000000000..c681bfa53
--- /dev/null
+++ b/Habitica/assets/migrations/Habitica/34.sql
@@ -0,0 +1 @@
+ALTER TABLE ItemData ADD COLUMN specialClass varchar(255);
\ No newline at end of file
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 6d3c1b133..80c2fde71 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -65,13 +65,13 @@ dependencies {
     apt 'com.google.dagger:dagger-compiler:2.8'
     provided 'org.glassfish:javax.annotation:10.0-b28'
     //App Compatibility and Material Design
-    compile('com.mikepenz:materialdrawer:5.3.6@aar') {
+    compile('com.mikepenz:materialdrawer:5.8.3@aar') {
         transitive = true
     }
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile 'com.android.support:design:25.3.0'
-    compile 'com.android.support:recyclerview-v7:25.3.0'
-    compile 'com.android.support:preference-v14:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:preference-v14:25.3.1'
     compile 'com.android.support:multidex:1.0.1'
 
     //QR Code
@@ -147,6 +147,8 @@ dependencies {
 
     compile 'org.apmem.tools:layouts:1.10@aar'
 
+    compile 'com.roughike:bottom-bar:2.2.0'
+
     compile(project(':seeds-sdk')) {
         exclude group: 'com.google.android.gms'
         exclude group: 'com.android.support', module: 'multidex'
diff --git a/Habitica/res/drawable-hdpi/creator_active_pixel_arrow_left.png b/Habitica/res/drawable-hdpi/creator_active_pixel_arrow_left.png
new file mode 100644
index 000000000..d08bca2ca
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_active_pixel_arrow_left.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_active_pixel_arrow_right.png b/Habitica/res/drawable-hdpi/creator_active_pixel_arrow_right.png
new file mode 100644
index 000000000..8e8daaaee
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_active_pixel_arrow_right.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_chair_black.png b/Habitica/res/drawable-hdpi/creator_chair_black.png
new file mode 100644
index 000000000..5f3c1c6e9
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_chair_black.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_chair_blue.png b/Habitica/res/drawable-hdpi/creator_chair_blue.png
new file mode 100644
index 000000000..1a8b743e7
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_chair_blue.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_chair_green.png b/Habitica/res/drawable-hdpi/creator_chair_green.png
new file mode 100644
index 000000000..21ed91167
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_chair_green.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_chair_pink.png b/Habitica/res/drawable-hdpi/creator_chair_pink.png
new file mode 100644
index 000000000..c95baccda
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_chair_pink.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_chair_red.png b/Habitica/res/drawable-hdpi/creator_chair_red.png
new file mode 100644
index 000000000..5a425b104
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_chair_red.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_chair_yellow.png b/Habitica/res/drawable-hdpi/creator_chair_yellow.png
new file mode 100644
index 000000000..8a6d30f0c
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_chair_yellow.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_eyewear_special_blacktopframe.png b/Habitica/res/drawable-hdpi/creator_eyewear_special_blacktopframe.png
new file mode 100644
index 000000000..0c5d63ceb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_eyewear_special_blacktopframe.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_eyewear_special_bluetopframe.png b/Habitica/res/drawable-hdpi/creator_eyewear_special_bluetopframe.png
new file mode 100644
index 000000000..fdda988f9
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_eyewear_special_bluetopframe.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_eyewear_special_greentopframe.png b/Habitica/res/drawable-hdpi/creator_eyewear_special_greentopframe.png
new file mode 100644
index 000000000..1e7ef055b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_eyewear_special_greentopframe.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_eyewear_special_pinktopframe.png b/Habitica/res/drawable-hdpi/creator_eyewear_special_pinktopframe.png
new file mode 100644
index 000000000..9fb75153c
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_eyewear_special_pinktopframe.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_eyewear_special_redtopframe.png b/Habitica/res/drawable-hdpi/creator_eyewear_special_redtopframe.png
new file mode 100644
index 000000000..b4bacb023
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_eyewear_special_redtopframe.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_eyewear_special_whitetopframe.png b/Habitica/res/drawable-hdpi/creator_eyewear_special_whitetopframe.png
new file mode 100644
index 000000000..49cb6192e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_eyewear_special_whitetopframe.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_eyewear_special_yellowtopframe.png b/Habitica/res/drawable-hdpi/creator_eyewear_special_yellowtopframe.png
new file mode 100644
index 000000000..5611bbdca
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_eyewear_special_yellowtopframe.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_black.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_black.png
new file mode 100644
index 000000000..4b7d56cd9
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_black.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_blond.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_blond.png
new file mode 100644
index 000000000..64d903f1e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_blond.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_brown.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_brown.png
new file mode 100644
index 000000000..5e3628870
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_brown.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png
new file mode 100644
index 000000000..a6fd91d7e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_3_black.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_black.png
new file mode 100644
index 000000000..59766b8ea
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_black.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_3_blond.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_blond.png
new file mode 100644
index 000000000..4b65e1998
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_blond.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_3_brown.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_brown.png
new file mode 100644
index 000000000..e8266374e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_brown.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_3_white.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_white.png
new file mode 100644
index 000000000..dfa0850b9
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_white.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_1_black.png b/Habitica/res/drawable-hdpi/creator_hair_base_1_black.png
new file mode 100644
index 000000000..e78c9288b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_1_black.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_1_blond.png b/Habitica/res/drawable-hdpi/creator_hair_base_1_blond.png
new file mode 100644
index 000000000..6ee18f7dc
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_1_blond.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_1_brown.png b/Habitica/res/drawable-hdpi/creator_hair_base_1_brown.png
new file mode 100644
index 000000000..2a92f4d64
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_1_brown.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_1_red.png b/Habitica/res/drawable-hdpi/creator_hair_base_1_red.png
new file mode 100644
index 000000000..32aa1ba53
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_1_red.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_1_white.png b/Habitica/res/drawable-hdpi/creator_hair_base_1_white.png
new file mode 100644
index 000000000..e4fbfdae5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_1_white.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_3_black.png b/Habitica/res/drawable-hdpi/creator_hair_base_3_black.png
new file mode 100644
index 000000000..ae59817e8
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_3_black.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_3_blond.png b/Habitica/res/drawable-hdpi/creator_hair_base_3_blond.png
new file mode 100644
index 000000000..d3579337b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_3_blond.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_3_brown.png b/Habitica/res/drawable-hdpi/creator_hair_base_3_brown.png
new file mode 100644
index 000000000..8017071ed
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_3_brown.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_3_red.png b/Habitica/res/drawable-hdpi/creator_hair_base_3_red.png
new file mode 100644
index 000000000..3f59b681f
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_3_red.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_base_3_white.png b/Habitica/res/drawable-hdpi/creator_hair_base_3_white.png
new file mode 100644
index 000000000..e393138df
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_base_3_white.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_flower_1.png b/Habitica/res/drawable-hdpi/creator_hair_flower_1.png
new file mode 100644
index 000000000..8574b98e9
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_flower_1.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_flower_2.png b/Habitica/res/drawable-hdpi/creator_hair_flower_2.png
new file mode 100644
index 000000000..f6dccade2
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_flower_2.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_flower_3.png b/Habitica/res/drawable-hdpi/creator_hair_flower_3.png
new file mode 100644
index 000000000..d3ff5931b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_flower_3.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_flower_4.png b/Habitica/res/drawable-hdpi/creator_hair_flower_4.png
new file mode 100644
index 000000000..6bcb69859
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_flower_4.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_flower_5.png b/Habitica/res/drawable-hdpi/creator_hair_flower_5.png
new file mode 100644
index 000000000..21542fc20
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_flower_5.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_flower_6.png b/Habitica/res/drawable-hdpi/creator_hair_flower_6.png
new file mode 100644
index 000000000..026b918c6
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_flower_6.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_inactive_pixel_arrow_left.png b/Habitica/res/drawable-hdpi/creator_inactive_pixel_arrow_left.png
new file mode 100644
index 000000000..813b25a8f
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_inactive_pixel_arrow_left.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_inactive_pixel_arrow_right.png b/Habitica/res/drawable-hdpi/creator_inactive_pixel_arrow_right.png
new file mode 100644
index 000000000..2485fe011
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_inactive_pixel_arrow_right.png differ
diff --git a/Habitica/res/drawable-hdpi/customization_selection_caret.png b/Habitica/res/drawable-hdpi/customization_selection_caret.png
new file mode 100644
index 000000000..fa86eeb87
Binary files /dev/null and b/Habitica/res/drawable-hdpi/customization_selection_caret.png differ
diff --git a/Habitica/res/drawable-hdpi/customization_shadow.png b/Habitica/res/drawable-hdpi/customization_shadow.png
new file mode 100644
index 000000000..bbadb9767
Binary files /dev/null and b/Habitica/res/drawable-hdpi/customization_shadow.png differ
diff --git a/Habitica/res/drawable-hdpi/diamond_button.9.png b/Habitica/res/drawable-hdpi/diamond_button.9.png
new file mode 100644
index 000000000..c6e7621e2
Binary files /dev/null and b/Habitica/res/drawable-hdpi/diamond_button.9.png differ
diff --git a/Habitica/res/drawable-hdpi/diamond_button_white.9.png b/Habitica/res/drawable-hdpi/diamond_button_white.9.png
new file mode 100644
index 000000000..f2890c15c
Binary files /dev/null and b/Habitica/res/drawable-hdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_arrow_back_white_36dp.png b/Habitica/res/drawable-hdpi/ic_arrow_back_white_36dp.png
new file mode 100644
index 000000000..a98105a5b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_arrow_back_white_36dp.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_body.png b/Habitica/res/drawable-hdpi/icon_body.png
index 3d232abd3..866d24303 100644
Binary files a/Habitica/res/drawable-hdpi/icon_body.png and b/Habitica/res/drawable-hdpi/icon_body.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_dailies_selected.png b/Habitica/res/drawable-hdpi/icon_dailies_selected.png
new file mode 100644
index 000000000..6bedff84e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_dailies_selected.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_dailies_unselected.png b/Habitica/res/drawable-hdpi/icon_dailies_unselected.png
new file mode 100644
index 000000000..65e251861
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_dailies_unselected.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_extras.png b/Habitica/res/drawable-hdpi/icon_extras.png
index 10a3183e6..3e576f747 100644
Binary files a/Habitica/res/drawable-hdpi/icon_extras.png and b/Habitica/res/drawable-hdpi/icon_extras.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_habits_selected.png b/Habitica/res/drawable-hdpi/icon_habits_selected.png
new file mode 100644
index 000000000..fe7b6c4e3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_habits_selected.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_habits_unselected.png b/Habitica/res/drawable-hdpi/icon_habits_unselected.png
new file mode 100644
index 000000000..7a7b1b341
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_habits_unselected.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_hair.png b/Habitica/res/drawable-hdpi/icon_hair.png
index 0ba99efa9..ff6899a2e 100644
Binary files a/Habitica/res/drawable-hdpi/icon_hair.png and b/Habitica/res/drawable-hdpi/icon_hair.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_rewards_selected.png b/Habitica/res/drawable-hdpi/icon_rewards_selected.png
new file mode 100644
index 000000000..b50adf623
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_rewards_selected.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_rewards_unselected.png b/Habitica/res/drawable-hdpi/icon_rewards_unselected.png
new file mode 100644
index 000000000..77f635219
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_rewards_unselected.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_skin.png b/Habitica/res/drawable-hdpi/icon_skin.png
index 350b486b4..9fcb56b2a 100644
Binary files a/Habitica/res/drawable-hdpi/icon_skin.png and b/Habitica/res/drawable-hdpi/icon_skin.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_todos_selected.png b/Habitica/res/drawable-hdpi/icon_todos_selected.png
new file mode 100644
index 000000000..d08ca6144
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_todos_selected.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_todos_unselected.png b/Habitica/res/drawable-hdpi/icon_todos_unselected.png
new file mode 100644
index 000000000..ea3c97d65
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_todos_unselected.png differ
diff --git a/Habitica/res/drawable-hdpi/login_background.png b/Habitica/res/drawable-hdpi/login_background.png
deleted file mode 100644
index 8f9ec6870..000000000
Binary files a/Habitica/res/drawable-hdpi/login_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/npc_justin_only.png b/Habitica/res/drawable-hdpi/npc_justin_only.png
new file mode 100644
index 000000000..55278fcae
Binary files /dev/null and b/Habitica/res/drawable-hdpi/npc_justin_only.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_active_pixel_arrow_left.png b/Habitica/res/drawable-mdpi/creator_active_pixel_arrow_left.png
new file mode 100644
index 000000000..96eabe024
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_active_pixel_arrow_left.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_active_pixel_arrow_right.png b/Habitica/res/drawable-mdpi/creator_active_pixel_arrow_right.png
new file mode 100644
index 000000000..c4132a0ff
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_active_pixel_arrow_right.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_chair_black.png b/Habitica/res/drawable-mdpi/creator_chair_black.png
new file mode 100644
index 000000000..19fe714b1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_chair_black.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_chair_blue.png b/Habitica/res/drawable-mdpi/creator_chair_blue.png
new file mode 100644
index 000000000..028d1f434
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_chair_blue.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_chair_green.png b/Habitica/res/drawable-mdpi/creator_chair_green.png
new file mode 100644
index 000000000..874698e2d
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_chair_green.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_chair_pink.png b/Habitica/res/drawable-mdpi/creator_chair_pink.png
new file mode 100644
index 000000000..348c04889
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_chair_pink.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_chair_red.png b/Habitica/res/drawable-mdpi/creator_chair_red.png
new file mode 100644
index 000000000..9ea70953a
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_chair_red.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_chair_yellow.png b/Habitica/res/drawable-mdpi/creator_chair_yellow.png
new file mode 100644
index 000000000..a21956113
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_chair_yellow.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_eyewear_special_blacktopframe.png b/Habitica/res/drawable-mdpi/creator_eyewear_special_blacktopframe.png
new file mode 100644
index 000000000..8bd7b3731
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_eyewear_special_blacktopframe.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_eyewear_special_bluetopframe.png b/Habitica/res/drawable-mdpi/creator_eyewear_special_bluetopframe.png
new file mode 100644
index 000000000..68ea8318e
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_eyewear_special_bluetopframe.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_eyewear_special_greentopframe.png b/Habitica/res/drawable-mdpi/creator_eyewear_special_greentopframe.png
new file mode 100644
index 000000000..a48e2c9b6
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_eyewear_special_greentopframe.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_eyewear_special_pinktopframe.png b/Habitica/res/drawable-mdpi/creator_eyewear_special_pinktopframe.png
new file mode 100644
index 000000000..8ec512f1b
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_eyewear_special_pinktopframe.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_eyewear_special_redtopframe.png b/Habitica/res/drawable-mdpi/creator_eyewear_special_redtopframe.png
new file mode 100644
index 000000000..7bf30d3b3
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_eyewear_special_redtopframe.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_eyewear_special_whitetopframe.png b/Habitica/res/drawable-mdpi/creator_eyewear_special_whitetopframe.png
new file mode 100644
index 000000000..c7cadefcc
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_eyewear_special_whitetopframe.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_eyewear_special_yellowtopframe.png b/Habitica/res/drawable-mdpi/creator_eyewear_special_yellowtopframe.png
new file mode 100644
index 000000000..4c002d642
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_eyewear_special_yellowtopframe.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_2_blond.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_blond.png
new file mode 100644
index 000000000..7a158a872
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_blond.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_2_brown.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_brown.png
new file mode 100644
index 000000000..195da7d7e
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_brown.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_2_white.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_white.png
new file mode 100644
index 000000000..40e3d8c05
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_white.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_3_black.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_black.png
new file mode 100644
index 000000000..81ed3ddae
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_black.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_3_blond.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_blond.png
new file mode 100644
index 000000000..a2d5f0de8
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_blond.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_3_brown.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_brown.png
new file mode 100644
index 000000000..045d5a6c2
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_brown.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_3_white.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_white.png
new file mode 100644
index 000000000..4b16f914f
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_white.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_1_black.png b/Habitica/res/drawable-mdpi/creator_hair_base_1_black.png
new file mode 100644
index 000000000..aa3b50bb1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_1_black.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_1_blond.png b/Habitica/res/drawable-mdpi/creator_hair_base_1_blond.png
new file mode 100644
index 000000000..6d6fcf107
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_1_blond.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_1_brown.png b/Habitica/res/drawable-mdpi/creator_hair_base_1_brown.png
new file mode 100644
index 000000000..3be098cb9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_1_brown.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_1_red.png b/Habitica/res/drawable-mdpi/creator_hair_base_1_red.png
new file mode 100644
index 000000000..0f546030a
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_1_red.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_1_white.png b/Habitica/res/drawable-mdpi/creator_hair_base_1_white.png
new file mode 100644
index 000000000..10e8b07ba
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_1_white.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_3_black.png b/Habitica/res/drawable-mdpi/creator_hair_base_3_black.png
new file mode 100644
index 000000000..8072bd6df
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_3_black.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_3_blond.png b/Habitica/res/drawable-mdpi/creator_hair_base_3_blond.png
new file mode 100644
index 000000000..8b5c870b9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_3_blond.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_3_brown.png b/Habitica/res/drawable-mdpi/creator_hair_base_3_brown.png
new file mode 100644
index 000000000..e8122b547
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_3_brown.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_3_red.png b/Habitica/res/drawable-mdpi/creator_hair_base_3_red.png
new file mode 100644
index 000000000..6a0e1b41f
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_3_red.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_base_3_white.png b/Habitica/res/drawable-mdpi/creator_hair_base_3_white.png
new file mode 100644
index 000000000..42add9a7d
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_base_3_white.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_flower_1.png b/Habitica/res/drawable-mdpi/creator_hair_flower_1.png
new file mode 100644
index 000000000..e17fe3a83
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_flower_1.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_flower_2.png b/Habitica/res/drawable-mdpi/creator_hair_flower_2.png
new file mode 100644
index 000000000..61c7de499
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_flower_2.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_flower_3.png b/Habitica/res/drawable-mdpi/creator_hair_flower_3.png
new file mode 100644
index 000000000..e94a2d31f
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_flower_3.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_flower_4.png b/Habitica/res/drawable-mdpi/creator_hair_flower_4.png
new file mode 100644
index 000000000..653b992d6
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_flower_4.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_flower_5.png b/Habitica/res/drawable-mdpi/creator_hair_flower_5.png
new file mode 100644
index 000000000..b82bfcd0a
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_flower_5.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_flower_6.png b/Habitica/res/drawable-mdpi/creator_hair_flower_6.png
new file mode 100644
index 000000000..95d9b3b4c
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_flower_6.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_inactive_pixel_arrow_left.png b/Habitica/res/drawable-mdpi/creator_inactive_pixel_arrow_left.png
new file mode 100644
index 000000000..d4400a151
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_inactive_pixel_arrow_left.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_inactive_pixel_arrow_right.png b/Habitica/res/drawable-mdpi/creator_inactive_pixel_arrow_right.png
new file mode 100644
index 000000000..e14eb4825
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_inactive_pixel_arrow_right.png differ
diff --git a/Habitica/res/drawable-mdpi/customization_selection_caret.png b/Habitica/res/drawable-mdpi/customization_selection_caret.png
new file mode 100644
index 000000000..67e45dc1a
Binary files /dev/null and b/Habitica/res/drawable-mdpi/customization_selection_caret.png differ
diff --git a/Habitica/res/drawable-mdpi/customization_shadow.png b/Habitica/res/drawable-mdpi/customization_shadow.png
new file mode 100644
index 000000000..9e90961fd
Binary files /dev/null and b/Habitica/res/drawable-mdpi/customization_shadow.png differ
diff --git a/Habitica/res/drawable-mdpi/diamond_button.9.png b/Habitica/res/drawable-mdpi/diamond_button.9.png
new file mode 100644
index 000000000..257a3ccd0
Binary files /dev/null and b/Habitica/res/drawable-mdpi/diamond_button.9.png differ
diff --git a/Habitica/res/drawable-mdpi/diamond_button_white.9.png b/Habitica/res/drawable-mdpi/diamond_button_white.9.png
new file mode 100644
index 000000000..699149917
Binary files /dev/null and b/Habitica/res/drawable-mdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_arrow_back_white_36dp.png b/Habitica/res/drawable-mdpi/ic_arrow_back_white_36dp.png
new file mode 100644
index 000000000..de3bc348f
Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_arrow_back_white_36dp.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_body.png b/Habitica/res/drawable-mdpi/icon_body.png
index 80e7f3bc8..165570b80 100644
Binary files a/Habitica/res/drawable-mdpi/icon_body.png and b/Habitica/res/drawable-mdpi/icon_body.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_dailies_selected.png b/Habitica/res/drawable-mdpi/icon_dailies_selected.png
new file mode 100644
index 000000000..e0bc74f72
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_dailies_selected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_dailies_unselected.png b/Habitica/res/drawable-mdpi/icon_dailies_unselected.png
new file mode 100644
index 000000000..bf38e5998
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_dailies_unselected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_extras.png b/Habitica/res/drawable-mdpi/icon_extras.png
index e896c03ec..1dfeb3955 100644
Binary files a/Habitica/res/drawable-mdpi/icon_extras.png and b/Habitica/res/drawable-mdpi/icon_extras.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_habits_selected.png b/Habitica/res/drawable-mdpi/icon_habits_selected.png
new file mode 100644
index 000000000..0e87d683b
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_habits_selected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_habits_unselected.png b/Habitica/res/drawable-mdpi/icon_habits_unselected.png
new file mode 100644
index 000000000..b7f6091aa
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_habits_unselected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_hair.png b/Habitica/res/drawable-mdpi/icon_hair.png
index 81e3951a1..926151692 100644
Binary files a/Habitica/res/drawable-mdpi/icon_hair.png and b/Habitica/res/drawable-mdpi/icon_hair.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_rewards_selected.png b/Habitica/res/drawable-mdpi/icon_rewards_selected.png
new file mode 100644
index 000000000..902434134
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_rewards_selected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_rewards_unselected.png b/Habitica/res/drawable-mdpi/icon_rewards_unselected.png
new file mode 100644
index 000000000..11bc9736a
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_rewards_unselected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_skin.png b/Habitica/res/drawable-mdpi/icon_skin.png
index c006648bf..3f70a5280 100644
Binary files a/Habitica/res/drawable-mdpi/icon_skin.png and b/Habitica/res/drawable-mdpi/icon_skin.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_todos_selected.png b/Habitica/res/drawable-mdpi/icon_todos_selected.png
new file mode 100644
index 000000000..e1bfc0d43
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_todos_selected.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_todos_unselected.png b/Habitica/res/drawable-mdpi/icon_todos_unselected.png
new file mode 100644
index 000000000..4058fbff8
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_todos_unselected.png differ
diff --git a/Habitica/res/drawable-mdpi/login_background.png b/Habitica/res/drawable-mdpi/login_background.png
index dcc6047da..5da3913eb 100644
Binary files a/Habitica/res/drawable-mdpi/login_background.png and b/Habitica/res/drawable-mdpi/login_background.png differ
diff --git a/Habitica/res/drawable-mdpi/npc_justin_only.png b/Habitica/res/drawable-mdpi/npc_justin_only.png
new file mode 100644
index 000000000..bc79a1835
Binary files /dev/null and b/Habitica/res/drawable-mdpi/npc_justin_only.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_active_pixel_arrow_left.png b/Habitica/res/drawable-xhdpi/creator_active_pixel_arrow_left.png
new file mode 100644
index 000000000..1c4a9ed38
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_active_pixel_arrow_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_active_pixel_arrow_right.png b/Habitica/res/drawable-xhdpi/creator_active_pixel_arrow_right.png
new file mode 100644
index 000000000..356df4b21
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_active_pixel_arrow_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_chair_black.png b/Habitica/res/drawable-xhdpi/creator_chair_black.png
new file mode 100644
index 000000000..ad9109725
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_chair_black.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_chair_blue.png b/Habitica/res/drawable-xhdpi/creator_chair_blue.png
new file mode 100644
index 000000000..be7c85990
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_chair_blue.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_chair_green.png b/Habitica/res/drawable-xhdpi/creator_chair_green.png
new file mode 100644
index 000000000..f6bde888d
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_chair_green.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_chair_pink.png b/Habitica/res/drawable-xhdpi/creator_chair_pink.png
new file mode 100644
index 000000000..4337cd35f
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_chair_pink.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_chair_red.png b/Habitica/res/drawable-xhdpi/creator_chair_red.png
new file mode 100644
index 000000000..ee02e5152
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_chair_red.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_chair_yellow.png b/Habitica/res/drawable-xhdpi/creator_chair_yellow.png
new file mode 100644
index 000000000..61b617428
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_chair_yellow.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_eyewear_special_blacktopframe.png b/Habitica/res/drawable-xhdpi/creator_eyewear_special_blacktopframe.png
new file mode 100644
index 000000000..b8688ef70
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_eyewear_special_blacktopframe.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_eyewear_special_bluetopframe.png b/Habitica/res/drawable-xhdpi/creator_eyewear_special_bluetopframe.png
new file mode 100644
index 000000000..fe16fcd00
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_eyewear_special_bluetopframe.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_eyewear_special_greentopframe.png b/Habitica/res/drawable-xhdpi/creator_eyewear_special_greentopframe.png
new file mode 100644
index 000000000..5280ca820
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_eyewear_special_greentopframe.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_eyewear_special_pinktopframe.png b/Habitica/res/drawable-xhdpi/creator_eyewear_special_pinktopframe.png
new file mode 100644
index 000000000..413e32645
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_eyewear_special_pinktopframe.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_eyewear_special_redtopframe.png b/Habitica/res/drawable-xhdpi/creator_eyewear_special_redtopframe.png
new file mode 100644
index 000000000..31d948ea2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_eyewear_special_redtopframe.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_eyewear_special_whitetopframe.png b/Habitica/res/drawable-xhdpi/creator_eyewear_special_whitetopframe.png
new file mode 100644
index 000000000..3aa6e9646
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_eyewear_special_whitetopframe.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_eyewear_special_yellowtopframe.png b/Habitica/res/drawable-xhdpi/creator_eyewear_special_yellowtopframe.png
new file mode 100644
index 000000000..581f10499
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_eyewear_special_yellowtopframe.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_black.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_black.png
new file mode 100644
index 000000000..9ba6e5c18
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_black.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_blond.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_blond.png
new file mode 100644
index 000000000..f58722310
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_blond.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_brown.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_brown.png
new file mode 100644
index 000000000..db8bb4cd8
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_brown.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_white.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_white.png
new file mode 100644
index 000000000..cb3dd6927
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_white.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_black.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_black.png
new file mode 100644
index 000000000..dc6cf9d07
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_black.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_blond.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_blond.png
new file mode 100644
index 000000000..bef911a0a
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_blond.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_brown.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_brown.png
new file mode 100644
index 000000000..df35aeeca
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_brown.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_white.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_white.png
new file mode 100644
index 000000000..95bad2a57
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_white.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_1_black.png b/Habitica/res/drawable-xhdpi/creator_hair_base_1_black.png
new file mode 100644
index 000000000..3c8686e7d
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_1_black.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_1_blond.png b/Habitica/res/drawable-xhdpi/creator_hair_base_1_blond.png
new file mode 100644
index 000000000..04cf2562e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_1_blond.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_1_brown.png b/Habitica/res/drawable-xhdpi/creator_hair_base_1_brown.png
new file mode 100644
index 000000000..d05c8b5c2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_1_brown.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_1_red.png b/Habitica/res/drawable-xhdpi/creator_hair_base_1_red.png
new file mode 100644
index 000000000..30ce977f4
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_1_red.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_1_white.png b/Habitica/res/drawable-xhdpi/creator_hair_base_1_white.png
new file mode 100644
index 000000000..7e54260cb
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_1_white.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_3_black.png b/Habitica/res/drawable-xhdpi/creator_hair_base_3_black.png
new file mode 100644
index 000000000..8e2d482c2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_3_black.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_3_blond.png b/Habitica/res/drawable-xhdpi/creator_hair_base_3_blond.png
new file mode 100644
index 000000000..97f7159d2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_3_blond.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_3_brown.png b/Habitica/res/drawable-xhdpi/creator_hair_base_3_brown.png
new file mode 100644
index 000000000..3b3f1d6f0
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_3_brown.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_3_red.png b/Habitica/res/drawable-xhdpi/creator_hair_base_3_red.png
new file mode 100644
index 000000000..baab0ae6c
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_3_red.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_base_3_white.png b/Habitica/res/drawable-xhdpi/creator_hair_base_3_white.png
new file mode 100644
index 000000000..edd5a0ef9
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_base_3_white.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_flower_1.png b/Habitica/res/drawable-xhdpi/creator_hair_flower_1.png
new file mode 100644
index 000000000..afc973b24
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_flower_1.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_flower_2.png b/Habitica/res/drawable-xhdpi/creator_hair_flower_2.png
new file mode 100644
index 000000000..89375355c
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_flower_2.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_flower_3.png b/Habitica/res/drawable-xhdpi/creator_hair_flower_3.png
new file mode 100644
index 000000000..e32f81f8a
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_flower_3.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_flower_4.png b/Habitica/res/drawable-xhdpi/creator_hair_flower_4.png
new file mode 100644
index 000000000..338139bfb
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_flower_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_flower_5.png b/Habitica/res/drawable-xhdpi/creator_hair_flower_5.png
new file mode 100644
index 000000000..c8275311d
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_flower_5.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_flower_6.png b/Habitica/res/drawable-xhdpi/creator_hair_flower_6.png
new file mode 100644
index 000000000..cd3d30e7d
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_flower_6.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_inactive_pixel_arrow_left.png b/Habitica/res/drawable-xhdpi/creator_inactive_pixel_arrow_left.png
new file mode 100644
index 000000000..976720a23
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_inactive_pixel_arrow_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_inactive_pixel_arrow_right.png b/Habitica/res/drawable-xhdpi/creator_inactive_pixel_arrow_right.png
new file mode 100644
index 000000000..18b9ba327
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_inactive_pixel_arrow_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/customization_selection_caret.png b/Habitica/res/drawable-xhdpi/customization_selection_caret.png
new file mode 100644
index 000000000..1b5ebe5df
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/customization_selection_caret.png differ
diff --git a/Habitica/res/drawable-xhdpi/customization_shadow.png b/Habitica/res/drawable-xhdpi/customization_shadow.png
new file mode 100644
index 000000000..1b84c7609
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/customization_shadow.png differ
diff --git a/Habitica/res/drawable-xhdpi/diamond_button.9.png b/Habitica/res/drawable-xhdpi/diamond_button.9.png
new file mode 100644
index 000000000..9018972c2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/diamond_button.9.png differ
diff --git a/Habitica/res/drawable-xhdpi/diamond_button_white.9.png b/Habitica/res/drawable-xhdpi/diamond_button_white.9.png
new file mode 100644
index 000000000..6f2e33dfe
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_arrow_back_white_36dp.png b/Habitica/res/drawable-xhdpi/ic_arrow_back_white_36dp.png
new file mode 100644
index 000000000..0e43ff9cb
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_arrow_back_white_36dp.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_body.png b/Habitica/res/drawable-xhdpi/icon_body.png
index d50f8367a..ffbae468e 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_body.png and b/Habitica/res/drawable-xhdpi/icon_body.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_dailies_selected.png b/Habitica/res/drawable-xhdpi/icon_dailies_selected.png
new file mode 100644
index 000000000..d833439c8
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_dailies_selected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_dailies_unselected.png b/Habitica/res/drawable-xhdpi/icon_dailies_unselected.png
new file mode 100644
index 000000000..f3ae7c6b7
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_dailies_unselected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_extras.png b/Habitica/res/drawable-xhdpi/icon_extras.png
index b74fb2011..e899df1ba 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_extras.png and b/Habitica/res/drawable-xhdpi/icon_extras.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_habits_selected.png b/Habitica/res/drawable-xhdpi/icon_habits_selected.png
new file mode 100644
index 000000000..75af7938f
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_habits_selected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_habits_unselected.png b/Habitica/res/drawable-xhdpi/icon_habits_unselected.png
new file mode 100644
index 000000000..1c524860e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_habits_unselected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_hair.png b/Habitica/res/drawable-xhdpi/icon_hair.png
index ee9e5a803..0c973efa4 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_hair.png and b/Habitica/res/drawable-xhdpi/icon_hair.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_rewards_selected.png b/Habitica/res/drawable-xhdpi/icon_rewards_selected.png
new file mode 100644
index 000000000..fb50f2517
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_rewards_selected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_rewards_unselected.png b/Habitica/res/drawable-xhdpi/icon_rewards_unselected.png
new file mode 100644
index 000000000..6f42aa80d
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_rewards_unselected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_skin.png b/Habitica/res/drawable-xhdpi/icon_skin.png
index ef265b050..140ab1408 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_skin.png and b/Habitica/res/drawable-xhdpi/icon_skin.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_todos_selected.png b/Habitica/res/drawable-xhdpi/icon_todos_selected.png
new file mode 100644
index 000000000..1af60d348
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_todos_selected.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_todos_unselected.png b/Habitica/res/drawable-xhdpi/icon_todos_unselected.png
new file mode 100644
index 000000000..16fd07945
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_todos_unselected.png differ
diff --git a/Habitica/res/drawable-xhdpi/login_background.png b/Habitica/res/drawable-xhdpi/login_background.png
deleted file mode 100644
index f8daf89a4..000000000
Binary files a/Habitica/res/drawable-xhdpi/login_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/npc_justin_only.png b/Habitica/res/drawable-xhdpi/npc_justin_only.png
new file mode 100644
index 000000000..a57292c44
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/npc_justin_only.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_active_pixel_arrow_left.png b/Habitica/res/drawable-xxhdpi/creator_active_pixel_arrow_left.png
new file mode 100644
index 000000000..d80140000
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_active_pixel_arrow_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_active_pixel_arrow_right.png b/Habitica/res/drawable-xxhdpi/creator_active_pixel_arrow_right.png
new file mode 100644
index 000000000..7d692f8d7
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_active_pixel_arrow_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_chair_black.png b/Habitica/res/drawable-xxhdpi/creator_chair_black.png
new file mode 100644
index 000000000..38a6c96dd
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_chair_black.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_chair_blue.png b/Habitica/res/drawable-xxhdpi/creator_chair_blue.png
new file mode 100644
index 000000000..5e3874664
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_chair_blue.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_chair_green.png b/Habitica/res/drawable-xxhdpi/creator_chair_green.png
new file mode 100644
index 000000000..910640f89
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_chair_green.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_chair_pink.png b/Habitica/res/drawable-xxhdpi/creator_chair_pink.png
new file mode 100644
index 000000000..a85d663d1
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_chair_pink.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_chair_red.png b/Habitica/res/drawable-xxhdpi/creator_chair_red.png
new file mode 100644
index 000000000..5e38cec3c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_chair_red.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_chair_yellow.png b/Habitica/res/drawable-xxhdpi/creator_chair_yellow.png
new file mode 100644
index 000000000..a82e43fdf
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_chair_yellow.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_eyewear_special_blacktopframe.png b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_blacktopframe.png
new file mode 100644
index 000000000..6c0a9f227
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_blacktopframe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_eyewear_special_bluetopframe.png b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_bluetopframe.png
new file mode 100644
index 000000000..fc8f0f84e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_bluetopframe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_eyewear_special_greentopframe.png b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_greentopframe.png
new file mode 100644
index 000000000..300cc1a6c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_greentopframe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_eyewear_special_pinktopframe.png b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_pinktopframe.png
new file mode 100644
index 000000000..d5fb3ee95
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_pinktopframe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_eyewear_special_redtopframe.png b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_redtopframe.png
new file mode 100644
index 000000000..fa30c4e61
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_redtopframe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_eyewear_special_whitetopframe.png b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_whitetopframe.png
new file mode 100644
index 000000000..5e41bcf4f
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_whitetopframe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_eyewear_special_yellowtopframe.png b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_yellowtopframe.png
new file mode 100644
index 000000000..0a9d4620e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_eyewear_special_yellowtopframe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_black.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_black.png
new file mode 100644
index 000000000..cc84257c6
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_black.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_blond.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_blond.png
new file mode 100644
index 000000000..1930c6e22
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_blond.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_brown.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_brown.png
new file mode 100644
index 000000000..19f8dfc16
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_brown.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_white.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_white.png
new file mode 100644
index 000000000..8b24b8a34
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_white.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_black.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_black.png
new file mode 100644
index 000000000..1a7179ba4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_black.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_blond.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_blond.png
new file mode 100644
index 000000000..b83cc2bc0
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_blond.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_brown.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_brown.png
new file mode 100644
index 000000000..7dbfcb43c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_brown.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_white.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_white.png
new file mode 100644
index 000000000..fae1d7260
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_white.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_1_black.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_black.png
new file mode 100644
index 000000000..99ec2e46e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_black.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_1_blond.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_blond.png
new file mode 100644
index 000000000..a342e923e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_blond.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_1_brown.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_brown.png
new file mode 100644
index 000000000..6074ccdc2
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_brown.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_1_red.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_red.png
new file mode 100644
index 000000000..78ea9d477
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_red.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_1_white.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_white.png
new file mode 100644
index 000000000..caf2a4261
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_1_white.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_3_black.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_black.png
new file mode 100644
index 000000000..ad1a2fbce
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_black.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_3_blond.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_blond.png
new file mode 100644
index 000000000..678523f57
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_blond.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_3_brown.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_brown.png
new file mode 100644
index 000000000..a2414a918
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_brown.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_3_red.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_red.png
new file mode 100644
index 000000000..ab8df778c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_red.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_base_3_white.png b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_white.png
new file mode 100644
index 000000000..5afa310e6
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_base_3_white.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_flower_1.png b/Habitica/res/drawable-xxhdpi/creator_hair_flower_1.png
new file mode 100644
index 000000000..c39bb1ec3
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_flower_1.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_flower_2.png b/Habitica/res/drawable-xxhdpi/creator_hair_flower_2.png
new file mode 100644
index 000000000..1a2a32a77
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_flower_2.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_flower_3.png b/Habitica/res/drawable-xxhdpi/creator_hair_flower_3.png
new file mode 100644
index 000000000..8a4c4a548
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_flower_3.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_flower_4.png b/Habitica/res/drawable-xxhdpi/creator_hair_flower_4.png
new file mode 100644
index 000000000..8904132c9
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_flower_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_flower_5.png b/Habitica/res/drawable-xxhdpi/creator_hair_flower_5.png
new file mode 100644
index 000000000..a5c1ae8ed
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_flower_5.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_flower_6.png b/Habitica/res/drawable-xxhdpi/creator_hair_flower_6.png
new file mode 100644
index 000000000..25eecec61
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_flower_6.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_inactive_pixel_arrow_left.png b/Habitica/res/drawable-xxhdpi/creator_inactive_pixel_arrow_left.png
new file mode 100644
index 000000000..e11287fcd
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_inactive_pixel_arrow_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_inactive_pixel_arrow_right.png b/Habitica/res/drawable-xxhdpi/creator_inactive_pixel_arrow_right.png
new file mode 100644
index 000000000..05b432655
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_inactive_pixel_arrow_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/customization_selection_caret.png b/Habitica/res/drawable-xxhdpi/customization_selection_caret.png
new file mode 100644
index 000000000..43cb82fcd
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/customization_selection_caret.png differ
diff --git a/Habitica/res/drawable-xxhdpi/customization_shadow.png b/Habitica/res/drawable-xxhdpi/customization_shadow.png
new file mode 100644
index 000000000..fa2f27762
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/customization_shadow.png differ
diff --git a/Habitica/res/drawable-xxhdpi/diamond_button.9.png b/Habitica/res/drawable-xxhdpi/diamond_button.9.png
new file mode 100644
index 000000000..81e28fd3d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/diamond_button.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png b/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png
new file mode 100644
index 000000000..714d0c475
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_arrow_back_white_36dp.png b/Habitica/res/drawable-xxhdpi/ic_arrow_back_white_36dp.png
new file mode 100644
index 000000000..f41074eb7
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_arrow_back_white_36dp.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_body.png b/Habitica/res/drawable-xxhdpi/icon_body.png
index 01565581c..b05cd97da 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_body.png and b/Habitica/res/drawable-xxhdpi/icon_body.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_dailies_selected.png b/Habitica/res/drawable-xxhdpi/icon_dailies_selected.png
new file mode 100644
index 000000000..ad80755ac
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_dailies_selected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png b/Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png
new file mode 100644
index 000000000..9f20a92a1
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_extras.png b/Habitica/res/drawable-xxhdpi/icon_extras.png
index 01df06cdc..7d7540509 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_extras.png and b/Habitica/res/drawable-xxhdpi/icon_extras.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_habits_selected.png b/Habitica/res/drawable-xxhdpi/icon_habits_selected.png
new file mode 100644
index 000000000..c967b529a
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_habits_selected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_habits_unselected.png b/Habitica/res/drawable-xxhdpi/icon_habits_unselected.png
new file mode 100644
index 000000000..a89e5e368
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_habits_unselected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_hair.png b/Habitica/res/drawable-xxhdpi/icon_hair.png
index 0f940dc4d..27e7145be 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_hair.png and b/Habitica/res/drawable-xxhdpi/icon_hair.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_rewards_selected.png b/Habitica/res/drawable-xxhdpi/icon_rewards_selected.png
new file mode 100644
index 000000000..f94497222
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_rewards_selected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_rewards_unselected.png b/Habitica/res/drawable-xxhdpi/icon_rewards_unselected.png
new file mode 100644
index 000000000..4929d32da
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_rewards_unselected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_skin.png b/Habitica/res/drawable-xxhdpi/icon_skin.png
index f4fd80c53..2eaf29303 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_skin.png and b/Habitica/res/drawable-xxhdpi/icon_skin.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_todos_selected.png b/Habitica/res/drawable-xxhdpi/icon_todos_selected.png
new file mode 100644
index 000000000..65b490c5e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_todos_selected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_todos_unselected.png b/Habitica/res/drawable-xxhdpi/icon_todos_unselected.png
new file mode 100644
index 000000000..a5b699013
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_todos_unselected.png differ
diff --git a/Habitica/res/drawable-xxhdpi/login_background.png b/Habitica/res/drawable-xxhdpi/login_background.png
deleted file mode 100644
index bc2c207fc..000000000
Binary files a/Habitica/res/drawable-xxhdpi/login_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/npc_justin_main.png b/Habitica/res/drawable-xxhdpi/npc_justin_main.png
new file mode 100644
index 000000000..e90caeaf6
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/npc_justin_main.png differ
diff --git a/Habitica/res/drawable/avatar_customization_category_bg.xml b/Habitica/res/drawable/avatar_customization_category_bg.xml
new file mode 100644
index 000000000..300ee34d1
--- /dev/null
+++ b/Habitica/res/drawable/avatar_customization_category_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape android:shape="rectangle">
+        <solid android:color="@color/brand_200" />
+    </shape>
+</item>
+    <item android:left="0dp" android:right="0dp" android:gravity="bottom">
+        <bitmap android:src="@drawable/customization_shadow" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
new file mode 100644
index 000000000..4c115a7e4
--- /dev/null
+++ b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/brand_100" />
+        </shape>
+    </item>
+    <item android:left="0dp" android:right="0dp" android:gravity="bottom">
+        <bitmap android:src="@drawable/customization_shadow" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/Habitica/res/drawable/icon_dailies.xml b/Habitica/res/drawable/icon_dailies.xml
new file mode 100644
index 000000000..c99a0d1db
--- /dev/null
+++ b/Habitica/res/drawable/icon_dailies.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_dailies_selected" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_dailies_unselected" android:state_selected="false" />
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/icon_habits.xml b/Habitica/res/drawable/icon_habits.xml
new file mode 100644
index 000000000..437388fbe
--- /dev/null
+++ b/Habitica/res/drawable/icon_habits.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_habits_selected" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_habits_unselected" android:state_selected="false" />
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/icon_rewards.xml b/Habitica/res/drawable/icon_rewards.xml
new file mode 100644
index 000000000..36739cc71
--- /dev/null
+++ b/Habitica/res/drawable/icon_rewards.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_rewards_selected" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_rewards_unselected" android:state_selected="false" />
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/icon_todos.xml b/Habitica/res/drawable/icon_todos.xml
new file mode 100644
index 000000000..dd9b06ee0
--- /dev/null
+++ b/Habitica/res/drawable/icon_todos.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_todos_selected" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_todos_unselected" android:state_selected="false" />
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/nav_item_color_state.xml b/Habitica/res/drawable/nav_item_color_state.xml
new file mode 100644
index 000000000..709a1af70
--- /dev/null
+++ b/Habitica/res/drawable/nav_item_color_state.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_enabled="true" />
+    <item android:color="@color/brand_200" android:state_enabled="false" />
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/npc_justin_only.png b/Habitica/res/drawable/npc_justin_only.png
deleted file mode 100644
index 62f124f5e..000000000
Binary files a/Habitica/res/drawable/npc_justin_only.png and /dev/null differ
diff --git a/Habitica/res/drawable/pill_bg_radio_selected.xml b/Habitica/res/drawable/pill_bg_radio_selected.xml
new file mode 100644
index 000000000..6d8163ecf
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg_radio_selected.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/brand_400"/>
+    <corners android:radius="20dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_radio_unselected.xml b/Habitica/res/drawable/pill_bg_radio_unselected.xml
new file mode 100644
index 000000000..d115dede9
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg_radio_unselected.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <corners android:radius="20dip"/>
+    <stroke android:color="@color/days_gray" android:width="1dp" />
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_radio_button.xml b/Habitica/res/drawable/pill_radio_button.xml
new file mode 100644
index 000000000..54ac53e5c
--- /dev/null
+++ b/Habitica/res/drawable/pill_radio_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/pill_bg_radio_selected" android:state_checked="true" />
+    <item android:drawable="@drawable/pill_bg_radio_unselected" android:state_checked="false" />
+
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/radio_button_text_color.xml b/Habitica/res/drawable/radio_button_text_color.xml
new file mode 100644
index 000000000..8c1cf7168
--- /dev/null
+++ b/Habitica/res/drawable/radio_button_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="@color/white"/>
+    <item android:color="@color/days_gray"/>
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/setup_customization_bg.xml b/Habitica/res/drawable/setup_customization_bg.xml
new file mode 100644
index 000000000..515f856bb
--- /dev/null
+++ b/Habitica/res/drawable/setup_customization_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="5dp" android:left="5dp" android:right="5dp" android:bottom="5dp">
+        <shape android:shape="oval">
+            <size android:height="48dp" android:width="48dp" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/Habitica/res/drawable/setup_customization_bg_selected.xml b/Habitica/res/drawable/setup_customization_bg_selected.xml
new file mode 100644
index 000000000..690256892
--- /dev/null
+++ b/Habitica/res/drawable/setup_customization_bg_selected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="oval">
+            <padding android:bottom="5dp" android:left="5dp" android:right="5dp" android:top="5dp" />
+            <solid android:color="@color/brand_400" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="oval">
+            <size android:height="50dp" android:width="50dp" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/Habitica/res/drawable/setup_customization_circle.xml b/Habitica/res/drawable/setup_customization_circle.xml
new file mode 100644
index 000000000..59f17d3c5
--- /dev/null
+++ b/Habitica/res/drawable/setup_customization_circle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <size android:width="36dp" android:height="36dp" />
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index 2540ae87b..f31553375 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -1,45 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
     <android.support.v4.view.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-    <com.viewpagerindicator.IconPageIndicator
-        android:id="@+id/view_pager_indicator"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="16dp" />
+    <RelativeLayout
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
+        <com.viewpagerindicator.IconPageIndicator
+            android:id="@+id/view_pager_indicator"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="16dp" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/skip_button"
-        android:id="@+id/skipButton"
-        android:layout_alignParentBottom="false"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginRight="6dp"
-        android:layout_marginEnd="6dp"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="6dp"
-        android:textColor="@android:color/white"
-        android:background="@color/transparent" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/skip_button"
+            android:id="@+id/skipButton"
+            android:layout_alignParentBottom="false"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="6dp"
+            android:layout_marginEnd="6dp"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="6dp"
+            android:textColor="@android:color/white"
+            android:background="@color/transparent" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/intro_finish_button"
-        android:id="@+id/finishButton"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginRight="6dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginBottom="6dp"
-        android:background="@color/transparent"
-        android:textColor="@android:color/white"
-        android:visibility="gone" />
-</RelativeLayout>
\ No newline at end of file
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/intro_finish_button"
+            android:id="@+id/finishButton"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="6dp"
+            android:background="@color/transparent"
+            android:textColor="@android:color/white"
+            android:visibility="gone" />
+    </RelativeLayout>
+</FrameLayout>
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 7038117c4..77584f30d 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -1,61 +1,63 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <com.habitrpg.android.habitica.ui.views.login.LockableScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/background_container"
-            >
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/background_container"
+        android:scrollIndicators="none"
+        android:scrollbars="none"
+        >
 
         <com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView
-                android:id="@+id/background_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/login_gradient"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                >
+            android:id="@+id/background_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/login_gradient"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            >
             <ImageView
-                    android:id="@+id/city_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    app:srcCompat="@drawable/login_background"
-                    android:layout_centerHorizontal="true"
-                    android:scaleType="centerCrop" />
+                android:id="@+id/city_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                app:srcCompat="@drawable/login_background"
+                android:layout_centerHorizontal="true"
+                android:scaleType="centerCrop" />
             <Space android:id="@+id/cloud_anchor"
-                   android:layout_width="0dp"
-                   android:layout_height="0dp"
-                   android:layout_centerHorizontal="true"
-                   android:visibility="invisible"
-                   android:layout_below="@id/city_view" />
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_centerHorizontal="true"
+                android:visibility="invisible"
+                android:layout_below="@id/city_view" />
             <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/cloud_1"
-                    android:id="@+id/left_cloud_view"
-                    android:layout_toLeftOf="@id/cloud_anchor"
-                    android:layout_marginRight="150dp"
-                    android:layout_below="@id/cloud_anchor"
-                    android:layout_alignParentLeft="false"
-                    android:scaleType="centerCrop"
-                    android:layout_marginTop="150dp"
-                    />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/cloud_1"
+                android:id="@+id/left_cloud_view"
+                android:layout_toLeftOf="@id/cloud_anchor"
+                android:layout_marginRight="150dp"
+                android:layout_below="@id/cloud_anchor"
+                android:layout_alignParentLeft="false"
+                android:scaleType="centerCrop"
+                android:layout_marginTop="150dp"
+                />
             <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/cloud_2"
-                    android:id="@+id/right_cloud_view"
-                    android:layout_toRightOf="@id/cloud_anchor"
-                    android:layout_marginLeft="170dp"
-                    android:layout_below="@id/cloud_anchor"
-                    android:layout_alignParentLeft="false"
-                    android:scaleType="centerCrop"
-                    android:layout_marginTop="240dp"
-                    />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/cloud_2"
+                android:id="@+id/right_cloud_view"
+                android:layout_toRightOf="@id/cloud_anchor"
+                android:layout_marginLeft="170dp"
+                android:layout_below="@id/cloud_anchor"
+                android:layout_alignParentLeft="false"
+                android:scaleType="centerCrop"
+                android:layout_marginTop="240dp"
+                />
 
 
         </com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView>
@@ -63,23 +65,30 @@
     </com.habitrpg.android.habitica.ui.views.login.LockableScrollView>
 
 
-    <LinearLayout
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:padding="@dimen/spacing_large"
             android:id="@+id/login_intro_view"
             android:orientation="vertical"
             android:background="@color/transparent"
+            android:fitsSystemWindows="true"
             >
 
-        <ImageView
+            <ImageView
+                android:id="@+id/logo_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:src="@drawable/login_logo"
-                android:layout_margin="24dp"/>
+                android:layout_margin="24dp"
+                android:contentDescription="@string/brand_name" />
 
-        <Button
+            <Button
                 android:id="@+id/new_game_button"
                 android:layout_width="@dimen/login_intro_button_size"
                 android:layout_height="@dimen/login_intro_button_size"
@@ -89,7 +98,7 @@
                 android:layout_marginTop="@dimen/spacing_large"
                 android:background="@drawable/login_begin_button"/>
 
-        <Button
+            <Button
                 android:id="@+id/show_login_button"
                 android:layout_width="@dimen/login_intro_button_size"
                 android:layout_height="@dimen/login_intro_button_size"
@@ -99,7 +108,7 @@
                 android:layout_marginTop="@dimen/spacing_large"
                 android:background="@drawable/login_begin_button"/>
 
-        <ScrollView
+            <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/transparent"
@@ -109,7 +118,7 @@
                 tools:visibility="visible"
                 >
 
-            <LinearLayout
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="@dimen/spacing_large"
@@ -117,7 +126,7 @@
                     android:orientation="vertical"
                     android:background="@color/transparent">
 
-                <EditText
+                    <EditText
                         android:id="@+id/username"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -131,7 +140,7 @@
                         android:textColor="@color/white_75_alpha"
                         android:textColorHighlight="@color/white"/>
 
-                <EditText
+                    <EditText
                         android:id="@+id/email"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -145,7 +154,7 @@
                         android:theme="@style/LoginEditTextTheme"
                         />
 
-                <EditText
+                    <EditText
                         android:id="@+id/password"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -158,7 +167,7 @@
                         android:textColor="@color/white_75_alpha"
                         android:theme="@style/LoginEditTextTheme"/>
 
-                <EditText
+                    <EditText
                         android:id="@+id/confirm_password"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -170,7 +179,7 @@
                         android:textColor="@color/white_75_alpha"
                         android:theme="@style/LoginEditTextTheme"/>
 
-                <ProgressBar
+                    <ProgressBar
                         android:id="@+id/PB_AsyncTask"
                         android:indeterminate="true"
                         android:visibility="gone"
@@ -178,7 +187,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"/>
 
-                <Button
+                    <Button
                         android:id="@+id/login_btn"
                         android:layout_width="match_parent"
                         android:layout_height="42dp"
@@ -186,7 +195,7 @@
                         android:layout_marginTop="@dimen/spacing_xlarge"
                         style="@style/LoginButton"/>
 
-                <Button
+                    <Button
                         android:id="@+id/fb_login_button"
                         android:layout_width="match_parent"
                         android:layout_marginTop="@dimen/spacing_xlarge"
@@ -195,16 +204,16 @@
                         android:drawableLeft="@drawable/facebook_icon"
                         style="@style/LoginButton"/>
 
-                <Button
-                    android:id="@+id/google_login_button"
-                    android:layout_width="match_parent"
-                    android:layout_marginTop="@dimen/spacing_large"
-                    android:layout_height="@dimen/diamond_button_height"
-                    android:text="@string/login_btn_google"
-                    android:drawableLeft="@drawable/google_icon"
-                    style="@style/LoginButton"/>
+                    <Button
+                        android:id="@+id/google_login_button"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:layout_height="@dimen/diamond_button_height"
+                        android:text="@string/login_btn_google"
+                        android:drawableLeft="@drawable/google_icon"
+                        style="@style/LoginButton"/>
 
-                <TextView
+                    <TextView
                         android:id="@+id/forgot_pw_tv"
                         android:layout_width="match_parent"
                         android:layout_marginTop="@dimen/spacing_xlarge"
@@ -214,13 +223,13 @@
                         android:layout_gravity="center_horizontal"
                         android:textColor="@color/white_50_alpha"/>
 
-            </LinearLayout>
+                </LinearLayout>
 
-        </ScrollView>
+            </ScrollView>
 
-    </LinearLayout>
+        </LinearLayout>
 
-    <Button
+        <Button
             android:id="@+id/back_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -228,5 +237,6 @@
             android:background="@color/transparent"
             android:paddingLeft="12dp"
             android:alpha="0" />
+    </FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 7d64cef15..c3719b435 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -1,95 +1,96 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout 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/overlayFrameLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:elevation="0dp"
     tools:context=".ui.activities.MainActivity"
-    android:id="@+id/overlayFrameLayout">
-<android.support.v4.widget.DrawerLayout
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:gravity="center">
+    android:fitsSystemWindows="false">
 
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/main_content"
+    <FrameLayout
+        android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:elevation="0dp"
-        tools:context=".ui.activities.MainActivity">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-        <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.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar"
+        <android.support.design.widget.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fitsSystemWindows="false">
+            app:titleEnabled="false"
+            app:contentScrim="?attr/colorPrimary"
+            app:expandedTitleMarginEnd="?attr/actionBarSize"
+            app:expandedTitleMarginStart="0dp"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-            <android.support.design.widget.CollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
+            <include
+                android:id="@+id/avatar_with_bars"
+                layout="@layout/avatar_with_bars"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:fitsSystemWindows="false"
-                app:titleEnabled="false"
-                app:contentScrim="?attr/colorPrimary"
-                app:expandedTitleMarginEnd="?attr/actionBarSize"
-                app:expandedTitleMarginStart="0dp"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+                android:layout_marginTop="?attr/actionBarSize"
+                app:layout_collapseMode="parallax" />
 
-                <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.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.support.design.widget.CollapsingToolbarLayout>
-
-            <android.support.design.widget.TabLayout
-                android:id="@+id/detail_tabs"
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
                 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:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
+                android:theme="@style/Toolbar"
                 app:layout_collapseMode="pin"
-                app:tabGravity="fill"
-                app:tabIndicatorColor="@android:color/white"
-                app:tabMode="fixed" />
-        </android.support.design.widget.AppBarLayout>
+                app:popupTheme="@style/Theme.AppCompat.Light"
+                android:fitsSystemWindows="true"/>
+        </android.support.design.widget.CollapsingToolbarLayout>
 
-        <FrameLayout
-            android:id="@+id/floating_menu_wrapper"
-            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" />
+        <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.support.design.widget.CoordinatorLayout>
-</android.support.v4.widget.DrawerLayout>
-</FrameLayout>
\ No newline at end of file
+            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" />
+    </android.support.design.widget.AppBarLayout>
+
+    <com.roughike.bottombar.BottomBar
+        android:id="@+id/bottom_navigation"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom|center"
+        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"
+        />
+
+    <FrameLayout
+        android:id="@+id/floating_menu_wrapper"
+        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="44dp"
+        android:layout_marginRight="8dp"
+        android:fitsSystemWindows="true"
+        />
+</android.support.design.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml
index c4f6ebbc4..69b1a48b4 100644
--- a/Habitica/res/layout/activity_setup.xml
+++ b/Habitica/res/layout/activity_setup.xml
@@ -20,9 +20,10 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:background="@color/brand_300"
-            android:paddingLeft="21dp"
-            android:paddingRight="21dp"
-            android:gravity="center_vertical">
+            android:paddingLeft="@dimen/content_inset"
+            android:paddingRight="@dimen/content_inset"
+            android:gravity="center_vertical"
+            android:elevation="8dp">
 
         <Button
                 android:layout_width="wrap_content"
@@ -49,8 +50,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:layout_toLeftOf="@id/nextButton"
-                android:layout_toRightOf="@id/previousButton"
                 />
 
     </RelativeLayout>
diff --git a/Habitica/res/layout/avatar_category.xml b/Habitica/res/layout/avatar_category.xml
new file mode 100644
index 000000000..350506c2d
--- /dev/null
+++ b/Habitica/res/layout/avatar_category.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="70dp"
+              android:layout_height="70dp"
+              android:gravity="center"
+              tools:background="@color/brand_200">
+
+    <ImageView
+            android:id="@+id/icon_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:src="@drawable/icon_body"
+            android:layout_gravity="center"/>
+
+    <TextView
+            android:id="@+id/text_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="@string/avatar_body"
+            android:textAllCaps="true"
+            android:layout_marginTop="8dp"
+            android:textColor="@color/white_50_alpha"
+            android:layout_gravity="center"
+            android:ellipsize="marquee"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/avatar_setup_drawer.xml b/Habitica/res/layout/avatar_setup_drawer.xml
new file mode 100644
index 000000000..e75e2462d
--- /dev/null
+++ b/Habitica/res/layout/avatar_setup_drawer.xml
@@ -0,0 +1,92 @@
+<?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"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:id="@+id/subcategory_layout"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/customization_drawer_subcategory_height"
+            android:background="@drawable/avatar_customization_subcategory_bg"
+            android:layout_alignParentTop="true">
+
+        <android.support.design.widget.TabLayout
+                android:id="@+id/subcategory_tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:tabIndicatorColor="@color/brand_400"
+                app:tabIndicatorHeight="2dp"
+                app:tabTextColor="@color/white_50_alpha"
+                app:tabSelectedTextColor="@color/white"
+                app:tabGravity="center"
+                app:tabPaddingEnd="16dp"
+                app:tabPaddingStart="16dp"
+                />
+
+        <android.support.v7.widget.RecyclerView
+                android:id="@+id/customization_list"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:layout_gravity="center_horizontal"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/customization_drawer_category_height"
+            android:background="@drawable/avatar_customization_category_bg"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:layout_below="@id/subcategory_layout"
+            android:elevation="4dp"
+            android:id="@+id/category_layout">
+
+        <com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
+                android:id="@+id/body_button"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                app:iconDrawable="@drawable/icon_body"
+                app:categoryTitle="@string/avatar_body"
+                android:gravity="center"/>
+
+        <com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
+                android:id="@+id/skin_button"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                app:iconDrawable="@drawable/icon_skin"
+                app:categoryTitle="@string/avatar_skin"
+                android:gravity="center"/>
+
+        <com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
+                android:id="@+id/hair_button"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                app:iconDrawable="@drawable/icon_hair"
+                app:categoryTitle="@string/avatar_hair"
+                android:gravity="center"/>
+
+        <com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
+                android:id="@+id/extras_button"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                app:iconDrawable="@drawable/icon_extras"
+                app:categoryTitle="@string/avatar_extras"
+                android:gravity="center"/>
+    </LinearLayout>
+
+        <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/customization_selection_caret"
+                android:id="@+id/caret_view"
+                android:layout_alignBottom="@id/category_layout"
+                android:layout_marginBottom="@dimen/customization_drawer_caret_margin"
+                android:elevation="6dp"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
new file mode 100644
index 000000000..5b608e75b
--- /dev/null
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+<View
+    android:layout_width="match_parent"
+    android:layout_height="2dp"
+    android:background="@color/pill_gray" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/task_type_title"
+            style="@style/Caption3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="@string/habits"
+            android:textAllCaps="true"/>
+        <RadioGroup
+            android:id="@+id/task_filter_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="24dp"
+            >
+            <RadioButton
+                android:id="@+id/all_task_filter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/all"
+                style="@style/TaskFilterRadioButton"
+                android:checked="true"
+                />
+            <RadioButton
+                android:id="@+id/second_task_filter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/weak"
+                style="@style/TaskFilterRadioButton"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp" />
+            <RadioButton
+                android:id="@+id/third_task_filter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/strong"
+                style="@style/TaskFilterRadioButton"/>
+        </RadioGroup>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@color/pill_gray" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tags_title"
+                style="@style/Caption3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="2"
+                android:text="@string/tags"
+                android:textAllCaps="true"/>
+
+                <Button
+                    android:id="@+id/tag_edit_button"
+                    style="@style/Body1_Button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:text="@string/edit_tag_btn_edit"
+                    android:textColor="#6133b4"
+                    android:textSize="16sp" />
+        </LinearLayout>
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:id="@+id/tags_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                android:orientation="vertical"
+                android:showDividers="middle"
+                android:divider="@color/transparent"
+                android:dividerPadding="8dp"/>
+        </ScrollView>
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="@color/pill_gray" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/edit_tag_item.xml b/Habitica/res/layout/edit_tag_item.xml
new file mode 100644
index 000000000..f46126812
--- /dev/null
+++ b/Habitica/res/layout/edit_tag_item.xml
@@ -0,0 +1,17 @@
+<?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"/>
+    <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"
+        style="@style/Base.Widget.AppCompat.Button.Borderless"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/edit_tags_drawer_item.xml b/Habitica/res/layout/edit_tags_drawer_item.xml
deleted file mode 100644
index 4f7f00014..000000000
--- a/Habitica/res/layout/edit_tags_drawer_item.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal">
-    <TextView
-            android:id="@+id/tagTextView"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:paddingLeft="@dimen/material_drawer_vertical_padding"
-            android:paddingRight="@dimen/material_drawer_vertical_padding"/>
-    <Button
-            android:id="@+id/btnEdit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/white"
-            android:text="@string/edit_tag_btn_edit"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/edit_tags_section_drawer_item.xml b/Habitica/res/layout/edit_tags_section_drawer_item.xml
deleted file mode 100644
index 5d40b5ebd..000000000
--- a/Habitica/res/layout/edit_tags_section_drawer_item.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
-
-    <View   android:id="@+id/material_drawer_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="@dimen/material_drawer_padding" />
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal">
-
-
-        <TextView
-                android:id="@+id/drawer_section_name"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/material_drawer_item_primary"
-                android:layout_weight="1"
-                android:fontFamily="sans-serif-medium"
-                android:gravity="center_vertical|start"
-                android:lines="1"
-                android:paddingLeft="@dimen/material_drawer_vertical_padding"
-                android:paddingRight="@dimen/material_drawer_vertical_padding"
-                android:textSize="@dimen/material_drawer_item_section_text"
-                android:text="@string/filter_drawer_filter_tags"
-                android:maxLines="1"/>
-        <Button
-                android:id="@+id/btnEdit"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/white"
-                android:text="@string/edit_tag_btn_edit" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/Habitica/res/layout/edit_text_drawer_item.xml b/Habitica/res/layout/edit_text_drawer_item.xml
deleted file mode 100644
index 39df77b86..000000000
--- a/Habitica/res/layout/edit_text_drawer_item.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-            <EditText
-                android:id="@+id/editText"
-                android:layout_height="wrap_content"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:textColor="@android:color/black"
-                android:hint="@string/add_tag"
-                android:inputType="text" />
-        <Button
-            android:id="@+id/btnAdd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/white"
-            android:text="+" />
-</LinearLayout>
diff --git a/Habitica/res/layout/fragment_fading_viewpager.xml b/Habitica/res/layout/fragment_fading_viewpager.xml
new file mode 100644
index 000000000..bc3f96d65
--- /dev/null
+++ b/Habitica/res/layout/fragment_fading_viewpager.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.habitrpg.android.habitica.ui.views.FadingViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="match_parent"
+                                   android:id="@+id/view_pager" />
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_intro.xml b/Habitica/res/layout/fragment_intro.xml
index 99c00feb0..c070da590 100644
--- a/Habitica/res/layout/fragment_intro.xml
+++ b/Habitica/res/layout/fragment_intro.xml
@@ -1,61 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:gravity="center_vertical"
-              android:background="@color/brand_300"
-              android:id="@+id/container_view">
+    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:gravity="center_vertical"
+    android:background="@color/brand_300"
+    android:id="@+id/container_view"
+    android:fitsSystemWindows="true">
 
     <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/subtitleTextView"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            style="@style/Body2"
-            android:textSize="17sp"
-            android:textColor="@color/white"
-            tools:text="@string/intro_2_subtitle"
-            android:layout_marginBottom="4dp" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/subtitleTextView"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
+        style="@style/Body2"
+        android:textSize="17sp"
+        android:textColor="@color/white"
+        tools:text="@string/intro_2_subtitle"
+        android:layout_marginBottom="4dp" />
 
     <ImageView
-            android:id="@+id/titleImageView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            />
+        android:id="@+id/titleImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:contentDescription="@string/brand_name" />
 
     <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/titleTextView"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            style="@style/Title1"
-            android:textSize="30sp"
-            android:textColor="@color/white"
-            tools:text="@string/intro_2_title"
-            android:layout_marginBottom="28dp" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/titleTextView"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
+        style="@style/Title1"
+        android:textSize="30sp"
+        android:textColor="@color/white"
+        tools:text="@string/intro_2_title"
+        android:layout_marginBottom="28dp" />
 
     <com.facebook.drawee.view.SimpleDraweeView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/imageView"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/intro_2"
-            app:srcCompat="@drawable/intro_2" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageView"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/intro_2"
+        app:srcCompat="@drawable/intro_2" />
 
     <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/descriptionTextView"
-            android:layout_gravity="center_horizontal"
-            style="@style/Body2"
-            android:textColor="@android:color/white"
-            android:layout_margin="28dp"
-            android:gravity="center_horizontal"
-            tools:text="@string/intro_2_description"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/descriptionTextView"
+        android:layout_gravity="center_horizontal"
+        style="@style/Body2"
+        android:textColor="@android:color/white"
+        android:layout_margin="28dp"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="4dp"
+        android:maxWidth="350dp"
+        tools:text="@string/intro_2_description"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml
index 2e57ab20e..ffcb6a7bb 100644
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <android.support.design.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/coordinatorLayout"
@@ -12,7 +11,10 @@
         android:layout_height="match_parent"
         android:scrollbarSize="3dp"
         android:scrollbarThumbVertical="@color/md_grey_500"
-        android:scrollbars="vertical" />
+        android:scrollbars="vertical"
+        android:fitsSystemWindows="true"
+        android:clipToPadding="false"
+        android:paddingBottom="?attr/actionBarSize"/>
 
     <TextView
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
new file mode 100644
index 000000000..6c97ba742
--- /dev/null
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -0,0 +1,30 @@
+<?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"
+    android:id="@+id/refresh.layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    <FrameLayout
+        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"
+            android:fitsSystemWindows="true"
+            android:clipToPadding="false"
+            android:paddingBottom="?attr/actionBarSize" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/empty_view"
+            style="@style/EmptyView"/>
+    </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 19b807668..928bd4983 100644
--- a/Habitica/res/layout/fragment_setup_avatar.xml
+++ b/Habitica/res/layout/fragment_setup_avatar.xml
@@ -1,34 +1,56 @@
 <?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">
+<RelativeLayout 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_horizontal">
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <Button
+            android:id="@+id/randomize_button"
+            android:layout_width="wrap_content"
+            android:text="@string/randomize"
+            style="@style/DiamondButton"
+            android:layout_marginTop="@dimen/setup_vertical_spacing"
+            android:layout_centerHorizontal="true"/>
 
-        <com.habitrpg.android.habitica.ui.AvatarView
-            android:id="@+id/avatarView"
-            android:layout_width="@dimen/avatar_width"
-            android:layout_height="@dimen/avatar_height"
-            app:showBackground="true"
-            app:showMount="true"
-            app:showPet="true" />
-
-        <TextView
+    <ImageView
+            android:id="@+id/avatar_background"
+            android:layout_marginTop="@dimen/setup_vertical_spacing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/avatar_setup_description"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_marginRight="6dp"
-            android:layout_marginEnd="6dp"
-            android:layout_marginTop="60dp"
-            android:layout_marginBottom="6dp" />
-    </LinearLayout>
-    <android.support.v7.widget.RecyclerView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/recyclerView"/>
-</LinearLayout>
\ No newline at end of file
+            android:layout_below="@id/randomize_button"
+            android:src="@drawable/creator_purple_bg"
+            android:layout_centerHorizontal="true" />
+
+    <com.habitrpg.android.habitica.ui.AvatarView
+            android:id="@+id/avatarView"
+            android:layout_width="@dimen/avatar_small_width"
+            android:layout_height="@dimen/avatar_small_height"
+            app:showBackground="false"
+            app:showMount="false"
+            app:showPet="false"
+            android:layout_centerHorizontal="true"
+            android:layout_alignTop="@id/avatar_background"
+            android:layout_marginTop="6dp"/>
+
+
+    <com.habitrpg.android.habitica.ui.views.setup.AvatarCustomizationDrawer
+            android:id="@+id/customization_drawer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            />
+
+    <com.habitrpg.android.habitica.ui.SpeechBubbleView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:namePlate="Justin"
+            app:text="@string/avatar_setup_description"
+            app:npcDrawable="@drawable/npc_justin_only"
+            android:layout_marginLeft="@dimen/content_inset"
+            android:layout_marginRight="@dimen/content_inset"
+            android:layout_above="@id/customization_drawer"
+            android:layout_marginBottom="12dp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_setup_tasks.xml b/Habitica/res/layout/fragment_setup_tasks.xml
index 0324b4775..6f72f2f3d 100644
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@@ -1,27 +1,55 @@
 <?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">
+<RelativeLayout 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_horizontal">
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <ImageView
+            android:id="@+id/heart_icon"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:src="@drawable/ic_heart_large"
+            android:layout_marginTop="@dimen/setup_vertical_spacing"
+            android:layout_centerHorizontal="true"/>
 
-        <TextView
+    <ImageView
+            android:id="@+id/avatar_background"
+            android:layout_marginTop="@dimen/setup_vertical_spacing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/task_setup_description"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_marginRight="6dp"
-            android:layout_marginEnd="6dp"
-            android:layout_marginLeft="6dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="60dp"
-            android:layout_marginBottom="6dp" />
-    </LinearLayout>
+            android:layout_below="@id/heart_icon"
+            android:src="@drawable/creator_purple_bg"
+            android:layout_centerHorizontal="true" />
+
+    <com.habitrpg.android.habitica.ui.AvatarView
+            android:id="@+id/avatarView"
+            android:layout_width="@dimen/avatar_small_width"
+            android:layout_height="@dimen/avatar_small_height"
+            app:showBackground="false"
+            app:showMount="false"
+            app:showPet="false"
+            android:layout_centerHorizontal="true"
+            android:layout_alignTop="@id/avatar_background"
+            android:layout_marginTop="6dp"/>
     <android.support.v7.widget.RecyclerView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/recyclerView"/>
-</LinearLayout>
\ No newline at end of file
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/avatar_customization_category_bg"
+            android:id="@+id/recyclerView"
+            android:padding="17dp"/>
+
+    <com.habitrpg.android.habitica.ui.SpeechBubbleView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:namePlate="Justin"
+            app:text="@string/avatar_setup_description"
+            app:npcDrawable="@drawable/npc_justin_only"
+            android:layout_marginLeft="@dimen/content_inset"
+            android:layout_marginRight="@dimen/content_inset"
+            android:layout_above="@id/recyclerView"
+            android:layout_marginBottom="12dp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
index 2a149594d..87889d109 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -58,6 +58,6 @@
             android:layout_height="wrap_content"
             app:namePlate="Justin"
             app:text="@string/welcome_text"
-            android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp"/>
+            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/material_drawer.xml b/Habitica/res/layout/material_drawer.xml
new file mode 100644
index 000000000..21d4bb3ed
--- /dev/null
+++ b/Habitica/res/layout/material_drawer.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/material_drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="false" />
\ No newline at end of file
diff --git a/Habitica/res/layout/setup_customization_item.xml b/Habitica/res/layout/setup_customization_item.xml
new file mode 100644
index 000000000..5c4b23542
--- /dev/null
+++ b/Habitica/res/layout/setup_customization_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:gravity="center_vertical"
+              android:paddingLeft="12dp"
+              android:paddingRight="12dp"
+        tools:background="@color/brand_200">
+    <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/setup_customization_size"
+            android:layout_height="@dimen/setup_customization_size"
+            android:background="@drawable/setup_customization_bg"
+            tools:src="@drawable/creator_slim_shirt_black"
+            android:scaleType="center"
+            />
+    <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="Slim"
+            android:layout_marginLeft="8dp"
+            android:textColor="@color/white_50_alpha"
+            android:textSize="16sp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml
index f93973f7a..96efd7292 100644
--- a/Habitica/res/layout/speechbubble.xml
+++ b/Habitica/res/layout/speechbubble.xml
@@ -15,8 +15,8 @@
 
     <TextView
             android:id="@+id/textView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:background="@color/white"
             android:paddingLeft="21dp"
             android:paddingTop="16dp"
diff --git a/Habitica/res/layout/task_setup_item.xml b/Habitica/res/layout/task_setup_item.xml
index 4730ce78d..9953cf875 100644
--- a/Habitica/res/layout/task_setup_item.xml
+++ b/Habitica/res/layout/task_setup_item.xml
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="100dp"
-    android:background="@color/white"
-    android:orientation="vertical">
-    <LinearLayout
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/textView"
+        android:layout_height="36dp"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        android:layout_weight="1">
-        <RelativeLayout
-            android:id="@+id/checkBoxHolder"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="match_parent">
-            <CheckBox
-                android:id="@+id/checkBox"
-                android:layout_width="@dimen/checkbox_size"
-                android:layout_height="@dimen/checkbox_size"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:button="@drawable/daily_checkbox"
-                android:layout_gravity="center_horizontal"
-                android:clickable="false" />
-        </RelativeLayout>
-
-        <TextView
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:id="@+id/checkedTextView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_gravity="center_vertical" />
-
-    </LinearLayout>
-    <View
-        android:id="@+id/bottomBorderView"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/hairline_height"
-        android:background="@color/cell_separator"/>
-</LinearLayout>
+        style="@style/DiamondButton"
+        android:background="@drawable/diamond_button_white"
+                android:layout_margin="6dp" />
diff --git a/Habitica/res/layout/tavern_chat_item.xml b/Habitica/res/layout/tavern_chat_item.xml
index cc287c3b8..a879839cd 100644
--- a/Habitica/res/layout/tavern_chat_item.xml
+++ b/Habitica/res/layout/tavern_chat_item.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
diff --git a/Habitica/res/menu/bottom_navigation_tasks.xml b/Habitica/res/menu/bottom_navigation_tasks.xml
new file mode 100644
index 000000000..8ef31764a
--- /dev/null
+++ b/Habitica/res/menu/bottom_navigation_tasks.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+            android:id="@+id/action_habits"
+            android:enabled="true"
+            android:icon="@drawable/icon_habits"
+            android:title="@string/habits"
+            app:showAsAction="always" />
+    <item
+            android:id="@+id/action_dailies"
+            android:enabled="true"
+            android:icon="@drawable/icon_dailies"
+            android:title="@string/dailies"
+            app:showAsAction="always" />
+    <item
+            android:id="@+id/action_todos"
+            android:enabled="true"
+            android:icon="@drawable/icon_todos"
+            android:title="@string/todos"
+            app:showAsAction="always" />
+    <item
+            android:id="@+id/action_rewards"
+            android:enabled="true"
+            android:icon="@drawable/icon_rewards"
+            android:title="@string/rewards"
+            app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/menu_main_activity.xml b/Habitica/res/menu/menu_main_activity.xml
index c5a0f8e98..5cdacd0e0 100644
--- a/Habitica/res/menu/menu_main_activity.xml
+++ b/Habitica/res/menu/menu_main_activity.xml
@@ -7,7 +7,7 @@
         android:id="@+id/action_reload"
         android:icon="@drawable/ic_refresh_white"
         android:title="@string/action_refresh"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
         android:actionViewClass="android.widget.ImageButton"/>
 
     <!-- Search, should appear as action button -->
diff --git a/Habitica/res/values-h320dp/dimens.xml b/Habitica/res/values-h320dp/dimens.xml
new file mode 100644
index 000000000..777a3da91
--- /dev/null
+++ b/Habitica/res/values-h320dp/dimens.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="setup_vertical_spacing">8dp</dimen>
+    <dimen name="customization_drawer_subcategory_height">120dp</dimen>
+    <dimen name="customization_drawer_category_height">90dp</dimen>
+    <dimen name="customization_drawer_caret_margin">81dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-h601dp/dimens.xml b/Habitica/res/values-h601dp/dimens.xml
new file mode 100644
index 000000000..4c491d85d
--- /dev/null
+++ b/Habitica/res/values-h601dp/dimens.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="setup_vertical_spacing">20dp</dimen>
+    <dimen name="customization_drawer_subcategory_height">130dp</dimen>
+    <dimen name="customization_drawer_category_height">100dp</dimen>
+    <dimen name="customization_drawer_caret_margin">91dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-v21/styles.xml b/Habitica/res/values-v21/styles.xml
index 36b71cf42..a04e2b059 100644
--- a/Habitica/res/values-v21/styles.xml
+++ b/Habitica/res/values-v21/styles.xml
@@ -10,4 +10,21 @@
         <item name="android:drawablePadding">4dp</item>
     </style>
 
+    <style name="AppTheme.ActionBar.Transparent">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">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:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">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-w320dp/dimens.xml b/Habitica/res/values-w320dp/dimens.xml
new file mode 100644
index 000000000..d520cd139
--- /dev/null
+++ b/Habitica/res/values-w320dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="content_inset">6dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-w321dp/dimens.xml b/Habitica/res/values-w321dp/dimens.xml
new file mode 100644
index 000000000..32cc656fc
--- /dev/null
+++ b/Habitica/res/values-w321dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="content_inset">21dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 30576d82d..58fc40966 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -25,4 +25,8 @@
         <attr name="text" format="string" />
         <attr name="npcDrawable" format="integer" />
     </declare-styleable>
+    <declare-styleable name="AvatarCategoryView">
+        <attr name="iconDrawable" format="integer" />
+        <attr name="categoryTitle" format="string" />
+    </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 0068f7e77..1d9600754 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -116,5 +116,22 @@
     <color name="white_75_alpha">#bfffffff</color>
     <color name="white_50_alpha">#7fffffff</color>
     <color name="white_15_alpha">#26ffffff</color>
+    <color name="black_10_alpha">#16000000</color>
+    <color name="black_20_alpha">#33000000</color>
     <color name="light_gray_bg">#F6F4F8</color>
+
+    <color name="skin_ddc994">#ddc994</color>
+    <color name="skin_f5a76e">#f5a76e</color>
+    <color name="skin_ea8349">#ea8349</color>
+    <color name="skin_c06534">#c06534</color>
+    <color name="skin_98461a">#98461a</color>
+    <color name="skin_915533">#915533</color>
+    <color name="skin_c3e1dc">#c3e1dc</color>
+    <color name="skin_6bd049">#6bd049</color>
+    
+    <color name="hair_white">#DEDEDE</color>
+    <color name="hair_brown">#903A00</color>
+    <color name="hair_blond">#CFA925</color>
+    <color name="hair_red">#EC720E</color>
+    <color name="hair_black">#313131</color>
 </resources>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index dbcd49996..d86537483 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -102,4 +102,5 @@
 	<dimen name="dialog_marginTopBottom">24dp</dimen>
     <dimen name="login_intro_button_size">126dp</dimen>
 	<dimen name="diamond_button_height">40dp</dimen>
+    <dimen name="setup_customization_size">52dp</dimen>
 </resources>
diff --git a/Habitica/res/values/strings.constants.xml b/Habitica/res/values/strings.constants.xml
index 1b8b6428e..47c2a5904 100644
--- a/Habitica/res/values/strings.constants.xml
+++ b/Habitica/res/values/strings.constants.xml
@@ -19,4 +19,5 @@
     <string name="qr_album_name" translatable="false">habitica</string>
     <string name="qr_file_name" translatable="false"> habitrpg-qr-code.jpg</string>
     <string name="habitica_user_count" translatable="false">2,000,000</string>
+    <string name="brand_name" translatable="false">Habitica</string>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 6e8456de1..6bf78effd 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -544,6 +544,19 @@ To start, which parts of your life do you want to improve?</string>
     <string name="action_back">Back</string>
     <string name="welcome_text">Oh, you must be new here. I’m Justin, I’ll be your guide in Habitica.\n\nTo start, you’ll need to create an avatar.</string>
     <string name="randomize">Randomize</string>
+    <string name="avatar_extras">Extras</string>
+    <string name="avatar_skin_color">Skin Color</string>
+    <string name="avatar_hair_color">Hair Color</string>
+    <string name="avatar_hair_bangs">Bangs</string>
+    <string name="avatar_hair_ponytail">Ponytail</string>
+    <string name="avatar_glasses">Glasses</string>
+    <string name="avatar_wheelchair">Wheelchair</string>
+    <string name="weak">Weak</string>
+    <string name="strong">Strong</string>
+    <string name="gray">Gray</string>
+    <string name="dated">Dated</string>
+    <string name="completed">Completed</string>
+    <string name="setuP_group_other">Other</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 34b3aa03c..d5e50506b 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -41,13 +41,23 @@
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
     </style>
 
-    <style name="AppThemeWithActionBar" parent="AppTheme">
+    <style name="AppTheme.ActionBar" parent="AppTheme">
         <item name="windowActionBar">true</item>
         <item name="windowNoTitle">false</item>
-
     </style>
 
-    <style name="AppThemeWithActionBarBlackText" parent="AppThemeWithActionBar">
+    <style name="AppTheme.ActionBar.Transparent">
+    </style>
+    
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar.Transparent">
+    </style>
+
+    <style name="AppThemeWithActionBarBlackText" parent="AppTheme.ActionBar">
         <item name="android:textColorPrimary">@android:color/black</item>
     </style>
 
@@ -320,12 +330,22 @@
         <item name="android:padding">16dp</item>
     </style>
 
-    <style name="DiamondButton">
+    <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:layout_height">36dp</item>
-        <item name="android:background">@drawable/login_button</item>
+        <item name="android:background">@drawable/diamond_button</item>
         <item name="android:paddingLeft">36dp</item>
         <item name="android:paddingRight">36dp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textAllCaps">false</item>
+        <item name="android:shadowColor">@color/transparent</item>
+    </style>
+
+    <style name="TaskFilterRadioButton">
+        <item name="android:layout_weight">1</item>
+        <item name="android:button">@color/transparent</item>
+        <item name="android:background">@drawable/pill_radio_button</item>
+        <item name="android:gravity">center</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:textColor">@drawable/radio_button_text_color</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/xml/main_menu_tasks.xml b/Habitica/res/xml/main_menu_tasks.xml
new file mode 100644
index 000000000..5a705d42a
--- /dev/null
+++ b/Habitica/res/xml/main_menu_tasks.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tabs>
+    <tab
+            id="@+id/tab_habits"
+            icon="@drawable/icon_habits"
+            title="@string/habits" />
+    <tab
+            id="@+id/tab_dailies"
+            icon="@drawable/icon_dailies"
+            title="@string/dailies" />
+    <tab
+            id="@+id/tab_todos"
+            icon="@drawable/icon_todos"
+            title="@string/todos" />
+    <tab
+            id="@+id/tab_rewards"
+            icon="@drawable/icon_rewards"
+            title="@string/rewards" />
+</tabs>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
deleted file mode 100644
index c929a0785..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
+++ /dev/null
@@ -1,440 +0,0 @@
-package com.habitrpg.android.habitica;
-
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-
-import com.amplitude.api.Amplitude;
-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.ApiService;
-import com.magicmicky.habitrpgwrapper.lib.api.Server;
-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.Purchases;
-import com.magicmicky.habitrpgwrapper.lib.models.Skill;
-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.FeedResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-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.raizlabs.android.dbflow.structure.ModelAdapter;
-
-import android.app.Activity;
-import android.content.Context;
-import android.support.v7.app.AlertDialog;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.net.ssl.SSLException;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.ResponseBody;
-import okhttp3.logging.HttpLoggingInterceptor;
-import retrofit2.Converter;
-import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.HttpException;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
-import retrofit2.converter.gson.GsonConverterFactory;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.functions.Func1;
-import rx.functions.Func2;
-import rx.schedulers.Schedulers;
-
-
-public class APIHelper implements Action1<Throwable> {
-    // I think we don't need the APIHelper anymore we could just use ApiService
-    public final ApiService apiService;
-    private final GsonConverterFactory gsonConverter;
-    private final HostConfig hostConfig;
-    private final Retrofit retrofitAdapter;
-    public String languageCode;
-    @Inject
-    CrashlyticsProxy crashlyticsProxy;
-    @Inject
-    Context context;
-    final Observable.Transformer apiCallTransformer =
-            observable -> ((Observable) observable)
-                    .map(new Func1<HabitResponse, Object>() {
-                        @Override
-                        public Object call(HabitResponse habitResponse) {
-                            if (habitResponse.notifications != null) {
-                                PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(APIHelper.this, context);
-                                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
-                            }
-                            return habitResponse.getData();
-                        }
-                    })
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .doOnError(this);
-    private AlertDialog displayedAlert;
-
-    //private OnHabitsAPIResult mResultListener;
-    //private HostConfig mConfig;
-    public APIHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig) {
-        this.gsonConverter = gsonConverter;
-        this.hostConfig = hostConfig;
-        HabiticaBaseApplication.getComponent().inject(this);
-        crashlyticsProxy.setUserIdentifier(this.hostConfig.getUser());
-        crashlyticsProxy.setUserName(this.hostConfig.getUser());
-        Amplitude.getInstance().setUserId(this.hostConfig.getUser());
-
-        HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-        if (BuildConfig.DEBUG) {
-            logging.setLevel(HttpLoggingInterceptor.Level.BODY);
-        }
-
-        String userAgent = System.getProperty("http.agent");
-
-        OkHttpClient client = new OkHttpClient.Builder()
-                .addInterceptor(logging)
-                .addNetworkInterceptor(chain -> {
-                    Request original = chain.request();
-                    if (this.hostConfig.getUser() != null) {
-                        Request.Builder builder = original.newBuilder()
-                                .header("x-api-key", this.hostConfig.getApi())
-                                .header("x-api-user", this.hostConfig.getUser())
-                                .header("x-client", "habitica-android");
-                        if (userAgent != null) {
-                            builder = builder.header("user-agent", userAgent);
-                        }
-                        Request request = builder.method(original.method(), original.body())
-                                .build();
-                        return chain.proceed(request);
-                    } else {
-                        return chain.proceed(original);
-                    }
-                })
-                .build();
-
-        Server server = new Server(this.hostConfig.getAddress());
-
-        retrofitAdapter = new Retrofit.Builder()
-                .client(client)
-                .baseUrl(server.toString())
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-                .addConverterFactory(gsonConverter)
-                .build();
-
-        this.apiService = retrofitAdapter.create(ApiService.class);
-    }
-
-    public static GsonConverterFactory createGsonFactory() {
-        Type taskTagClassListType = new TypeToken<List<TaskTag>>() {
-        }.getType();
-        Type skillListType = new TypeToken<List<Skill>>() {
-        }.getType();
-        Type customizationListType = new TypeToken<List<Customization>>() {
-        }.getType();
-        Type tutorialStepListType = new TypeToken<List<TutorialStep>>() {
-        }.getType();
-        Type faqArticleListType = new TypeToken<List<FAQArticle>>() {
-        }.getType();
-        Type itemDataListType = new TypeToken<List<ItemData>>() {
-        }.getType();
-        Type eggListType = new TypeToken<List<Egg>>() {
-        }.getType();
-        Type foodListType = new TypeToken<List<Food>>() {
-        }.getType();
-        Type hatchingPotionListType = new TypeToken<List<HatchingPotion>>() {
-        }.getType();
-        Type questContentListType = new TypeToken<List<QuestContent>>() {
-        }.getType();
-        Type petListType = new TypeToken<HashMap<String, Pet>>() {
-        }.getType();
-        Type mountListType = new TypeToken<HashMap<String, Mount>>() {
-        }.getType();
-
-        //Exclusion strategy needed for DBFlow https://github.com/Raizlabs/DBFlow/issues/121
-        Gson gson = new GsonBuilder()
-                .setExclusionStrategies(new CheckListItemExcludeStrategy())
-                .setExclusionStrategies(new ExclusionStrategy() {
-                    @Override
-                    public boolean shouldSkipField(FieldAttributes f) {
-                        return f.getDeclaredClass().equals(ModelAdapter.class);
-                    }
-
-                    @Override
-                    public boolean shouldSkipClass(Class<?> clazz) {
-                        return false;
-                    }
-                })
-                .registerTypeAdapter(taskTagClassListType, new TaskTagDeserializer())
-                .registerTypeAdapter(Boolean.class, new BooleanAsIntAdapter())
-                .registerTypeAdapter(boolean.class, new BooleanAsIntAdapter())
-                .registerTypeAdapter(skillListType, new SkillDeserializer())
-                .registerTypeAdapter(ChecklistItem.class, new ChecklistItemSerializer())
-                .registerTypeAdapter(RemindersItem.class, new RemindersItemSerializer())
-                .registerTypeAdapter(TaskList.class, new TaskListDeserializer())
-                .registerTypeAdapter(Purchases.class, new PurchasedDeserializer())
-                .registerTypeAdapter(customizationListType, new CustomizationDeserializer())
-                .registerTypeAdapter(tutorialStepListType, new TutorialStepListDeserializer())
-                .registerTypeAdapter(faqArticleListType, new FAQArticleListDeserilializer())
-                .registerTypeAdapter(Group.class, new GroupSerialization())
-                .registerTypeAdapter(Date.class, new DateDeserializer())
-                .registerTypeAdapter(itemDataListType, new ItemDataListDeserializer())
-                .registerTypeAdapter(eggListType, new EggListDeserializer())
-                .registerTypeAdapter(foodListType, new FoodListDeserializer())
-                .registerTypeAdapter(hatchingPotionListType, new HatchingPotionListDeserializer())
-                .registerTypeAdapter(questContentListType, new QuestListDeserializer())
-                .registerTypeAdapter(petListType, new PetListDeserializer())
-                .registerTypeAdapter(mountListType, new MountListDeserializer())
-                .registerTypeAdapter(ChatMessage.class, new ChatMessageDeserializer())
-                .registerTypeAdapter(Task.class, new TaskSerializer())
-                .registerTypeAdapter(ContentResult.class, new ContentDeserializer())
-                .registerTypeAdapter(FeedResponse.class, new FeedResponseDeserializer())
-                .registerTypeAdapter(Challenge.class, new ChallengeDeserializer())
-                .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-                .create();
-        return GsonConverterFactory.create(gson);
-    }
-
-    public Observable<HabitResponse<UserAuthResponse>> registerUser(String username, String email, String password, String confirmPassword) {
-        UserAuth auth = new UserAuth();
-        auth.setUsername(username);
-        auth.setPassword(password);
-        auth.setConfirmPassword(confirmPassword);
-        auth.setEmail(email);
-        return this.apiService.registerUser(auth);
-    }
-
-    public Observable<HabitResponse<UserAuthResponse>> connectUser(String username, String password) {
-        UserAuth auth = new UserAuth();
-        auth.setUsername(username);
-        auth.setPassword(password);
-        return this.apiService.connectLocal(auth);
-    }
-
-    public Observable<HabitResponse<UserAuthResponse>> connectSocial(String network, String userId, String accessToken) {
-        UserAuthSocial auth = new UserAuthSocial();
-        auth.setNetwork(network);
-        UserAuthSocialTokens authResponse = new UserAuthSocialTokens();
-        authResponse.setClient_id(userId);
-        authResponse.setAccess_token(accessToken);
-        auth.setAuthResponse(authResponse);
-        return this.apiService.connectSocial(auth);
-    }
-
-    @Override
-    public void call(Throwable throwable) {
-        final Class<?> throwableClass = throwable.getClass();
-        if (SocketException.class.isAssignableFrom(throwableClass) || SSLException.class.isAssignableFrom(throwableClass)) {
-            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)) {
-            HttpException error = (HttpException) throwable;
-            ErrorResponse res = getErrorResponse(error);
-            int status = error.code();
-
-            if (error.response().raw().request().url().toString().endsWith("/user/push-devices")) {
-                //workaround for an error that sometimes displays that the user already has this push device
-                return;
-            }
-
-            if (status >= 400 && status < 500) {
-                if (res != null && res.message != null && !res.message.isEmpty()) {
-                    showConnectionProblemDialog("", res.message);
-                } 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 {
-                showConnectionProblemDialog(R.string.internal_error_api);
-            }
-        } else {
-            crashlyticsProxy.logException(throwable);
-        }
-    }
-
-    public ErrorResponse getErrorResponse(HttpException error) {
-        retrofit2.Response<?> response = error.response();
-        Converter<ResponseBody, ?> errorConverter =
-                gsonConverter
-                        .responseBodyConverter(ErrorResponse.class, new Annotation[0], retrofitAdapter);
-        try {
-            return (ErrorResponse) errorConverter.convert(response.errorBody());
-        } catch (IOException e) {
-            return new ErrorResponse();
-        }
-    }
-
-    public Observable<HabitResponse<HabitRPGUser>> retrieveUser(boolean withTasks) {
-        Observable<HabitResponse<HabitRPGUser>> userObservable = apiService.getUser();
-        if (withTasks) {
-            Observable<HabitResponse<TaskList>> tasksObservable = apiService.getTasks();
-
-            userObservable = Observable.zip(userObservable, tasksObservable,
-                    new Func2<HabitResponse<HabitRPGUser>, HabitResponse<TaskList>, HabitResponse<HabitRPGUser>>() {
-                        @Override
-                        public HabitResponse<HabitRPGUser> call(HabitResponse<HabitRPGUser> habitRPGUserHabitResponse, HabitResponse<TaskList> taskListHabitResponse) {
-                            HabitRPGUser habitRPGUser = habitRPGUserHabitResponse.getData();
-                            TaskList tasks = taskListHabitResponse.getData();
-
-                            habitRPGUser.setHabits(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getHabits()));
-                            habitRPGUser.setDailys(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getDailys()));
-                            habitRPGUser.setTodos(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getTodos()));
-                            habitRPGUser.setRewards(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getRewards()));
-                            for (Task task : tasks.tasks.values()) {
-                                switch (task.getType()) {
-                                    case "habit":
-                                        habitRPGUser.getHabits().add(task);
-                                        break;
-                                    case "daily":
-                                        habitRPGUser.getDailys().add(task);
-                                        break;
-                                    case "todo":
-                                        habitRPGUser.getTodos().add(task);
-                                        break;
-                                    case "reward":
-                                        habitRPGUser.getRewards().add(task);
-                                        break;
-                                }
-                            }
-
-                            habitRPGUserHabitResponse.data = habitRPGUser;
-                            return habitRPGUserHabitResponse;
-                        }
-                    });
-        }
-        return userObservable;
-    }
-
-    private List<Task> sortTasks(Map<String, Task> taskMap, List<String> taskOrder) {
-        List<Task> taskList = new ArrayList<>();
-        int position = 0;
-        for (String taskId : taskOrder) {
-            Task task = taskMap.get(taskId);
-            if (task != null) {
-                task.position = position;
-                taskList.add(task);
-                position++;
-                taskMap.remove(taskId);
-            }
-        }
-        return taskList;
-    }
-
-    public boolean hasAuthenticationKeys() {
-        return this.hostConfig.getUser() != null;
-    }
-
-    private void showConnectionProblemDialog(final int resourceMessageString) {
-        showConnectionProblemDialog(R.string.network_error_title, resourceMessageString);
-    }
-
-    private void showConnectionProblemDialog(final int resourceTitleString, final int resourceMessageString) {
-        Activity currentActivity = HabiticaApplication.currentActivity;
-        if (currentActivity != null) {
-            showConnectionProblemDialog(currentActivity.getString(resourceTitleString), currentActivity.getString(resourceMessageString));
-        }
-    }
-
-    private void showConnectionProblemDialog(final String resourceTitleString, final String resourceMessageString) {
-        HabiticaApplication.currentActivity.runOnUiThread(() -> {
-            if (!(HabiticaApplication.currentActivity).isFinishing() && displayedAlert == null) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity)
-                        .setTitle(resourceTitleString)
-                        .setMessage(resourceMessageString)
-                        .setNeutralButton(android.R.string.ok, (dialog, which) -> {
-                            displayedAlert = null;
-                        });
-
-                if (!resourceTitleString.isEmpty()) {
-                    builder.setIcon(R.drawable.ic_warning_black);
-                }
-
-                displayedAlert = builder.show();
-            }
-        });
-    }
-
-    /*
-     This function is used with Observer.compose to reuse transformers across the application.
-     See here for more info: http://blog.danlew.net/2015/03/02/dont-break-the-chain/
-     */
-
-    @SuppressWarnings("unchecked")
-    public <T> Observable.Transformer<HabitResponse<T>, T> configureApiCallObserver() {
-        return (Observable.Transformer<HabitResponse<T>, T>) apiCallTransformer;
-    }
-
-    public void updateAuthenticationCredentials(String userID, String apiToken) {
-        this.hostConfig.setUser(userID);
-        this.hostConfig.setApi(apiToken);
-        crashlyticsProxy.setUserIdentifier(this.hostConfig.getUser());
-        crashlyticsProxy.setUserName(this.hostConfig.getUser());
-        Amplitude.getInstance().setUserId(this.hostConfig.getUser());
-    }
-
-    public Observable<HabitResponse<ContentResult>> getContent() {
-        return apiService.getContent(languageCode);
-    }
-
-    public static class ErrorResponse {
-        public String message;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ApiClientImpl.java
new file mode 100644
index 000000000..8f09d5547
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ApiClientImpl.java
@@ -0,0 +1,836 @@
+package com.habitrpg.android.habitica;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
+import com.amplitude.api.Amplitude;
+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.ApiService;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
+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.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.responses.BuyResponse;
+import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
+import com.magicmicky.habitrpgwrapper.lib.models.Purchases;
+import com.magicmicky.habitrpgwrapper.lib.models.Skill;
+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.FeedResponse;
+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.raizlabs.android.dbflow.structure.ModelAdapter;
+
+import android.app.Activity;
+import android.content.Context;
+import android.support.v7.app.AlertDialog;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.net.ssl.SSLException;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.ResponseBody;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava.HttpException;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.functions.Func1;
+import rx.schedulers.Schedulers;
+
+
+public class ApiClientImpl implements Action1<Throwable>, ApiClient {
+    private final GsonConverterFactory gsonConverter;
+    private final HostConfig hostConfig;
+    private final Retrofit retrofitAdapter;
+
+    private CrashlyticsProxy crashlyticsProxy;
+    private Context context;
+
+    // I think we don't need the ApiClientImpl anymore we could just use ApiService
+    private final ApiService apiService;
+
+    final Observable.Transformer apiCallTransformer =
+            observable -> ((Observable) observable)
+                    .map(new Func1<HabitResponse, Object>() {
+                        @Override
+                        public Object call(HabitResponse habitResponse) {
+                            if (habitResponse.notifications != null) {
+                                PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(com.habitrpg.android.habitica.ApiClientImpl.this, context);
+                                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
+                            }
+                            return habitResponse.getData();
+                        }
+                    })
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .doOnError(this);
+    private AlertDialog displayedAlert;
+    private String languageCode;
+
+    //private OnHabitsAPIResult mResultListener;
+    //private HostConfig mConfig;
+    public ApiClientImpl(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, Context context) {
+        this.gsonConverter = gsonConverter;
+        this.hostConfig = hostConfig;
+        this.context = context;
+
+        HabiticaBaseApplication.getComponent().inject(this);
+        crashlyticsProxy.setUserIdentifier(this.hostConfig.getUser());
+        crashlyticsProxy.setUserName(this.hostConfig.getUser());
+        Amplitude.getInstance().setUserId(this.hostConfig.getUser());
+
+        HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+        if (BuildConfig.DEBUG) {
+            logging.setLevel(HttpLoggingInterceptor.Level.BODY);
+        }
+
+        String userAgent = System.getProperty("http.agent");
+
+        OkHttpClient client = new OkHttpClient.Builder()
+                .addInterceptor(logging)
+                .addNetworkInterceptor(chain -> {
+                    Request original = chain.request();
+                    Request.Builder builder = original.newBuilder();
+                    if (this.hostConfig.getUser() != null) {
+                        builder = builder
+                                .header("x-api-key", this.hostConfig.getApi())
+                                .header("x-api-user", this.hostConfig.getUser());
+                    }
+                    builder = builder.header("x-client", "habitica-android");
+                    if (userAgent != null) {
+                        builder = builder.header("user-agent", userAgent);
+                    }
+                    Request request = builder.method(original.method(), original.body())
+                            .build();
+                    return chain.proceed(request);
+                })
+                .build();
+
+        Server server = new Server(this.hostConfig.getAddress());
+
+        retrofitAdapter = new Retrofit.Builder()
+                .client(client)
+                .baseUrl(server.toString())
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                .addConverterFactory(gsonConverter)
+                .build();
+
+        this.apiService = retrofitAdapter.create(ApiService.class);
+    }
+
+    public static GsonConverterFactory createGsonFactory() {
+        Type taskTagClassListType = new TypeToken<List<TaskTag>>() {
+        }.getType();
+        Type skillListType = new TypeToken<List<Skill>>() {
+        }.getType();
+        Type customizationListType = new TypeToken<List<Customization>>() {
+        }.getType();
+        Type tutorialStepListType = new TypeToken<List<TutorialStep>>() {
+        }.getType();
+        Type faqArticleListType = new TypeToken<List<FAQArticle>>() {
+        }.getType();
+        Type itemDataListType = new TypeToken<List<ItemData>>() {
+        }.getType();
+        Type eggListType = new TypeToken<List<Egg>>() {
+        }.getType();
+        Type foodListType = new TypeToken<List<Food>>() {
+        }.getType();
+        Type hatchingPotionListType = new TypeToken<List<HatchingPotion>>() {
+        }.getType();
+        Type questContentListType = new TypeToken<List<QuestContent>>() {
+        }.getType();
+        Type petListType = new TypeToken<HashMap<String, Pet>>() {
+        }.getType();
+        Type mountListType = new TypeToken<HashMap<String, Mount>>() {
+        }.getType();
+
+        //Exclusion strategy needed for DBFlow https://github.com/Raizlabs/DBFlow/issues/121
+        Gson gson = new GsonBuilder()
+                .setExclusionStrategies(new CheckListItemExcludeStrategy())
+                .setExclusionStrategies(new ExclusionStrategy() {
+                    @Override
+                    public boolean shouldSkipField(FieldAttributes f) {
+                        return f.getDeclaredClass().equals(ModelAdapter.class);
+                    }
+
+                    @Override
+                    public boolean shouldSkipClass(Class<?> clazz) {
+                        return false;
+                    }
+                })
+                .registerTypeAdapter(taskTagClassListType, new TaskTagDeserializer())
+                .registerTypeAdapter(Boolean.class, new BooleanAsIntAdapter())
+                .registerTypeAdapter(boolean.class, new BooleanAsIntAdapter())
+                .registerTypeAdapter(skillListType, new SkillDeserializer())
+                .registerTypeAdapter(ChecklistItem.class, new ChecklistItemSerializer())
+                .registerTypeAdapter(RemindersItem.class, new RemindersItemSerializer())
+                .registerTypeAdapter(TaskList.class, new TaskListDeserializer())
+                .registerTypeAdapter(Purchases.class, new PurchasedDeserializer())
+                .registerTypeAdapter(customizationListType, new CustomizationDeserializer())
+                .registerTypeAdapter(tutorialStepListType, new TutorialStepListDeserializer())
+                .registerTypeAdapter(faqArticleListType, new FAQArticleListDeserilializer())
+                .registerTypeAdapter(Group.class, new GroupSerialization())
+                .registerTypeAdapter(Date.class, new DateDeserializer())
+                .registerTypeAdapter(itemDataListType, new ItemDataListDeserializer())
+                .registerTypeAdapter(eggListType, new EggListDeserializer())
+                .registerTypeAdapter(foodListType, new FoodListDeserializer())
+                .registerTypeAdapter(hatchingPotionListType, new HatchingPotionListDeserializer())
+                .registerTypeAdapter(questContentListType, new QuestListDeserializer())
+                .registerTypeAdapter(petListType, new PetListDeserializer())
+                .registerTypeAdapter(mountListType, new MountListDeserializer())
+                .registerTypeAdapter(ChatMessage.class, new ChatMessageDeserializer())
+                .registerTypeAdapter(Task.class, new TaskSerializer())
+                .registerTypeAdapter(ContentResult.class, new ContentDeserializer())
+                .registerTypeAdapter(FeedResponse.class, new FeedResponseDeserializer())
+                .registerTypeAdapter(Challenge.class, new ChallengeDeserializer())
+                .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+                .create();
+        return GsonConverterFactory.create(gson);
+    }
+
+    public Observable<UserAuthResponse> registerUser(String username, String email, String password, String confirmPassword) {
+        UserAuth auth = new UserAuth();
+        auth.setUsername(username);
+        auth.setPassword(password);
+        auth.setConfirmPassword(confirmPassword);
+        auth.setEmail(email);
+        return this.apiService.registerUser(auth).compose(configureApiCallObserver());
+    }
+
+    public Observable<UserAuthResponse> connectUser(String username, String password) {
+        UserAuth auth = new UserAuth();
+        auth.setUsername(username);
+        auth.setPassword(password);
+        return this.apiService.connectLocal(auth).compose(configureApiCallObserver());
+    }
+
+    public Observable<UserAuthResponse> connectSocial(String network, String userId, String accessToken) {
+        UserAuthSocial auth = new UserAuthSocial();
+        auth.setNetwork(network);
+        UserAuthSocialTokens authResponse = new UserAuthSocialTokens();
+        authResponse.setClient_id(userId);
+        authResponse.setAccess_token(accessToken);
+        auth.setAuthResponse(authResponse);
+
+        return this.apiService.connectSocial(auth).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public void call(Throwable throwable) {
+        final Class<?> throwableClass = throwable.getClass();
+        if (SocketException.class.isAssignableFrom(throwableClass) || SSLException.class.isAssignableFrom(throwableClass)) {
+            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)) {
+            HttpException error = (HttpException) throwable;
+            ErrorResponse res = getErrorResponse(error);
+            int status = error.code();
+
+            if (error.response().raw().request().url().toString().endsWith("/user/push-devices")) {
+                //workaround for an error that sometimes displays that the user already has this push device
+                return;
+            }
+
+            if (status >= 400 && status < 500) {
+                if (res != null && res.message != null && !res.message.isEmpty()) {
+                    showConnectionProblemDialog("", res.message);
+                } 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 {
+                showConnectionProblemDialog(R.string.internal_error_api);
+            }
+        } else {
+            crashlyticsProxy.logException(throwable);
+        }
+    }
+
+    public ErrorResponse getErrorResponse(HttpException error) {
+        retrofit2.Response<?> response = error.response();
+        Converter<ResponseBody, ?> errorConverter =
+                gsonConverter
+                        .responseBodyConverter(ErrorResponse.class, new Annotation[0], retrofitAdapter);
+        try {
+            return (ErrorResponse) errorConverter.convert(response.errorBody());
+        } catch (IOException e) {
+            return new ErrorResponse();
+        }
+    }
+
+    public Observable<HabitRPGUser> retrieveUser(boolean withTasks) {
+
+        Observable<HabitRPGUser> userObservable = this.getUser();
+
+        if (withTasks) {
+            Observable<TaskList> tasksObservable = this.getTasks();
+
+            userObservable = Observable.zip(userObservable, tasksObservable,
+                    (habitRPGUser, tasks) -> {
+
+                        habitRPGUser.setHabits(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getHabits()));
+                        habitRPGUser.setDailys(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getDailys()));
+                        habitRPGUser.setTodos(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getTodos()));
+                        habitRPGUser.setRewards(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getRewards()));
+                        for (Task task : tasks.tasks.values()) {
+                            switch (task.getType()) {
+                                case "habit":
+                                    habitRPGUser.getHabits().add(task);
+                                    break;
+                                case "daily":
+                                    habitRPGUser.getDailys().add(task);
+                                    break;
+                                case "todo":
+                                    habitRPGUser.getTodos().add(task);
+                                    break;
+                                case "reward":
+                                    habitRPGUser.getRewards().add(task);
+                                    break;
+                            }
+                        }
+
+                        return habitRPGUser;
+                    });
+        }
+        return userObservable;
+    }
+
+    private List<Task> sortTasks(Map<String, Task> taskMap, List<String> taskOrder) {
+        List<Task> taskList = new ArrayList<>();
+        int position = 0;
+        for (String taskId : taskOrder) {
+            Task task = taskMap.get(taskId);
+            if (task != null) {
+                task.position = position;
+                taskList.add(task);
+                position++;
+                taskMap.remove(taskId);
+            }
+        }
+        return taskList;
+    }
+
+    public boolean hasAuthenticationKeys() {
+        return this.hostConfig.getUser() != null;
+    }
+
+    private void showConnectionProblemDialog(final int resourceMessageString) {
+        showConnectionProblemDialog(R.string.network_error_title, resourceMessageString);
+    }
+
+    private void showConnectionProblemDialog(final int resourceTitleString, final int resourceMessageString) {
+        Activity currentActivity = HabiticaApplication.currentActivity;
+        if (currentActivity != null) {
+            showConnectionProblemDialog(currentActivity.getString(resourceTitleString), currentActivity.getString(resourceMessageString));
+        }
+    }
+
+    private void showConnectionProblemDialog(final String resourceTitleString, final String resourceMessageString) {
+        HabiticaApplication.currentActivity.runOnUiThread(() -> {
+            if (!(HabiticaApplication.currentActivity).isFinishing() && displayedAlert == null) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity)
+                        .setTitle(resourceTitleString)
+                        .setMessage(resourceMessageString)
+                        .setNeutralButton(android.R.string.ok, (dialog, which) -> {
+                            displayedAlert = null;
+                        });
+
+                if (!resourceTitleString.isEmpty()) {
+                    builder.setIcon(R.drawable.ic_warning_black);
+                }
+
+                displayedAlert = builder.show();
+            }
+        });
+    }
+
+    /*
+     This function is used with Observer.compose to reuse transformers across the application.
+     See here for more info: http://blog.danlew.net/2015/03/02/dont-break-the-chain/
+     */
+
+    @SuppressWarnings("unchecked")
+    public <T> Observable.Transformer<HabitResponse<T>, T> configureApiCallObserver() {
+        return (Observable.Transformer<HabitResponse<T>, T>) apiCallTransformer;
+    }
+
+    public void updateAuthenticationCredentials(String userID, String apiToken) {
+        this.hostConfig.setUser(userID);
+        this.hostConfig.setApi(apiToken);
+        if (crashlyticsProxy != null) {
+            crashlyticsProxy.setUserIdentifier(this.hostConfig.getUser());
+            crashlyticsProxy.setUserName(this.hostConfig.getUser());
+        }
+        Amplitude.getInstance().setUserId(this.hostConfig.getUser());
+    }
+
+    @Override
+    public void setLanguageCode(String languageCode) {
+        this.languageCode =  languageCode;
+    }
+
+    @Override
+    public Observable<Status> getStatus() {
+        return apiService.getStatus().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<ContentResult> getContent(String language) {
+        return apiService.getContent(language).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> getUser() {
+        return apiService.getUser().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> updateUser(Map<String, Object> updateDictionary) {
+        return apiService.updateUser(updateDictionary).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> registrationLanguage(String registrationLanguage) {
+        return apiService.registrationLanguage(registrationLanguage).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<List<ItemData>> getInventoryBuyableGear() {
+        return apiService.getInventoryBuyableGear().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Items> equipItem(String type, String itemKey) {
+        return apiService.equipItem(type, itemKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<BuyResponse> buyItem(String itemKey) {
+
+        return apiService.buyItem(itemKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> purchaseItem(String type, String itemKey) {
+
+        return apiService.purchaseItem(type, itemKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> validateSubscription(SubscriptionValidationRequest request){
+        return apiService.validateSubscription(request).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> purchaseHourglassItem(String type, String itemKey) {
+
+        return apiService.purchaseHourglassItem(type, itemKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> purchaseMysterySet(String itemKey) {
+        return apiService.purchaseMysterySet(itemKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> purchaseQuest(String key) {
+        return apiService.purchaseQuest(key).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> sellItem(String itemType, String itemKey) {
+        return apiService.sellItem(itemType, itemKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<FeedResponse> feedPet(String petKey, String foodKey) {
+        return apiService.feedPet(petKey, foodKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Items> hatchPet(String eggKey, String hatchingPotionKey) {
+        return apiService.hatchPet(eggKey, hatchingPotionKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<TaskList> getTasks() {
+        return apiService.getTasks().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<UnlockResponse> unlockPath(String path) {
+        return apiService.unlockPath(path).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Task> getTask(String id) {
+        return apiService.getTask(id).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<TaskDirectionData> postTaskDirection(String id, String direction) {
+        return apiService.postTaskDirection(id, direction).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<ArrayList<String>> postTaskNewPosition(String id, String position) {
+        return apiService.postTaskNewPosition(id, position).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Task> scoreChecklistItem(String taskId, String itemId) {
+        return apiService.scoreChecklistItem(taskId, itemId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Task> createItem(Task item) {
+        return apiService.createItem(item).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<List<Task>> createTasks(List<Task> tasks) {
+        return apiService.createTasks(tasks).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Task> updateTask(String id, Task item) {
+        return apiService.updateTask(id, item).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> deleteTask(String id) {
+        return apiService.deleteTask(id).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Tag> createTag(Tag tag) {
+        return apiService.createTag(tag).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Tag> updateTag(String id, Tag tag) {
+        return apiService.updateTag(id, tag).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> deleteTag(String id) {
+        return apiService.deleteTag(id).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Boolean> sleep() {
+        return apiService.sleep().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> revive() {
+        return apiService.revive().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<SkillResponse> useSkill(String skillName, String targetType, String targetId) {
+        return apiService.useSkill(skillName, targetType, targetId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<SkillResponse> useSkill(String skillName, String targetType) {
+        return apiService.useSkill(skillName, targetType).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> changeClass() {
+        return apiService.changeClass().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> changeClass(String className) {
+        return apiService.changeClass(className).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> disableClasses() {
+        return apiService.disableClasses().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> markPrivateMessagesRead() {
+        return apiService.markPrivateMessagesRead().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<List<Group>> listGroups(String type) {
+        return apiService.listGroups(type).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Group> getGroup(String groupId) {
+        return apiService.getGroup(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> updateGroup(String id, Group item) {
+        return apiService.updateGroup(id, item).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<List<ChatMessage>> listGroupChat(String groupId) {
+        return apiService.listGroupChat(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Group> joinGroup(String groupId) {
+        return apiService.joinGroup(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> leaveGroup(String groupId) {
+        return apiService.leaveGroup(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postGroupChat(String groupId, HashMap<String, String> message) {
+        return apiService.postGroupChat(groupId, message).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> deleteMessage(String groupId, String messageId) {
+        return apiService.deleteMessage(groupId, messageId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<List<HabitRPGUser>> getGroupMembers(String groupId, Boolean includeAllPublicFields) {
+        return apiService.getGroupMembers(groupId, includeAllPublicFields).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<List<HabitRPGUser>> getGroupMembers(String groupId, Boolean includeAllPublicFields, String lastId) {
+        return apiService.getGroupMembers(groupId, includeAllPublicFields, lastId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<ChatMessage> likeMessage(String groupId, String mid) {
+        return apiService.likeMessage(groupId, mid).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> flagMessage(String groupId, String mid) {
+        return apiService.flagMessage(groupId, mid).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> seenMessages(String groupId) {
+        return apiService.seenMessages(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> inviteToGroup(String groupId, Map<String, Object> inviteData) {
+        return apiService.inviteToGroup(groupId, inviteData).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> rejectGroupInvite(String groupId) {
+        return apiService.rejectGroupInvite(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> acceptQuest(String groupId) {
+        return apiService.acceptQuest(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> rejectQuest(String groupId) {
+        return apiService.rejectQuest(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> cancelQuest(String groupId) {
+        return apiService.cancelQuest(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Quest> forceStartQuest(String groupId, Group group) {
+        return apiService.forceStartQuest(groupId,group).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Quest> inviteToQuest(String groupId, String questKey) {
+        return apiService.inviteToQuest(groupId, questKey).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Quest> abortQuest(String groupId) {
+        return apiService.abortQuest(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> leaveQuest(String groupId) {
+        return apiService.leaveQuest(groupId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<PurchaseValidationResult> validatePurchase(PurchaseValidationRequest request) {
+        return apiService.validatePurchase(request).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> changeCustomDayStart(Map<String, Object> updateObject) {
+        return apiService.changeCustomDayStart(updateObject).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<HabitRPGUser> GetMember(String memberId) {
+        return apiService.GetMember(memberId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<AchievementResult> GetMemberAchievements(String memberId) {
+        return apiService.GetMemberAchievements(memberId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postPrivateMessage(HashMap<String, String> messageDetails) {
+        return apiService.postPrivateMessage(messageDetails).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Shop> fetchShopInventory(String identifier) {
+        return apiService.fetchShopInventory(identifier).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> addPushDevice(Map<String, String> pushDeviceData) {
+        return apiService.addPushDevice(pushDeviceData).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> deletePushDevice(String regId) {
+        return apiService.deletePushDevice(regId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<ArrayList<Challenge>> getUserChallenges() {
+        return apiService.getUserChallenges().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<TaskList> getChallengeTasks(String challengeId) {
+        return apiService.getChallengeTasks(challengeId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Challenge> getChallenge(String challengeId) {
+        return apiService.getChallenge(challengeId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Challenge> joinChallenge(String challengeId) {
+        return apiService.joinChallenge(challengeId).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> leaveChallenge(String challengeId, LeaveChallengeBody body) {
+        return apiService.leaveChallenge(challengeId, body).compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> debugAddTenGems() {
+        return apiService.debugAddTenGems().compose(configureApiCallObserver());
+    }
+
+    @Override
+    public Observable<Void> readNotificaiton(String notificationId) {
+        return apiService.readNotification(notificationId).compose(configureApiCallObserver());
+    }
+
+    public Observable<ContentResult>getContent() {
+        return apiService.getContent(languageCode).compose(configureApiCallObserver());
+    }
+
+
+    @Override
+    public Observable<ItemData> openMysteryItem() {
+        return apiService.openMysteryItem().compose(configureApiCallObserver());
+    }
+
+}
\ 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 c485ff090..447a22c72 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica;
 
+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;
@@ -15,11 +16,11 @@ import rx.Observable;
 
 
 public class ContentCache {
-    private APIHelper apiHelper;
+    private ApiClient apiClient;
 
 
-    public ContentCache(APIHelper apiHelper) {
-        this.apiHelper = apiHelper;
+    public ContentCache(ApiClient apiClient) {
+        this.apiClient = apiClient;
     }
 
     public void GetQuestContent(final String key, final QuestContentCallback cb) {
@@ -69,8 +70,8 @@ public class ContentCache {
     }
 
     private <T> void getContentAndSearchFor(final String typeOfSearch, final String searchKey, final GotContentEntryCallback<T> gotEntry) {
-        apiHelper.getContent()
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.getContent()
+
                 .subscribe(contentResult -> {
                     switch (typeOfSearch) {
                         case "quest": {
@@ -112,8 +113,8 @@ public class ContentCache {
 
     private void getContentAndSearchForList(final String typeOfSearch, final List<String> searchKeys, final GotContentEntryCallback<List<ItemData>> gotEntry) {
         List<ItemData> resultList = new ArrayList<>();
-        apiHelper.getContent()
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.getContent()
+
                 .flatMap(contentResult -> {
                     List<ItemData> itemList = new ArrayList<ItemData>(contentResult.gear.flat);
                     itemList.add(contentResult.potion);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java
new file mode 100644
index 000000000..124912df5
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica;
+
+public class ErrorResponse {
+    public String message;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
index 40445240c..49a3c9846 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
@@ -7,5 +7,5 @@ public class HabitDatabase {
 
     public static final String NAME = "Habitica";
 
-    public static final int VERSION = 33;
+    public static final int VERSION = 34;
 }
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 644b21d2a..fe45d8568 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -43,6 +43,24 @@ import android.support.annotation.RequiresApi;
 import android.support.multidex.MultiDexApplication;
 import android.util.Log;
 
+import com.amplitude.api.Amplitude;
+import com.facebook.FacebookSdk;
+import com.facebook.drawee.backends.pipeline.Fresco;
+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.raizlabs.android.dbflow.config.FlowManager;
+import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.RefWatcher;
+
+import org.solovyev.android.checkout.Billing;
+import org.solovyev.android.checkout.Cache;
+import org.solovyev.android.checkout.Checkout;
+import org.solovyev.android.checkout.PurchaseVerifier;
+
 import java.io.File;
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -59,7 +77,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
     private static AppComponent component;
     public RefWatcher refWatcher;
     @Inject
-    Lazy<APIHelper> lazyApiHelper;
+    Lazy<ApiClient> lazyApiHelper;
     @Inject
     SharedPreferences sharedPrefs;
     @Inject
@@ -178,15 +196,11 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         int lastInstalledVersion = sharedPrefs.getInt("last_installed_version", 0);
         if (lastInstalledVersion < info.versionCode) {
             sharedPrefs.edit().putInt("last_installed_version", info.versionCode).apply();
-            APIHelper apiHelper = this.lazyApiHelper.get();
+            ApiClient apiClient = this.lazyApiHelper.get();
 
-            apiHelper.apiService.getContent(apiHelper.languageCode)
-                    .compose(this.lazyApiHelper.get().configureApiCallObserver())
-                    .subscribe(contentResult -> {
-                    }, throwable -> {
-                    });
+            apiClient.getContent()
+                    .subscribe(contentResult -> { }, throwable -> {});
         }
-
     }
 
     private void setupDagger() {
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 d2ae20875..a4e409ea1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
@@ -2,6 +2,7 @@ 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;
@@ -30,16 +31,16 @@ import retrofit2.adapter.rxjava.HttpException;
 public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
 
     private static final String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS";
-    private final APIHelper apiHelper;
+    private final ApiClient apiClient;
     private Set<String> purchasedOrderList = new HashSet<>();
     private SharedPreferences preferences;
 
-    public HabiticaPurchaseVerifier(Context context, APIHelper apiHelper) {
+    public HabiticaPurchaseVerifier(Context context, ApiClient apiClient) {
         preferences = PreferenceManager.getDefaultSharedPreferences(context);
 
         preferences.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
 
-        this.apiHelper = apiHelper;
+        this.apiClient = apiClient;
     }
 
     @Override
@@ -57,32 +58,30 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                     validationRequest.transaction = new Transaction();
                     validationRequest.transaction.receipt = purchase.data;
                     validationRequest.transaction.signature = purchase.signature;
-                    apiHelper.apiService.validatePurchase(validationRequest).subscribe(purchaseValidationResult -> {
-                        purchasedOrderList.add(purchase.orderId);
 
-                        verifiedPurchases.add(purchase);
+                apiClient.validatePurchase(validationRequest).subscribe(purchaseValidationResult -> {
+                    purchasedOrderList.add(purchase.orderId);
 
                         requestListener.onSuccess(verifiedPurchases);
 
-                        //TODO: find way to get $ price automatically.
-                        if (purchase.sku.equals(PurchaseTypes.Purchase4Gems)) {
-                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 0.99);
-                        } else if (purchase.sku.equals(PurchaseTypes.Purchase21Gems)) {
-                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 4.99);
-                        } else if (purchase.sku.equals(PurchaseTypes.Purchase42Gems)) {
-                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 9.99);
-                        } else if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
-                            Seeds.sharedInstance().recordSeedsIAPEvent(purchase.sku, 19.99);
-                        }
-                    }, throwable -> {
-                        if (throwable.getClass().equals(HttpException.class)) {
-                            HttpException error = (HttpException) throwable;
-                            APIHelper.ErrorResponse res = apiHelper.getErrorResponse((HttpException) throwable);
-                            if (error.code() == 401) {
-                                if (res.message.equals("RECEIPT_ALREADY_USED")) {
-                                    purchasedOrderList.add(purchase.orderId);
 
-                                    verifiedPurchases.add(purchase);
+                    //TODO: find way to get $ price automatically.
+                    if (purchase.sku.equals(PurchaseTypes.Purchase4Gems)) {
+                        Seeds.sharedInstance().recordIAPEvent(purchase.sku, 0.99);
+                    } else if (purchase.sku.equals(PurchaseTypes.Purchase21Gems)) {
+                        Seeds.sharedInstance().recordIAPEvent(purchase.sku, 4.99);
+                    } else if (purchase.sku.equals(PurchaseTypes.Purchase42Gems)) {
+                        Seeds.sharedInstance().recordIAPEvent(purchase.sku, 9.99);
+                    } else if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
+                        Seeds.sharedInstance().recordSeedsIAPEvent(purchase.sku, 19.99);
+                    }
+                }, throwable -> {
+                    if (throwable.getClass().equals(HttpException.class)) {
+                        HttpException error = (HttpException)throwable;
+                        ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
+                        if (error.code() == 401) {
+                            if (res.message.equals("RECEIPT_ALREADY_USED")) {
+                                purchasedOrderList.add(purchase.orderId);
 
                                     requestListener.onSuccess(verifiedPurchases);
                                     return;
@@ -97,7 +96,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                     validationRequest.transaction.receipt = purchase.data;
                     validationRequest.transaction.signature = purchase.signature;
                     validationRequest.sku = purchase.sku;
-                    apiHelper.apiService.validateSubscription(validationRequest).subscribe(purchaseValidationResult -> {
+                    apiClient.validateSubscription(validationRequest).subscribe(purchaseValidationResult -> {
                         purchasedOrderList.add(purchase.orderId);
 
                         verifiedPurchases.add(purchase);
@@ -108,7 +107,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                     }, throwable -> {
                         if (throwable.getClass().equals(HttpException.class)) {
                             HttpException error = (HttpException) throwable;
-                            APIHelper.ErrorResponse res = apiHelper.getErrorResponse((HttpException) throwable);
+                            ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
                             if (error.code() == 401) {
                                 if (res.message.equals("RECEIPT_ALREADY_USED")) {
                                     purchasedOrderList.add(purchase.orderId);
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 8b09aaec0..0fd313e8c 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
@@ -18,6 +18,7 @@ public class HabitRPGUserCallback implements Action1<HabitRPGUser> {
 
     @Override
     public void call(HabitRPGUser habitRPGUser) {
+        // Negue: once everything is refactored to DbFlowTaskLocalRepository, this will be removed
         habitRPGUser.async().save();
         callBack.onUserReceived(habitRPGUser);
     }
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 c38adbe3d..1f8f57eda 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,6 +1,7 @@
 package com.habitrpg.android.habitica.components;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.helpers.RemindersManager;
 import com.habitrpg.android.habitica.helpers.SoundManager;
@@ -9,6 +10,7 @@ import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManag
 import com.habitrpg.android.habitica.modules.ApiModule;
 import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.modules.DeveloperModule;
+import com.habitrpg.android.habitica.modules.RepositoryModule;
 import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
 import com.habitrpg.android.habitica.ui.activities.AboutActivity;
 import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
@@ -84,7 +86,7 @@ import javax.inject.Singleton;
 import dagger.Component;
 
 @Singleton
-@Component(modules = {AppModule.class, ApiModule.class, DeveloperModule.class})
+@Component(modules = {DeveloperModule.class, AppModule.class, ApiModule.class, RepositoryModule.class})
 public interface AppComponent {
 
     void inject(ClassSelectionActivity classSelectionActivity);
@@ -209,7 +211,7 @@ public interface AppComponent {
 
     void inject(ChallengeDetailActivity challengeDetailActivity);
 
-    void inject(APIHelper apiHelper);
+    void inject(ApiClient apiClient);
 
     void inject(TaskListWidgetProvider taskListWidgetProvider);
 
@@ -235,5 +237,7 @@ public interface AppComponent {
 
     void inject(GemPurchaseActivity gemPurchaseActivity);
 
+    void inject(TaskFilterDialog taskFilterDialog);
+
     void inject(CreateChallengeActivity createChallengeActivity);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.java
new file mode 100644
index 000000000..fb8ad2e60
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.java
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica.data;
+
+public interface BaseRepository {
+
+}
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
new file mode 100644
index 000000000..d112c04e2
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
@@ -0,0 +1,14 @@
+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 java.util.List;
+
+public interface SetupCustomizationRepository {
+
+    public List<SetupCustomization> getCustomizations(String type, HabitRPGUser user);
+    public List<SetupCustomization> getCustomizations(String type, String subtype, HabitRPGUser user);
+}
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
new file mode 100644
index 000000000..76a67129d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
@@ -0,0 +1,22 @@
+package com.habitrpg.android.habitica.data;
+
+import com.magicmicky.habitrpgwrapper.lib.models.Tag;
+
+import java.util.Collection;
+import java.util.List;
+
+import rx.Observable;
+
+public interface TagRepository extends BaseRepository {
+
+    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);
+}
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
new file mode 100644
index 000000000..945d9d58f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
@@ -0,0 +1,24 @@
+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 java.util.ArrayList;
+
+import rx.Observable;
+
+public interface TaskRepository extends BaseRepository  {
+    Observable<ArrayList<Task>> getTasks(String taskType);
+
+    Observable<TaskList> refreshTasks(TasksOrder tasksOrder);
+
+    Observable<TaskDirectionData> taskChecked(Task task, boolean up);
+    Observable<Task> scoreChecklistItem(String taskId, String itemId);
+
+    Observable<Task> createTask(Task task);
+
+    Observable<Task> updateTask(Task task);
+}
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
new file mode 100644
index 000000000..43904b7b3
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.java
@@ -0,0 +1,20 @@
+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;
+
+public abstract class BaseRepositoryImpl<T extends BaseLocalRepository> implements BaseRepository {
+
+    protected final T localRepository;
+    protected final ApiClient apiClient;
+
+    public BaseRepositoryImpl(T localRepository, ApiClient apiClient) {
+        this.localRepository = localRepository;
+        this.apiClient = apiClient;
+    }
+
+    public void close() {
+        this.localRepository.close();
+    }
+}
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
new file mode 100644
index 000000000..270f71a56
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
@@ -0,0 +1,172 @@
+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 android.content.Context;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.inject.Inject;
+
+
+public class SetupCustomizationRepositoryImpl implements SetupCustomizationRepository {
+
+    private final Context context;
+
+    @Inject
+    public SetupCustomizationRepositoryImpl(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public List<SetupCustomization> getCustomizations(String category, HabitRPGUser user) {
+        return getCustomizations(category, null, user);
+    }
+
+    @Override
+    public List<SetupCustomization> getCustomizations(String category, String subcategory, HabitRPGUser user) {
+        switch (category) {
+            case "body": {
+                switch (subcategory) {
+                    case "size":
+                        return getSizes();
+                    case "shirt":
+                        return getShirts(user.getPreferences().getSize());
+                }
+            }
+            case "skin":
+                return getSkins();
+            case "hair": {
+                switch (subcategory) {
+                    case "bangs":
+                        return getBangs();
+                    case "ponytail":
+                        return getHairBases();
+                    case "color":
+                        return getHairColors();
+                }
+            }
+            case "extras": {
+                switch (subcategory) {
+                    case "flower":
+                        return getFlowers();
+                    case "glasses":
+                        return getGlasses();
+                    case "wheelchair":
+                        return getWheelchairs();
+                }
+            }
+        }
+        return new ArrayList<>();
+    }
+
+    private List<SetupCustomization> getWheelchairs() {
+        return Arrays.asList(
+                SetupCustomization.createWheelchair("none", 0),
+                SetupCustomization.createWheelchair("black", R.drawable.creator_chair_black),
+                SetupCustomization.createWheelchair("blue", R.drawable.creator_chair_blue),
+                SetupCustomization.createWheelchair("green", R.drawable.creator_chair_green),
+                SetupCustomization.createWheelchair("pink", R.drawable.creator_chair_pink),
+                SetupCustomization.createWheelchair("red", R.drawable.creator_chair_red),
+                SetupCustomization.createWheelchair("yellow", R.drawable.creator_chair_yellow)
+        );
+    }
+
+    private List<SetupCustomization> getGlasses() {
+        return Arrays.asList(
+                SetupCustomization.createGlasses("", 0),
+                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),
+                SetupCustomization.createGlasses("eyewear_special_pinkTopFrame", R.drawable.creator_eyewear_special_pinktopframe),
+                SetupCustomization.createGlasses("eyewear_special_redTopFrame", R.drawable.creator_eyewear_special_redtopframe),
+                SetupCustomization.createGlasses("eyewear_special_yellowTopFrame", R.drawable.creator_eyewear_special_yellowtopframe)
+        );
+    }
+
+    private List<SetupCustomization> getFlowers() {
+        return Arrays.asList(
+                SetupCustomization.createFlower("0", R.drawable.creator_blank_face),
+                SetupCustomization.createFlower("1", R.drawable.creator_hair_flower_1),
+                SetupCustomization.createFlower("2", R.drawable.creator_hair_flower_2),
+                SetupCustomization.createFlower("3", R.drawable.creator_hair_flower_3),
+                SetupCustomization.createFlower("4", R.drawable.creator_hair_flower_4),
+                SetupCustomization.createFlower("5", R.drawable.creator_hair_flower_5),
+                SetupCustomization.createFlower("6", R.drawable.creator_hair_flower_6)
+        );
+    }
+
+    private List<SetupCustomization> getHairColors() {
+        return Arrays.asList(
+                SetupCustomization.createHairColor("white", R.color.hair_white),
+                SetupCustomization.createHairColor("brown", R.color.hair_brown),
+                SetupCustomization.createHairColor("blond", R.color.hair_blond),
+                SetupCustomization.createHairColor("red", R.color.hair_red),
+                SetupCustomization.createHairColor("black", R.color.hair_black)
+        );
+    }
+
+    private List<SetupCustomization> getHairBases() {
+        return Arrays.asList(
+                SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face),
+                SetupCustomization.createHairPonytail("1", R.drawable.creator_hair_base_1_red),
+                SetupCustomization.createHairPonytail("3", R.drawable.creator_hair_base_3_red)
+                );
+    }
+
+    private List<SetupCustomization> getBangs() {
+        return Arrays.asList(
+                SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face),
+                SetupCustomization.createHairBangs("1", R.drawable.creator_hair_bangs_1_red),
+                SetupCustomization.createHairBangs("2", R.drawable.creator_hair_bangs_2_red),
+                SetupCustomization.createHairBangs("3", R.drawable.creator_hair_bangs_3_red)
+        );
+    }
+
+    private List<SetupCustomization> getSizes() {
+        return Arrays.asList(
+                SetupCustomization.createSize("slim", R.drawable.creator_slim_shirt_black, context.getString(R.string.avatar_size_slim)),
+                SetupCustomization.createSize("broad", R.drawable.creator_broad_shirt_black, context.getString(R.string.avatar_size_broad))
+        );
+    }
+
+    private List<SetupCustomization> getShirts(String size) {
+        if (size.equals("broad")) {
+            return Arrays.asList(
+                    SetupCustomization.createShirt("black", R.drawable.creator_broad_shirt_black),
+                    SetupCustomization.createShirt("blue", R.drawable.creator_broad_shirt_blue),
+                    SetupCustomization.createShirt("green", R.drawable.creator_broad_shirt_green),
+                    SetupCustomization.createShirt("pink", R.drawable.creator_broad_shirt_pink),
+                    SetupCustomization.createShirt("white", R.drawable.creator_broad_shirt_white),
+                    SetupCustomization.createShirt("yellow", R.drawable.creator_broad_shirt_yellow)
+            );
+        } else {
+            return Arrays.asList(
+                    SetupCustomization.createShirt("black", R.drawable.creator_slim_shirt_black),
+                    SetupCustomization.createShirt("blue", R.drawable.creator_slim_shirt_blue),
+                    SetupCustomization.createShirt("green", R.drawable.creator_slim_shirt_green),
+                    SetupCustomization.createShirt("pink", R.drawable.creator_slim_shirt_pink),
+                    SetupCustomization.createShirt("white", R.drawable.creator_slim_shirt_white),
+                    SetupCustomization.createShirt("yellow", R.drawable.creator_slim_shirt_yellow)
+            );
+        }
+    }
+
+    private List<SetupCustomization> getSkins() {
+        return Arrays.asList(
+                SetupCustomization.createSkin("ddc994", R.color.skin_ddc994),
+                SetupCustomization.createSkin("f5a76e", R.color.skin_f5a76e),
+                SetupCustomization.createSkin("ea8349", R.color.skin_ea8349),
+                SetupCustomization.createSkin("c06534", R.color.skin_c06534),
+                SetupCustomization.createSkin("98461a", R.color.skin_98461a),
+                SetupCustomization.createSkin("915533", R.color.skin_915533),
+                SetupCustomization.createSkin("c3e1dc", R.color.skin_c3e1dc),
+                SetupCustomization.createSkin("6bd049", R.color.skin_6bd049)
+        );
+    }
+}
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
new file mode 100644
index 000000000..968e31d60
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
@@ -0,0 +1,55 @@
+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 java.util.Collection;
+import java.util.List;
+
+import rx.Observable;
+import rx.functions.Func0;
+
+
+public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> implements TagRepository {
+
+    public TagRepositoryImpl(TagLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<Tag> createTag(Tag tag) {
+        return apiClient.createTag(tag);
+    }
+
+    @Override
+    public Observable<Tag> updateTag(Tag tag) {
+        return apiClient.updateTag(tag.id, tag);
+    }
+
+    @Override
+    public Observable<Void> deleteTag(String id) {
+        return apiClient.deleteTag(id);
+    }
+
+    @Override
+    public Observable<Tag> createTags(Collection<Tag> tags) {
+        return Observable.defer(() -> Observable.from(tags))
+                .filter(tag -> !tag.getName().isEmpty())
+                .flatMap(this::createTag);
+    }
+
+    @Override
+    public Observable<Tag> updateTags(Collection<Tag> tags) {
+        return Observable.defer(() -> Observable.from(tags))
+                .flatMap(this::updateTag);
+    }
+
+    @Override
+    public Observable<List<Void>> deleteTags(Collection<String> tagIds) {
+        return Observable.defer(() -> Observable.from(tagIds))
+                .flatMap(this::deleteTag)
+                .toList();
+    }
+}
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
new file mode 100644
index 000000000..ea9041d92
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -0,0 +1,76 @@
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.magicmicky.habitrpgwrapper.lib.api.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 java.util.ArrayList;
+import java.util.Date;
+
+import rx.Observable;
+
+
+public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository> implements TaskRepository {
+
+    private long lastTaskAction = 0;
+
+    public TaskRepositoryImpl(TaskLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<ArrayList<Task>> getTasks(String taskType) {
+        return this.localRepository.getTasks(taskType);
+    }
+
+    @Override
+    public Observable<TaskList> refreshTasks(TasksOrder tasksOrder) {
+        return this.apiClient.getTasks()
+                .doOnNext(res -> this.localRepository.saveTasks(tasksOrder, res));
+    }
+
+    @Override
+    public Observable<TaskDirectionData> taskChecked(Task task, boolean up) {
+        long now = new Date().getTime();
+        if (lastTaskAction > now-500) {
+            return Observable.empty();
+        }
+        lastTaskAction = now;
+        return this.apiClient.postTaskDirection(task.getId(), (up ? TaskDirection.up : TaskDirection.down).toString())
+                .doOnNext(res -> {
+                    // save local task changes
+                    if (task.type != null && !task.type.equals("reward")) {
+                        task.value = task.value + res.getDelta();
+
+                        this.localRepository.saveTask(task);
+                    }
+                });
+    }
+
+    public Observable<Task> scoreChecklistItem(String taskId, String itemId){
+        return apiClient.scoreChecklistItem(taskId, itemId).doOnNext(this.localRepository::saveTask);
+    }
+
+    @Override
+    public Observable<Task> createTask(Task task) {
+        long now = new Date().getTime();
+        if (lastTaskAction > now-500) {
+            return Observable.empty();
+        }
+        return apiClient.createItem(task);
+    }
+
+    @Override
+    public Observable<Task> updateTask(Task task) {
+        long now = new Date().getTime();
+        if (lastTaskAction > now-500) {
+            return Observable.empty();
+        }
+        return apiClient.updateTask(task.getId(), task);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.java
new file mode 100644
index 000000000..4dae26d2e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.java
@@ -0,0 +1,6 @@
+package com.habitrpg.android.habitica.data.local;
+
+public interface BaseLocalRepository {
+
+    void close();
+}
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
new file mode 100644
index 000000000..376c10bf2
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
@@ -0,0 +1,4 @@
+package com.habitrpg.android.habitica.data.local;
+
+public interface TagLocalRepository extends BaseLocalRepository {
+}
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
new file mode 100644
index 000000000..656c2176f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
@@ -0,0 +1,18 @@
+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 java.util.ArrayList;
+
+import rx.Observable;
+
+public interface TaskLocalRepository extends BaseLocalRepository {
+
+    Observable<ArrayList<Task>> getTasks(String taskType);
+
+    void saveTasks(TasksOrder tasksOrder, TaskList tasks);
+
+    void saveTask(Task task);
+}
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
new file mode 100644
index 000000000..c5dfa086e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
@@ -0,0 +1,64 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowTaskLocalRepository implements TaskLocalRepository {
+
+    @Override
+    public Observable<ArrayList<Task>> getTasks(String taskType) {
+        return null;
+    }
+
+    @Override
+    public void saveTasks(TasksOrder tasksOrder, TaskList tasks) {
+        sortTasks(tasks, tasksOrder.getHabits());
+        sortTasks(tasks, tasksOrder.getDailys());
+        sortTasks(tasks, tasksOrder.getTodos());
+        sortTasks(tasks, tasksOrder.getRewards());
+
+        // Negue: once everything is refactored to DbFlowTaskLocalRepository, this will be used to save the tasks
+        // not in HabitRPGUserCallback
+
+        /*
+        for (Task t : tasks){
+            t.async().save();
+        }
+        */
+    }
+
+    @Override
+    public void saveTask(Task task) {
+        task.async().save();
+    }
+
+    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) {
+                task.position = position;
+                taskResult.add(task);
+                position++;
+                taskList.tasks.remove(taskId);
+            }
+        }
+        return taskResult;
+    }
+
+    @Override
+    public void close() {
+
+    }
+}
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
new file mode 100644
index 000000000..2d96269b0
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/TagLocalRepositoryImpl.java
@@ -0,0 +1,11 @@
+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/commands/RefreshTasksCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshTasksCommand.java
new file mode 100644
index 000000000..45fc11c3f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshTasksCommand.java
@@ -0,0 +1,4 @@
+package com.habitrpg.android.habitica.events.commands;
+
+public class RefreshTasksCommand {
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java
new file mode 100644
index 000000000..30a395db1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java
@@ -0,0 +1,53 @@
+package com.habitrpg.android.habitica.executors;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class JobExecutor implements ThreadExecutor {
+
+    private static final int INITIAL_POOL_SIZE = 3;
+    private static final int MAX_POOL_SIZE = 5;
+
+    // Sets the amount of time an idle thread waits before terminating
+    private static final int KEEP_ALIVE_TIME = 10;
+
+    // Sets the Time Unit to seconds
+    private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS;
+
+    private final BlockingQueue<Runnable> workQueue;
+
+    private final ThreadPoolExecutor threadPoolExecutor;
+
+    private final ThreadFactory threadFactory;
+
+    @Inject
+    public JobExecutor() {
+        this.workQueue = new LinkedBlockingQueue<>();
+        this.threadFactory = new JobThreadFactory();
+        this.threadPoolExecutor = new ThreadPoolExecutor(INITIAL_POOL_SIZE, MAX_POOL_SIZE,
+                KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, this.workQueue, this.threadFactory);
+    }
+
+    @Override public void execute(Runnable runnable) {
+        if (runnable == null) {
+            throw new IllegalArgumentException("Runnable to execute cannot be null");
+        }
+        this.threadPoolExecutor.execute(runnable);
+    }
+
+    private static class JobThreadFactory implements ThreadFactory {
+        private static final String THREAD_NAME = "android_";
+        private int counter = 0;
+
+        @Override public Thread newThread(Runnable runnable) {
+            return new Thread(runnable, THREAD_NAME + counter++);
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
new file mode 100644
index 000000000..eaba4fb72
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/PostExecutionThread.java
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.executors;
+
+import rx.Scheduler;
+
+public interface PostExecutionThread {
+    Scheduler getScheduler();
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/ThreadExecutor.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/ThreadExecutor.java
new file mode 100644
index 000000000..52fd1234b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/ThreadExecutor.java
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica.executors;
+
+import java.util.concurrent.Executor;
+
+public interface ThreadExecutor extends Executor {}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
new file mode 100644
index 000000000..c763cb7ec
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/UIThread.java
@@ -0,0 +1,19 @@
+package com.habitrpg.android.habitica.executors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import rx.Scheduler;
+import rx.android.schedulers.AndroidSchedulers;
+
+@Singleton
+public class UIThread implements PostExecutionThread {
+
+    @Inject
+    public UIThread() {}
+
+    @Override
+    public Scheduler getScheduler() {
+        return AndroidSchedulers.mainThread();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
index b29959714..51592cfcc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.helpers;
 
 import com.amplitude.api.Amplitude;
+import com.habitrpg.android.habitica.BuildConfig;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -24,7 +25,10 @@ public class AmplitudeManager {
     }
 
     public static void sendEvent(String eventAction, String eventCategory, String hitType, Map<String, Object> additionalData) {
-        JSONObject eventProperties = new JSONObject();
+        if (BuildConfig.DEBUG) {
+            return;
+        }
+            JSONObject eventProperties = new JSONObject();
         try {
             eventProperties.put("eventAction", eventAction);
             eventProperties.put("eventCategory", eventCategory);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MathHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MathHelper.java
new file mode 100644
index 000000000..b7160c9b1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MathHelper.java
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.helpers;
+
+public class MathHelper {
+    static public Double round(Double value, int n) {
+        return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
+    }
+}
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 7ea30aba2..c1e32a78c 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,20 +1,21 @@
 package com.habitrpg.android.habitica.helpers;
 
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.APIHelper;
-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.models.Notification;
-import com.magicmicky.habitrpgwrapper.lib.models.notifications.Reward;
-
-import android.content.Context;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
+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 android.content.Context;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,18 +27,18 @@ import java.util.Map;
 public class PopupNotificationsManager {
     private static PopupNotificationsManager instance;
     private Map<String, Boolean> seenNotifications;
-    private APIHelper apiHelper;
+    private ApiClient apiClient;
     private Context context;
 
     // @TODO: A queue for displaying alert dialogues
 
-    private PopupNotificationsManager(APIHelper apiHelper, Context context) {
-        this.apiHelper = apiHelper;
+    private PopupNotificationsManager(ApiClient apiClient, Context context) {
+        this.apiClient = apiClient;
         this.seenNotifications = new HashMap<>();
         this.context = context.getApplicationContext();
     }
 
-    public static PopupNotificationsManager getInstance(APIHelper apiHelper, Context context) {
+    public static PopupNotificationsManager getInstance(ApiClient apiHelper, Context context) {
         if (instance == null) {
             instance = new PopupNotificationsManager(apiHelper, context);
         }
@@ -91,13 +92,10 @@ public class PopupNotificationsManager {
         confirmButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (apiHelper != null) {
+                if (apiClient != null) {
                     // @TODO: This should be handled somewhere else? MAybe we notifiy via event
-                    apiHelper.apiService.readNotificaiton(notification.getId())
-                            .compose(apiHelper.configureApiCallObserver())
-                            .subscribe(next -> {
-                            }, throwable -> {
-                            });
+                    apiClient.readNotificaiton(notification.getId())
+                            .subscribe(next -> {}, throwable -> {});
                 }
 
                 dialog.hide();
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 2845cce64..f38da6bed 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
@@ -1,7 +1,21 @@
 package com.habitrpg.android.habitica.helpers;
 
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v7.preference.PreferenceManager;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+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;
@@ -12,21 +26,6 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import net.glxn.qrgen.android.QRCode;
 
-import android.app.Dialog;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.os.Environment;
-import android.support.v7.preference.PreferenceManager;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -82,7 +81,10 @@ public class QrCodeManager {
         this.userId = userId;
     }
 
-    public void setUpView(LinearLayout qrLayout) {
+    public void setUpView(@Nullable LinearLayout qrLayout) {
+        if (qrLayout == null) {
+            return;
+        }
         this.qrCodeImageView = (ImageView) qrLayout.findViewById(R.id.QRImageView);
         this.qrCodeDownloadButton = (Button) qrLayout.findViewById(R.id.QRDownloadButton);
         this.avatarView = (AvatarView) qrLayout.findViewById(R.id.avatarView);
@@ -101,7 +103,7 @@ public class QrCodeManager {
         this.setDownloadQr();
     }
 
-    public void displayQrCode() {
+    private void displayQrCode() {
         if (qrCodeImageView == null) {
             return;
         }
@@ -116,42 +118,39 @@ public class QrCodeManager {
         qrCodeImageView.setImageBitmap(myBitmap);
     }
 
-    public float dipToPixels(float dipValue) {
+    private float dipToPixels(float dipValue) {
         DisplayMetrics metrics = this.context.getResources().getDisplayMetrics();
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dipValue, metrics);
     }
 
-    public void setDownloadQr() {
+    private void setDownloadQr() {
         if (qrCodeDownloadButton == null) {
             return;
         }
 
-        qrCodeDownloadButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                File dir = getAlbumStorageDir(context, albumnName);
-                dir.mkdirs();
+        qrCodeDownloadButton.setOnClickListener(view -> {
+            File dir = getAlbumStorageDir(context, albumnName);
+            dir.mkdirs();
 
-                File pathToQRCode = new File(dir, fileName);
-                try {
-                    pathToQRCode.createNewFile();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+            File pathToQRCode = new File(dir, fileName);
+            try {
+                pathToQRCode.createNewFile();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
 
-                try {
-                    FileOutputStream outputStream = new FileOutputStream(pathToQRCode);
-                    qrCodeWrapper.setDrawingCacheEnabled(true);
-                    Bitmap b = qrCodeWrapper.getDrawingCache();
-                    b.compress(Bitmap.CompressFormat.JPEG, 95, outputStream);
+            try {
+                FileOutputStream outputStream = new FileOutputStream(pathToQRCode);
+                qrCodeWrapper.setDrawingCacheEnabled(true);
+                Bitmap b = qrCodeWrapper.getDrawingCache();
+                b.compress(Bitmap.CompressFormat.JPEG, 95, outputStream);
 
-                    outputStream.close();
+                outputStream.close();
 
-                    Toast.makeText(context, saveMessage + pathToQRCode.getPath(),
-                            Toast.LENGTH_LONG).show();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+                Toast.makeText(context, saveMessage + pathToQRCode.getPath(),
+                        Toast.LENGTH_LONG).show();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         });
     }
@@ -173,12 +172,7 @@ public class QrCodeManager {
         this.setUpView(qrLayout);
         Button dialogButton = (Button) dialog.findViewById(R.id.dialogButtonOK);
 
-        dialogButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-            }
-        });
+        dialogButton.setOnClickListener(v -> dialog.dismiss());
 
         dialog.show();
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TagsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TagsHelper.java
deleted file mode 100644
index 4d8ae44f0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TagsHelper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by magicmicky on 02/10/15.
- */
-public class TagsHelper {
-    private List<String> tagsId;
-
-    public TagsHelper() {
-        tagsId = new ArrayList<String>();
-
-    }
-
-    public void addTags(String tags) {
-        this.tagsId.add(tags);
-    }
-
-    public int howMany() {
-        return this.tagsId.size();
-    }
-
-    public List<String> getTags() {
-        return this.tagsId;
-    }
-
-    public void setTags(List<String> tagsId) {
-        this.tagsId = tagsId;
-    }
-
-    public boolean isTagChecked(String tagID) {
-        return this.tagsId.contains(tagID);
-    }
-
-    public List<Task> filter(List<Task> tasks) {
-        List<Task> filtered = new ArrayList<Task>();
-        for (Task t : tasks) {
-            if (t.containsAllTagIds(this.tagsId)) {
-                filtered.add(t);
-            }
-        }
-
-        return filtered;
-    }
-}
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
new file mode 100644
index 000000000..8722bd04b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
@@ -0,0 +1,81 @@
+package com.habitrpg.android.habitica.helpers;
+
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by magicmicky on 02/10/15.
+ */
+public class TaskFilterHelper {
+    private List<String> tagsId;
+    private String activeFilter;
+
+    public TaskFilterHelper() {
+        tagsId = new ArrayList<>();
+
+    }
+
+    public void addTags(String tags) {
+        this.tagsId.add(tags);
+    }
+
+    public int howMany() {
+        return this.tagsId.size() + (activeFilter != null ? 1 : 0);
+    }
+
+    public List<String> getTags() {
+        return this.tagsId;
+    }
+
+    public void setTags(List<String> tagsId) {
+        this.tagsId = tagsId;
+    }
+
+    public boolean isTagChecked(String tagID) {
+        return this.tagsId.contains(tagID);
+    }
+
+    public List<Task> filter(List<Task> tasks) {
+        List<Task> filtered = new ArrayList<Task>();
+        for (Task task : tasks) {
+            if (isFiltered(task)) {
+                filtered.add(task);
+            }
+        }
+
+        return filtered;
+    }
+
+    private boolean isFiltered(Task task) {
+        if (!task.containsAllTagIds(tagsId)) {
+            return false;
+        }
+        if (activeFilter != null && !activeFilter.equals(Task.FILTER_ALL)) {
+            switch (activeFilter) {
+                case Task.FILTER_ACTIVE:
+                    if (task.type.equals(Task.TYPE_DAILY)) {
+                        return task.isDisplayedActive(0);
+                    } else {
+                        return !task.completed;
+                    }
+                case Task.FILTER_GRAY:
+                    return task.completed || !task.isDisplayedActive(0);
+                case Task.FILTER_WEAK:
+                    return task.value < 0;
+                case Task.FILTER_STRONG:
+                    return task.value >= 0;
+                case Task.FILTER_DATED:
+                    return task.duedate != null;
+                case Task.FILTER_COMPLETED:
+                    return task.completed;
+            }
+        }
+        return true;
+    }
+
+    public void setActiveFilter(String activeFilter) {
+        this.activeFilter = activeFilter;
+    }
+}
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
new file mode 100644
index 000000000..54806670a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
@@ -0,0 +1,152 @@
+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 java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by krh12 on 3/31/2017.
+ */
+
+public class UserStatComputer {
+
+    // @TODO: Not really sure if this is correct
+    public interface StatsRow {
+
+    }
+
+    public class AttributeRow implements StatsRow {
+        public int labelId;
+        public float strVal;
+        public float intVal;
+        public float conVal;
+        public float perVal;
+        public boolean roundDown;
+        public boolean isSummary;
+    }
+
+    public class EquipmentRow implements StatsRow {
+        public String gearKey;
+        public String text;
+        public String stats;
+    }
+
+    public List<StatsRow> computeClassBonus (List<ItemData> itemDataList, HabitRPGUser user) {
+        List<StatsRow> skillRows = new ArrayList();
+
+        float strAttributes = 0;
+        float intAttributes = 0;
+        float conAttributes = 0;
+        float perAttributes = 0;
+
+        float strClassBonus = 0;
+        float intClassBonus = 0;
+        float conClassBonus = 0;
+        float perClassBonus = 0;
+
+        // Summarize stats and fill equipment table
+        for (ItemData i : itemDataList) {
+            int str_ = (int) i.getStr();
+            int int_ = (int) i.get_int();
+            int con_ = (int) i.getCon();
+            int per_ = (int) i.getPer();
+
+            strAttributes += str_;
+            intAttributes += int_;
+            conAttributes += con_;
+            perAttributes += per_;
+
+            StringBuilder sb = new StringBuilder();
+
+            if (str_ != 0) {
+                sb.append("STR " + str_ + ", ");
+            }
+            if (int_ != 0) {
+                sb.append("INT " + int_ + ", ");
+            }
+            if (con_ != 0) {
+                sb.append("CON " + con_ + ", ");
+            }
+            if (per_ != 0) {
+                sb.append("PER " + per_ + ", ");
+            }
+
+            // remove the last comma
+            if (sb.length() > 2) {
+                sb.delete(sb.length() - 2, sb.length());
+            }
+
+            EquipmentRow equipmentRow = new EquipmentRow();
+            equipmentRow.gearKey = i.getKey();
+            equipmentRow.text = i.getText();
+            equipmentRow.stats = sb.toString();
+            skillRows.add(equipmentRow);
+
+            // Calculate class bonus
+            String itemClass = i.getKlass();
+            String itemSpecialClass = i.getSpecialClass();
+
+            Boolean classDoesNotExist = itemClass == null || itemClass.isEmpty();
+            Boolean specialClassDoesNotExist = itemSpecialClass == null || itemSpecialClass.isEmpty();
+
+            if (classDoesNotExist && specialClassDoesNotExist) {
+                continue;
+            }
+
+            float classBonus = 0.5f;
+            Boolean userClassMatchesGearClass = !classDoesNotExist && itemClass.equals(user.getStats().get_class().toString());
+            Boolean userClassMatchesGearSpecialClass = !specialClassDoesNotExist && itemSpecialClass.equals(user.getStats().get_class().toString());
+
+            if (!userClassMatchesGearClass && !userClassMatchesGearSpecialClass) classBonus = 0;
+
+            if (itemClass.isEmpty()) {
+                itemClass = itemSpecialClass;
+            }
+
+            switch (itemClass) {
+                case "rogue":
+                    strClassBonus = str_ * classBonus;
+                    perClassBonus = per_ * classBonus;
+                    break;
+                case "healer":
+                    conClassBonus = con_ * classBonus;
+                    intClassBonus = int_ * classBonus;
+                    break;
+                case "warrior":
+                    strClassBonus = str_ * classBonus;
+                    conClassBonus = con_ * classBonus;
+                    break;
+                case "wizard":
+                    intClassBonus = int_ * classBonus;
+                    perClassBonus = per_ * classBonus;
+                    break;
+            }
+        }
+
+        AttributeRow attributeRow = new AttributeRow();
+        attributeRow.labelId = R.string.battle_gear;
+        attributeRow.strVal = strAttributes;
+        attributeRow.intVal = intAttributes;
+        attributeRow.conVal = conAttributes;
+        attributeRow.perVal = perAttributes;
+        attributeRow.roundDown = true;
+        attributeRow.isSummary = false;
+        skillRows.add(attributeRow);
+
+
+        AttributeRow attributeRow2 = new AttributeRow();
+        attributeRow2.labelId = R.string.profile_class_bonus;
+        attributeRow2.strVal = strClassBonus;
+        attributeRow2.intVal = intClassBonus;
+        attributeRow2.conVal = conClassBonus;
+        attributeRow2.perVal = perClassBonus;
+        attributeRow2.roundDown = false;
+        attributeRow2.isSummary = false;
+        skillRows.add(attributeRow2);
+
+        return skillRows;
+    }
+}
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 82bcfaef7..924d7f16c 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
@@ -1,17 +1,16 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.messaging.RemoteMessage;
-
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.PushDevice;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 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 java.util.HashMap;
 import java.util.Map;
 
@@ -30,7 +29,7 @@ public class PushNotificationManager {
     private static final String DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference";
     private static PushNotificationManager instance = null;
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
 
     private String refreshedToken;
     private SharedPreferences sharedPreferences;
@@ -89,19 +88,15 @@ public class PushNotificationManager {
         Map<String, String> pushDeviceData = new HashMap<>();
         pushDeviceData.put("regId", this.refreshedToken);
         pushDeviceData.put("type", "android");
-        apiHelper.apiService.addPushDevice(pushDeviceData)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(aVoid -> {
-                }, throwable -> {
-                });
+        apiClient.addPushDevice(pushDeviceData)
+
+            .subscribe(aVoid -> {}, throwable -> {});
     }
 
     public void removePushDeviceUsingStoredToken() {
-        apiHelper.apiService.deletePushDevice(this.refreshedToken)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(aVoid -> {
-                }, throwable -> {
-                });
+        apiClient.deletePushDevice(this.refreshedToken)
+
+            .subscribe(aVoid -> {}, throwable -> {});
     }
 
     private Boolean userHasPushDevice() {
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
new file mode 100644
index 000000000..849d14654
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
@@ -0,0 +1,42 @@
+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 javax.inject.Inject;
+
+import rx.Observable;
+
+public class BuyRewardUseCase extends UseCase<BuyRewardUseCase.RequestValues, TaskDirectionData> {
+
+    private TaskRepository taskRepository;
+    private SoundManager soundManager;
+
+    @Inject
+    public BuyRewardUseCase(TaskRepository taskRepository, SoundManager soundManager,
+                            ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
+        super(threadExecutor, postExecutionThread);
+        this.taskRepository = taskRepository;
+        this.soundManager = soundManager;
+    }
+
+    @Override
+    protected Observable<TaskDirectionData> buildUseCaseObservable(BuyRewardUseCase.RequestValues requestValues) {
+        return taskRepository.taskChecked(requestValues.task, false).doOnNext(res -> {
+
+            soundManager.loadAndPlayAudio(SoundManager.SoundReward);
+        });
+    }
+
+    public static final class RequestValues implements UseCase.RequestValues {
+        protected final Task task;
+
+        public RequestValues(Task task) {
+            this.task = task;
+        }
+    }
+}
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
new file mode 100644
index 000000000..ae72109f0
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
@@ -0,0 +1,78 @@
+package com.habitrpg.android.habitica.interactors;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.habitrpg.android.habitica.HabiticaApplication;
+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 javax.inject.Inject;
+
+import rx.Observable;
+
+import static com.habitrpg.android.habitica.ui.activities.MainActivity.SELECT_CLASS_RESULT;
+
+public class CheckClassSelectionUseCase extends UseCase<CheckClassSelectionUseCase.RequestValues, Void> {
+    @Inject
+    public CheckClassSelectionUseCase(ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
+        super(threadExecutor, postExecutionThread);
+    }
+
+    @Override
+    protected Observable<Void> buildUseCaseObservable(RequestValues requestValues) {
+        return Observable.from(() -> {
+
+            HabitRPGUser user = requestValues.user;
+
+            if(requestValues.selectClassEvent == null) {
+                if (user.getStats().getLvl() > 10 &&
+                        !user.getPreferences().getDisableClasses() &&
+                        !user.getFlags().getClassSelected()) {
+                    SelectClassEvent event = new SelectClassEvent();
+                    event.isInitialSelection = true;
+                    event.currentClass = user.getStats().get_class().toString();
+                    displayClassSelectionActivity(user, event);
+                }
+            } else {
+                displayClassSelectionActivity(user, requestValues.selectClassEvent);
+            }
+
+            return null;
+        });
+    }
+
+    private void displayClassSelectionActivity(HabitRPGUser user, SelectClassEvent event) {
+        Bundle bundle = new Bundle();
+        bundle.putString("size", user.getPreferences().getSize());
+        bundle.putString("skin", user.getPreferences().getSkin());
+        bundle.putString("shirt", user.getPreferences().getShirt());
+        bundle.putInt("hairBangs", user.getPreferences().getHair().getBangs());
+        bundle.putInt("hairBase", user.getPreferences().getHair().getBase());
+        bundle.putString("hairColor", user.getPreferences().getHair().getColor());
+        bundle.putInt("hairMustache", user.getPreferences().getHair().getMustache());
+        bundle.putInt("hairBeard", user.getPreferences().getHair().getBeard());
+        bundle.putBoolean("isInitialSelection", event.isInitialSelection);
+        bundle.putString("currentClass", event.currentClass);
+
+        Intent intent = new Intent(HabiticaApplication.currentActivity, ClassSelectionActivity.class);
+        intent.putExtras(bundle);
+        HabiticaApplication.currentActivity.startActivityForResult(intent, SELECT_CLASS_RESULT);
+    }
+
+    public static final class RequestValues implements UseCase.RequestValues {
+
+
+        private HabitRPGUser user;
+        private SelectClassEvent selectClassEvent;
+
+        public RequestValues(HabitRPGUser user, SelectClassEvent selectClassEvent) {
+
+            this.user = user;
+            this.selectClassEvent = selectClassEvent;
+        }
+    }
+}
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
new file mode 100644
index 000000000..ca1d4b50e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ChecklistCheckUseCase.java
@@ -0,0 +1,40 @@
+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 javax.inject.Inject;
+
+import rx.Observable;
+
+public class ChecklistCheckUseCase extends UseCase<ChecklistCheckUseCase.RequestValues, Task> {
+
+    private TaskRepository taskRepository;
+
+    @Inject
+    public ChecklistCheckUseCase(TaskRepository taskRepository, ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
+        super(threadExecutor, postExecutionThread);
+        this.taskRepository = taskRepository;
+    }
+
+    @Override
+    protected Observable<Task> buildUseCaseObservable(ChecklistCheckUseCase.RequestValues requestValues) {
+        return taskRepository.scoreChecklistItem(requestValues.taskId, requestValues.itemId);
+    }
+
+    public static final class RequestValues implements UseCase.RequestValues {
+
+        protected final String itemId;
+
+        protected final String taskId;
+
+        public RequestValues(String taskId, String itemId) {
+            this.taskId = taskId;
+            this.itemId = itemId;
+        }
+    }
+}
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
new file mode 100644
index 000000000..8dce653dd
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
@@ -0,0 +1,46 @@
+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 javax.inject.Inject;
+
+import rx.Observable;
+
+public class DailyCheckUseCase extends UseCase<DailyCheckUseCase.RequestValues, TaskDirectionData> {
+
+    private TaskRepository taskRepository;
+    private SoundManager soundManager;
+
+    @Inject
+    public DailyCheckUseCase(TaskRepository taskRepository, SoundManager soundManager,
+                             ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
+        super(threadExecutor, postExecutionThread);
+        this.taskRepository = taskRepository;
+        this.soundManager = soundManager;
+    }
+
+    @Override
+    protected Observable<TaskDirectionData> buildUseCaseObservable(RequestValues requestValues) {
+        return taskRepository.taskChecked(requestValues.task, requestValues.up).doOnNext(res -> {
+
+            soundManager.loadAndPlayAudio(SoundManager.SoundDaily);
+        });
+    }
+
+    public static final class RequestValues implements UseCase.RequestValues {
+
+        protected boolean up = false;
+
+        protected final Task task;
+
+        public RequestValues(Task task, boolean up) {
+            this.task = task;
+            this.up = up;
+        }
+    }
+}
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
new file mode 100644
index 000000000..978d8af73
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
@@ -0,0 +1,61 @@
+package com.habitrpg.android.habitica.interactors;
+
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+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 javax.inject.Inject;
+
+import rx.Observable;
+
+import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
+
+public class DisplayItemDropUseCase extends UseCase<DisplayItemDropUseCase.RequestValues, Void> {
+
+    private SoundManager soundManager;
+
+    @Inject
+    public DisplayItemDropUseCase(SoundManager soundManager, ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
+        super(threadExecutor, postExecutionThread);
+        this.soundManager = soundManager;
+    }
+
+    @Override
+    protected Observable<Void> buildUseCaseObservable(RequestValues requestValues) {
+        return Observable.from(() -> {
+            TaskDirectionData data = requestValues.data;
+
+            if (data.get_tmp() != null) {
+                if (data.get_tmp().getDrop() != null) {
+                    new Handler().postDelayed(() -> {
+                        showSnackbar(requestValues.context, requestValues.snackbarTargetView,
+                                data.get_tmp().getDrop().getDialog(), UiUtils.SnackbarDisplayType.DROP);
+                        soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop);
+                    }, 3000L);
+
+                }
+            }
+
+            return null;
+        });
+    }
+
+    public static final class RequestValues implements UseCase.RequestValues {
+
+        private TaskDirectionData data;
+        private AppCompatActivity context;
+        private View snackbarTargetView;
+
+        public RequestValues(TaskDirectionData data, AppCompatActivity context, View snackbarTargetView) {
+            this.data = data;
+            this.context = context;
+            this.snackbarTargetView = snackbarTargetView;
+        }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..dcf05d7d9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
@@ -0,0 +1,46 @@
+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 javax.inject.Inject;
+
+import rx.Observable;
+
+public class HabitScoreUseCase extends UseCase<HabitScoreUseCase.RequestValues, TaskDirectionData> {
+
+    private TaskRepository taskRepository;
+    private SoundManager soundManager;
+
+    @Inject
+    public HabitScoreUseCase(TaskRepository taskRepository, SoundManager soundManager,
+                             ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
+        super(threadExecutor, postExecutionThread);
+        this.taskRepository = taskRepository;
+        this.soundManager = soundManager;
+    }
+
+    @Override
+    protected Observable<TaskDirectionData> buildUseCaseObservable(RequestValues requestValues) {
+        return taskRepository.taskChecked(requestValues.habit, requestValues.up).doOnNext(res -> {
+
+            soundManager.loadAndPlayAudio(requestValues.up ? SoundManager.SoundPlusHabit : SoundManager.SoundMinusHabit);
+        });
+    }
+
+    public static final class RequestValues implements UseCase.RequestValues {
+
+        protected boolean up = false;
+
+        protected final Task habit;
+
+        public RequestValues(Task habit, boolean up) {
+            this.habit = habit;
+            this.up = up;
+        }
+    }
+}
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
new file mode 100644
index 000000000..dacc46853
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
@@ -0,0 +1,104 @@
+package com.habitrpg.android.habitica.interactors;
+
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+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.ui.AvatarView;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.SuppressedModals;
+
+import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
+import rx.Observable;
+
+public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Void> {
+
+    private SoundManager soundManager;
+    private CheckClassSelectionUseCase checkClassSelectionUseCase;
+
+    @Inject
+    public LevelUpUseCase(SoundManager soundManager, ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread,
+                          CheckClassSelectionUseCase checkClassSelectionUseCase) {
+        super(threadExecutor, postExecutionThread);
+        this.soundManager = soundManager;
+        this.checkClassSelectionUseCase = checkClassSelectionUseCase;
+    }
+
+    @Override
+    protected Observable buildUseCaseObservable(RequestValues requestValues) {
+        return Observable.from(() -> {
+            soundManager.loadAndPlayAudio(SoundManager.SoundLevelUp);
+
+
+            SuppressedModals suppressedModals = requestValues.user.getPreferences().getSuppressModals();
+            if (suppressedModals != null) {
+                if (suppressedModals.getLevelUp()) {
+                    checkClassSelectionUseCase.observable(new CheckClassSelectionUseCase.RequestValues(requestValues.user, null))
+                            .subscribe(aVoid -> {
+                            }, throwable -> {
+                            });
+
+                    return null;
+                }
+            }
+
+            View customView = requestValues.compatActivity.getLayoutInflater().inflate(R.layout.dialog_levelup, null);
+            if (customView != null) {
+                TextView detailView = (TextView) customView.findViewById(R.id.levelupDetail);
+                detailView.setText(requestValues.compatActivity.getString(R.string.levelup_detail, requestValues.newLevel));
+                AvatarView dialogAvatarView = (AvatarView) customView.findViewById(R.id.avatarView);
+                dialogAvatarView.setUser(requestValues.user);
+            }
+
+            final ShareEvent event = new ShareEvent();
+            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);
+
+            AlertDialog alert = new AlertDialog.Builder(requestValues.compatActivity)
+                    .setTitle(R.string.levelup_header)
+                    .setView(customView)
+                    .setPositiveButton(R.string.levelup_button, (dialog, which) -> {
+                        checkClassSelectionUseCase.observable(new CheckClassSelectionUseCase.RequestValues(requestValues.user, null))
+                                .subscribe(aVoid -> {
+                                }, throwable -> {
+                                });
+                    })
+                    .setNeutralButton(R.string.share, (dialog, which) -> {
+                        EventBus.getDefault().post(event);
+                        dialog.dismiss();
+                    })
+                    .create();
+
+            if (!requestValues.compatActivity.isFinishing()) {
+                alert.show();
+            }
+
+            return null;
+
+        });
+    }
+
+    public static final class RequestValues implements UseCase.RequestValues {
+        private HabitRPGUser user;
+        private int newLevel;
+        private AppCompatActivity compatActivity;
+
+        public RequestValues(HabitRPGUser user, int newLevel, AppCompatActivity compatActivity) {
+
+            this.user = user;
+            this.newLevel = newLevel;
+            this.compatActivity = compatActivity;
+        }
+    }
+}
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
new file mode 100644
index 000000000..72135ef9a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
@@ -0,0 +1,112 @@
+package com.habitrpg.android.habitica.interactors;
+
+import android.support.v4.util.Pair;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+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 javax.inject.Inject;
+
+import rx.Observable;
+import rx.functions.Action0;
+
+import static com.habitrpg.android.habitica.helpers.MathHelper.round;
+import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
+
+public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues, Void> {
+
+    public static final int MIN_LEVEL_FOR_SKILLS = 11;
+    private LevelUpUseCase levelUpUseCase;
+
+    @Inject
+    public NotifyUserUseCase(ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread,
+                             LevelUpUseCase levelUpUseCase) {
+        super(threadExecutor, postExecutionThread);
+        this.levelUpUseCase = levelUpUseCase;
+    }
+
+    @Override
+    protected Observable<Void> buildUseCaseObservable(RequestValues r) {
+        return Observable.from(() -> {
+            Stats stats = r.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 -> {
+                        });
+            } 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);
+            }
+
+            return null;
+        });
+    }
+
+    public static Pair<String, UiUtils.SnackbarDisplayType> getNotificationAndAddStatsToUser(HabitRPGUser user, double xp, double hp, double gold, double mp){
+
+        StringBuilder message = new StringBuilder();
+        Stats stats = user.getStats();
+        UiUtils.SnackbarDisplayType displayType = UiUtils.SnackbarDisplayType.NORMAL;
+
+        if (xp > stats.getExp()) {
+            message.append(" + ").append(round(xp - stats.getExp(), 2)).append(" XP");
+            stats.setExp(xp);
+        }
+        if (hp != stats.getHp()) {
+            displayType = UiUtils.SnackbarDisplayType.FAILURE;
+            message.append(" - ").append(round(stats.getHp() - hp, 2)).append(" HP");
+            stats.setHp(hp);
+        }
+        if (gold > stats.getGp()) {
+            message.append(" + ").append(round(gold - stats.getGp(), 2)).append(" GP");
+            stats.setGp(gold);
+        } else if (gold < stats.getGp()) {
+            displayType = UiUtils.SnackbarDisplayType.FAILURE;
+            message.append(" - ").append(round(stats.getGp() - gold, 2)).append(" GP");
+            stats.setGp(gold);
+        }
+        if (mp > stats.getMp() && stats.getLvl() >= MIN_LEVEL_FOR_SKILLS) {
+            message.append(" + ").append(round(mp - stats.getMp(), 2)).append(" MP");
+            stats.setMp(mp);
+        }
+
+        return new Pair<>(message.toString(), displayType);
+    }
+
+     public static final class RequestValues implements UseCase.RequestValues {
+
+        private AppCompatActivity context;
+        private View snackbarTargetView;
+        private Action0 retrieveUser;
+        private HabitRPGUser user;
+        private double xp;
+        private double hp;
+        private double gold;
+        private double mp;
+        private int lvl;
+
+        public RequestValues(AppCompatActivity context, View snackbarTargetView, Action0 retrieveUser,
+                             HabitRPGUser user, double xp, double hp, double gold, double mp, int lvl) {
+            this.context = context;
+            this.snackbarTargetView = snackbarTargetView;
+            this.retrieveUser = retrieveUser;
+            this.user = user;
+            this.xp = xp;
+            this.hp = hp;
+            this.gold = gold;
+            this.mp = mp;
+            this.lvl = lvl;
+        }
+    }
+}
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
new file mode 100644
index 000000000..df6803fec
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
@@ -0,0 +1,46 @@
+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 javax.inject.Inject;
+
+import rx.Observable;
+
+public class TodoCheckUseCase  extends UseCase<TodoCheckUseCase.RequestValues, TaskDirectionData> {
+
+    private TaskRepository taskRepository;
+    private SoundManager soundManager;
+
+    @Inject
+    public TodoCheckUseCase(TaskRepository taskRepository, SoundManager soundManager,
+                             ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
+        super(threadExecutor, postExecutionThread);
+        this.taskRepository = taskRepository;
+        this.soundManager = soundManager;
+    }
+
+    @Override
+    protected Observable<TaskDirectionData> buildUseCaseObservable(TodoCheckUseCase.RequestValues requestValues) {
+        return taskRepository.taskChecked(requestValues.task, requestValues.up).doOnNext(res -> {
+
+            soundManager.loadAndPlayAudio(SoundManager.SoundTodo);
+        });
+    }
+
+    public static final class RequestValues implements UseCase.RequestValues {
+
+        protected boolean up = false;
+
+        protected final Task task;
+
+        public RequestValues(Task task, boolean up) {
+            this.task = task;
+            this.up = up;
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
new file mode 100644
index 000000000..e5c8edd03
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
@@ -0,0 +1,34 @@
+package com.habitrpg.android.habitica.interactors;
+
+import com.habitrpg.android.habitica.executors.PostExecutionThread;
+import com.habitrpg.android.habitica.executors.ThreadExecutor;
+
+import rx.Observable;
+
+public abstract class UseCase<Q extends UseCase.RequestValues, T> {
+
+    private final ThreadExecutor threadExecutor;
+    private final PostExecutionThread postExecutionThread;
+
+    protected UseCase(ThreadExecutor threadExecutor,
+                      PostExecutionThread postExecutionThread) {
+        this.threadExecutor = threadExecutor;
+        this.postExecutionThread = postExecutionThread;
+    }
+
+    /**
+     * Builds an {@link rx.Observable} which will be used when executing the current {@link UseCase}.
+     */
+    protected abstract Observable<T> buildUseCaseObservable(Q requestValues);
+
+    @SuppressWarnings("unchecked")
+    public Observable<T> observable(Q requestValues) {
+        return this.buildUseCaseObservable(requestValues)
+                .subscribeOn(postExecutionThread.getScheduler())
+                .observeOn(postExecutionThread.getScheduler());
+    }
+
+    public interface RequestValues {
+
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
index b1fd3a8f1..22a15e921 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,6 +1,7 @@
 package com.habitrpg.android.habitica.modules;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.ContentCache;
 import com.habitrpg.android.habitica.HostConfig;
 import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService;
@@ -27,19 +28,19 @@ public class ApiModule {
 
     @Provides
     public GsonConverterFactory providesGsonConverterFactory() {
-        return APIHelper.createGsonFactory();
+        return com.habitrpg.android.habitica.ApiClientImpl.createGsonFactory();
     }
 
     @Provides
     @Singleton
-    public APIHelper providesApiHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig) {
-        return new APIHelper(gsonConverter, hostConfig);
+    public ApiClient providesApiHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, Context context) {
+        return new com.habitrpg.android.habitica.ApiClientImpl(gsonConverter, hostConfig, crashlyticsProxy, context);
     }
 
     @Provides
     @Singleton
-    public ContentCache providesContentCache(APIHelper helper) {
-        return new ContentCache(helper);
+    public ContentCache providesContentCache(ApiClient client){
+        return new ContentCache(client);
     }
 
     @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 6ffa020d8..127b83370 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,9 +1,13 @@
 package com.habitrpg.android.habitica.modules;
 
 import com.habitrpg.android.habitica.R;
+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.TagsHelper;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 
 import android.app.Application;
 import android.content.Context;
@@ -46,8 +50,8 @@ public class AppModule {
 
     @Provides
     @Singleton
-    public TagsHelper providesTagsHelper() {
-        return new TagsHelper();
+    public TaskFilterHelper providesTagsHelper() {
+        return new TaskFilterHelper();
     }
 
     @Provides
@@ -65,4 +69,18 @@ public class AppModule {
     public SoundManager providesSoundManager() {
         return new SoundManager();
     }
+
+
+    @Provides
+    @Singleton
+    ThreadExecutor provideThreadExecutor(JobExecutor jobExecutor) {
+        return jobExecutor;
+    }
+
+
+    @Provides
+    @Singleton
+    PostExecutionThread providePostExecutionThread(UIThread uiThread) {
+        return uiThread;
+    }
 }
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
new file mode 100644
index 000000000..1cb1128dd
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -0,0 +1,52 @@
+package com.habitrpg.android.habitica.modules;
+
+
+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.implementation.SetupCustomizationRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.TagRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.TaskRepositoryImpl;
+import com.habitrpg.android.habitica.data.local.TagLocalRepository;
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
+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 android.content.Context;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class RepositoryModule {
+
+    @Provides
+    SetupCustomizationRepository providesSetupCustomizationRepository(Context context) {
+        return new SetupCustomizationRepositoryImpl(context);
+
+    }
+
+    @Provides
+    TaskLocalRepository providesTaskLocalRepository() {
+        return new DbFlowTaskLocalRepository();
+    }
+
+    @Provides
+    @Singleton
+    TaskRepository providesTaskRepository(TaskLocalRepository localRepository, ApiClient apiClient) {
+        return new TaskRepositoryImpl(localRepository, apiClient);
+    }
+
+    @Provides
+    TagLocalRepository providesTagLocalRepository() {
+        return new TagLocalRepositoryImpl();
+    }
+
+    @Provides
+    TagRepository providesTagRepository(TagLocalRepository localRepository, ApiClient apiClient) {
+        return new TagRepositoryImpl(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 b277ec6d3..a73661b47 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
@@ -1,11 +1,5 @@
 package com.habitrpg.android.habitica.receivers;
 
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-
 import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -13,6 +7,12 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
+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 javax.inject.Inject;
 
 /**
@@ -20,7 +20,7 @@ import javax.inject.Inject;
  */
 public class LocalNotificationActionReceiver extends BroadcastReceiver implements HabitRPGUserCallback.OnUserReceived {
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
 
     private HabitRPGUser user;
     private String action;
@@ -37,8 +37,7 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
         this.intent = intent;
         this.context = context;
 
-        this.apiHelper.apiService.getUser()
-                .compose(this.apiHelper.configureApiCallObserver())
+        this.apiClient.getUser()
                 .subscribe(new HabitRPGUserCallback(this), throwable -> {
                 });
     }
@@ -57,32 +56,32 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
         if (action.equals(this.resources.getString(R.string.accept_party_invite))) {
             if (this.user.getInvitations().getParty() == null) return;
             String partyId = this.user.getInvitations().getParty().getId();
-            apiHelper.apiService.joinGroup(partyId)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.joinGroup(partyId)
+
                     .subscribe(aVoid -> {
                     }, throwable -> {
                     });
         } else if (action.equals(this.resources.getString(R.string.reject_party_invite))) {
             if (this.user.getInvitations().getParty() == null) return;
             String partyId = this.user.getInvitations().getParty().getId();
-            apiHelper.apiService.rejectGroupInvite(partyId)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.rejectGroupInvite(partyId)
+
                     .subscribe(aVoid -> {
                     }, throwable -> {
                     });
         } else if (action.equals(this.resources.getString(R.string.accept_quest_invite))) {
             if (this.user.getParty() == null) return;
             String partyId = this.user.getParty().getId();
-            apiHelper.apiService.acceptQuest(partyId)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.acceptQuest(partyId)
+
                     .subscribe(aVoid -> {
                     }, throwable -> {
                     });
         } else if (action.equals(this.resources.getString(R.string.reject_quest_invite))) {
             if (this.user.getParty() == null) return;
             String partyId = this.user.getParty().getId();
-            apiHelper.apiService.rejectQuest(partyId)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.rejectQuest(partyId)
+
                     .subscribe(aVoid -> {
                     }, throwable -> {
                     });
@@ -90,8 +89,8 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
             Bundle extras = this.intent.getExtras();
             String guildId = extras.getString("groupID");
             if (guildId == null) return;
-            apiHelper.apiService.joinGroup(guildId)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.joinGroup(guildId)
+
                     .subscribe(aVoid -> {
                     }, throwable -> {
                     });
@@ -99,8 +98,8 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
             Bundle extras = this.intent.getExtras();
             String guildId = extras.getString("groupID");
             if (guildId == null) return;
-            apiHelper.apiService.rejectGroupInvite(guildId)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.rejectGroupInvite(guildId)
+
                     .subscribe(aVoid -> {
                     }, throwable -> {
                     });
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 438f60075..a82e1f13a 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
@@ -1,14 +1,28 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.APIHelper;
 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.HabitScoreEvent;
+import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
+import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
+import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
+import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
+import com.habitrpg.android.habitica.interactors.BuyRewardUseCase;
+import com.habitrpg.android.habitica.interactors.ChecklistCheckUseCase;
+import com.habitrpg.android.habitica.interactors.DailyCheckUseCase;
+import com.habitrpg.android.habitica.interactors.DisplayItemDropUseCase;
+import com.habitrpg.android.habitica.interactors.HabitScoreUseCase;
+import com.habitrpg.android.habitica.interactors.NotifyUserUseCase;
+import com.habitrpg.android.habitica.interactors.TodoCheckUseCase;
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallegeDetailDialogHolder;
 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.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
@@ -16,6 +30,9 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 import net.pherth.android.emoji_library.EmojiParser;
 import net.pherth.android.emoji_library.EmojiTextView;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import android.app.AlertDialog;
 import android.databinding.ObservableArrayList;
 import android.databinding.ObservableList;
@@ -28,6 +45,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -41,16 +59,47 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.functions.Action1;
 
+import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
+
 public class ChallengeDetailActivity extends BaseActivity {
 
     public static String CHALLENGE_ID = "CHALLENGE_ID";
-    @Inject
-    public APIHelper apiHelper;
+
     @BindView(R.id.detail_tabs)
     TabLayout detail_tabs;
     @BindView(R.id.toolbar)
     Toolbar toolbar;
-    private ChallengeViewHolder challengeViewHolder;
+
+    @Inject
+    public ApiClient apiClient;
+
+    @BindView(R.id.floating_menu_wrapper)
+    FrameLayout floatingMenuWrapper;
+
+    // region UseCases
+
+    @Inject
+    HabitScoreUseCase habitScoreUseCase;
+
+    @Inject
+    DailyCheckUseCase dailyCheckUseCase;
+
+    @Inject
+    TodoCheckUseCase todoCheckUseCase;
+
+    @Inject
+    BuyRewardUseCase buyRewardUseCase;
+
+    @Inject
+    ChecklistCheckUseCase checklistCheckUseCase;
+
+    @Inject
+    DisplayItemDropUseCase displayItemDropUseCase;
+
+    @Inject
+    NotifyUserUseCase notifyUserUseCase;
+
+    // endregion
 
     private Challenge challenge;
 
@@ -72,7 +121,9 @@ public class ChallengeDetailActivity extends BaseActivity {
 
         setupToolbar(toolbar);
 
-        getSupportActionBar().setTitle(R.string.challenge_details);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setTitle(R.string.challenge_details);
+        }
         detail_tabs.setVisibility(View.GONE);
 
         Bundle extras = getIntent().getExtras();
@@ -81,85 +132,84 @@ public class ChallengeDetailActivity extends BaseActivity {
 
         ObservableList<Task> fullList = new ObservableArrayList<>();
 
+        if (challengeId != null) {
 
-        apiHelper.apiService.getChallengeTasks(challengeId)
-                .compose(this.apiHelper.configureApiCallObserver())
-                .subscribe(taskList -> {
-                    ArrayList<Task> resultList = new ArrayList<>();
+            apiClient.getChallengeTasks(challengeId)
+                    .subscribe(taskList -> {
+                        ArrayList<Task> resultList = new ArrayList<>();
 
+                        ArrayList<Task> todos = new ArrayList<>();
+                        ArrayList<Task> habits = new ArrayList<>();
+                        ArrayList<Task> dailies = new ArrayList<>();
+                        ArrayList<Task> rewards = new ArrayList<>();
 
-                    ArrayList<Task> todos = new ArrayList<>();
-                    ArrayList<Task> habits = new ArrayList<>();
-                    ArrayList<Task> dailies = new ArrayList<>();
-                    ArrayList<Task> rewards = new ArrayList<>();
+                        for (Map.Entry<String, Task> entry : taskList.tasks.entrySet()) {
+                            switch (entry.getValue().type) {
+                                case Task.TYPE_TODO:
+                                    todos.add(entry.getValue());
+                                    break;
+                                case Task.TYPE_HABIT:
 
-                    for (Map.Entry<String, Task> entry : taskList.tasks.entrySet()) {
-                        switch (entry.getValue().type) {
-                            case Task.TYPE_TODO:
-                                todos.add(entry.getValue());
-                                break;
-                            case Task.TYPE_HABIT:
+                                    habits.add(entry.getValue());
+                                    break;
+                                case Task.TYPE_DAILY:
 
-                                habits.add(entry.getValue());
-                                break;
-                            case Task.TYPE_DAILY:
+                                    dailies.add(entry.getValue());
+                                    break;
+                                case Task.TYPE_REWARD:
 
-                                dailies.add(entry.getValue());
-                                break;
-                            case Task.TYPE_REWARD:
-
-                                rewards.add(entry.getValue());
-                                break;
+                                    rewards.add(entry.getValue());
+                                    break;
+                            }
                         }
-                    }
 
 
-                    if (!habits.isEmpty()) {
-                        Task dividerTask = new Task();
-                        dividerTask.setId("divhabits");
-                        dividerTask.type = "divider";
-                        dividerTask.text = "Challenge Habits";
+                        if (!habits.isEmpty()) {
+                            Task dividerTask = new Task();
+                            dividerTask.setId("divhabits");
+                            dividerTask.type = "divider";
+                            dividerTask.text = "Challenge Habits";
 
-                        resultList.add(dividerTask);
-                        resultList.addAll(habits);
-                    }
+                            resultList.add(dividerTask);
+                            resultList.addAll(habits);
+                        }
 
 
-                    if (!dailies.isEmpty()) {
-                        Task dividerTask = new Task();
-                        dividerTask.setId("divdailies");
-                        dividerTask.type = "divider";
-                        dividerTask.text = "Challenge Dailies";
+                        if (!dailies.isEmpty()) {
+                            Task dividerTask = new Task();
+                            dividerTask.setId("divdailies");
+                            dividerTask.type = "divider";
+                            dividerTask.text = "Challenge Dailies";
 
-                        resultList.add(dividerTask);
-                        resultList.addAll(dailies);
-                    }
+                            resultList.add(dividerTask);
+                            resultList.addAll(dailies);
+                        }
 
 
-                    if (!todos.isEmpty()) {
-                        Task dividerTask = new Task();
-                        dividerTask.setId("divtodos");
-                        dividerTask.type = "divider";
-                        dividerTask.text = "Challenge To-Dos";
+                        if (!todos.isEmpty()) {
+                            Task dividerTask = new Task();
+                            dividerTask.setId("divtodos");
+                            dividerTask.type = "divider";
+                            dividerTask.text = "Challenge To-Dos";
 
-                        resultList.add(dividerTask);
-                        resultList.addAll(todos);
-                    }
+                            resultList.add(dividerTask);
+                            resultList.addAll(todos);
+                        }
 
-                    if (!rewards.isEmpty()) {
-                        Task dividerTask = new Task();
-                        dividerTask.setId("divrewards");
-                        dividerTask.type = "divider";
-                        dividerTask.text = "Challenge Rewards";
+                        if (!rewards.isEmpty()) {
+                            Task dividerTask = new Task();
+                            dividerTask.setId("divrewards");
+                            dividerTask.type = "divider";
+                            dividerTask.text = "Challenge Rewards";
 
-                        resultList.add(dividerTask);
-                        resultList.addAll(rewards);
-                    }
+                            resultList.add(dividerTask);
+                            resultList.addAll(rewards);
+                        }
 
 
-                    fullList.addAll(resultList);
-                }, Throwable::printStackTrace);
-
+                        fullList.addAll(resultList);
+                    }, Throwable::printStackTrace);
+        }
 
         ChallengeTasksRecyclerViewFragment fragment = ChallengeTasksRecyclerViewFragment.newInstance(HabiticaApplication.User, fullList);
 
@@ -173,7 +223,7 @@ public class ChallengeDetailActivity extends BaseActivity {
 
         challenge = new Select().from(Challenge.class).where(Condition.column("id").is(challengeId)).querySingle();
 
-        challengeViewHolder = new ChallengeViewHolder(findViewById(R.id.challenge_header));
+        ChallengeViewHolder challengeViewHolder = new ChallengeViewHolder(findViewById(R.id.challenge_header));
         challengeViewHolder.bind(challenge);
     }
 
@@ -202,25 +252,18 @@ public class ChallengeDetailActivity extends BaseActivity {
                 .setPositiveButton(this.getString(R.string.yes), (dialog, which) -> {
                     dialog.dismiss();
 
-                    showRemoveTasksDialog(keepTasks -> {
-                        this.apiHelper.apiService.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
-                                .compose(apiHelper.configureApiCallObserver())
-                                .subscribe(aVoid -> {
-                                    challenge.user_id = null;
-                                    challenge.async().save();
-
-                                    HabiticaApplication.User.resetChallengeList();
-                                    finish();
-
-                                }, throwable -> {
-                                });
-                    });
+                    showRemoveTasksDialog(keepTasks -> this.apiClient.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
+                            .subscribe(aVoid -> {
+                                challenge.user_id = null;
+                                challenge.async().save();
 
+                                HabiticaApplication.User.resetChallengeList();
+                                finish();
 
+                            }, throwable -> {
+                            }));
                 })
-                .setNegativeButton(this.getString(R.string.no), (dialog, which) -> {
-                    dialog.dismiss();
-                }).show();
+                .setNegativeButton(this.getString(R.string.no), (dialog, which) -> dialog.dismiss()).show();
     }
 
     // refactor as an UseCase later - see ChallengeDetailDialogHolder
@@ -249,7 +292,7 @@ public class ChallengeDetailActivity extends BaseActivity {
         finish();
     }
 
-    public class ChallengeViewHolder extends RecyclerView.ViewHolder {
+    class ChallengeViewHolder extends RecyclerView.ViewHolder {
         @BindView(R.id.challenge_name)
         EmojiTextView challengeName;
 
@@ -267,7 +310,7 @@ public class ChallengeDetailActivity extends BaseActivity {
 
         private Challenge challenge;
 
-        public ChallengeViewHolder(View itemView) {
+        ChallengeViewHolder(View itemView) {
             super(itemView);
 
             ButterKnife.bind(this, itemView);
@@ -290,9 +333,9 @@ public class ChallengeDetailActivity extends BaseActivity {
         }
 
         @OnClick(R.id.btn_show_more)
-        public void onShowMore() {
+        void onShowMore() {
 
-            ChallegeDetailDialogHolder.showDialog(ChallengeDetailActivity.this, ChallengeDetailActivity.this.apiHelper,
+            ChallegeDetailDialogHolder.showDialog(ChallengeDetailActivity.this, ChallengeDetailActivity.this.apiClient,
                     HabiticaApplication.User, challenge,
                     challenge1 -> {
 
@@ -300,4 +343,72 @@ public class ChallengeDetailActivity extends BaseActivity {
                     challenge1 -> ChallengeDetailActivity.this.onBackPressed());
         }
     }
+
+    @Subscribe
+    public void onEvent(TaskCheckedCommand event) {
+        switch (event.Task.type) {
+            case Task.TYPE_DAILY: {
+                dailyCheckUseCase.observable(new DailyCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted()))
+                        .subscribe(res -> EventBus.getDefault().post(new TaskUpdatedEvent(event.Task)), error -> {
+                        });
+            }
+            break;
+            case Task.TYPE_TODO: {
+                todoCheckUseCase.observable(new TodoCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted()))
+                        .subscribe(res -> EventBus.getDefault().post(new TaskUpdatedEvent(event.Task)), error -> {
+                        });
+            }
+            break;
+        }
+    }
+
+    @Subscribe
+    public void onEvent(ChecklistCheckedCommand event) {
+        checklistCheckUseCase.observable(new ChecklistCheckUseCase.RequestValues(event.task.getId(), event.item.getId()))
+                .subscribe(res -> EventBus.getDefault().post(new TaskUpdatedEvent(event.task)), error -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(HabitScoreEvent event) {
+        habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(event.habit, event.Up))
+                .subscribe(res -> onTaskDataReceived(res, event.habit), error -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(final BuyRewardCommand event) {
+        if (HabiticaApplication.User.getStats().getGp() < event.Reward.getValue()) {
+            showSnackbar(this, floatingMenuWrapper, getString(R.string.no_gold), UiUtils.SnackbarDisplayType.FAILURE);
+            return;
+        }
+
+
+        if (event.Reward.specialTag == null || !event.Reward.specialTag.equals("item")) {
+
+            buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(event.Reward))
+                    .subscribe(res -> onTaskDataReceived(res, event.Reward), error -> {});
+        }
+
+    }
+
+    public void onTaskDataReceived(TaskDirectionData data, Task task) {
+        if (task.type.equals("reward")) {
+
+            showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, task.getText()), UiUtils.SnackbarDisplayType.NORMAL);
+
+        } else {
+
+            if (HabiticaApplication.User != null) {
+                notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper, () -> {
+                    // retrieveUser? forward message to MainActivity ? or mark it to refresh ?
+                },
+                        HabiticaApplication.User, data.getExp(), data.getHp(), data.getGp(), data.getMp(), data.getLvl()));
+            }
+
+            displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
+                    .subscribe(aVoid -> {}, throwable -> {});
+        }
+    }
+
 }
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 88b67cd32..d4c6a8844 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,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.AvatarView;
@@ -39,7 +39,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
     AvatarView warriorAvatarView;
 
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
 
     ProgressDialog progressDialog;
 
@@ -102,8 +102,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
         warriorAvatarView.setUser(warrior);
 
         if (!isInitialSelection) {
-            apiHelper.apiService.changeClass()
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.changeClass()
                     .subscribe(user -> {
                         classWasUnset = true;
                     }, throwable -> {
@@ -204,8 +203,8 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
     private void optOutOfClasses() {
         shouldFinish = true;
         this.displayProgressDialog();
-        apiHelper.apiService.disableClasses()
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.disableClasses()
+
                 .subscribe(this, throwable -> {
                 });
     }
@@ -213,8 +212,8 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
     private void selectClass(String selectedClass) {
         shouldFinish = true;
         this.displayProgressDialog();
-        apiHelper.apiService.changeClass(selectedClass)
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.changeClass(selectedClass)
+
                 .subscribe(this, throwable -> {
                 });
     }
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 4e4caa1de..549cd1909 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,11 +4,12 @@ import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.drawee.controller.BaseControllerListener;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.facebook.imagepipeline.image.ImageInfo;
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.ContentCache;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.helpers.UserStatComputer;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.adapter.social.AchievementAdapter;
@@ -58,7 +59,7 @@ public class FullProfileActivity extends BaseActivity {
     @Inject
     ContentCache contentCache;
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
     @BindView(R.id.profile_image)
     SimpleDraweeView profile_image;
     @BindView(R.id.profile_blurb)
@@ -123,8 +124,8 @@ public class FullProfileActivity extends BaseActivity {
 
         setTitle(R.string.profile_loading_data);
 
-        apiHelper.apiService.GetMember(this.userId)
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.GetMember(this.userId)
+
                 .subscribe(this::updateView,
                         throwable -> {
                         });
@@ -174,8 +175,8 @@ public class FullProfileActivity extends BaseActivity {
                     messageObject.put("message", emojiEditText.getText().toString());
                     messageObject.put("toUserId", userId);
 
-                    apiHelper.apiService.postPrivateMessage(messageObject)
-                            .compose(apiHelper.configureApiCallObserver())
+                    apiClient.postPrivateMessage(messageObject)
+
                             .subscribe(postChatMessageResult -> {
                                 UiUtils.showSnackbar(FullProfileActivity.this, FullProfileActivity.this.fullprofile_scrollview,
                                         String.format(getString(R.string.profile_message_sent_to), userName), UiUtils.SnackbarDisplayType.NORMAL);
@@ -247,8 +248,8 @@ public class FullProfileActivity extends BaseActivity {
         mountsTamedCount.setText(String.valueOf(user.getMountsTamedCount()));
 
         // Load the members achievements now
-        apiHelper.apiService.GetMemberAchievements(this.userId)
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.GetMemberAchievements(this.userId)
+
                 .subscribe(this::fillAchievements,
                         throwable -> {
                         });
@@ -377,79 +378,23 @@ public class FullProfileActivity extends BaseActivity {
         contentCache.GetItemDataList(outfitList, gotEntries);
     }
 
-    public void gotGear(List<ItemData> obj, HabitRPGUser user) {
-        float strAttributes = 0;
-        float intAttributes = 0;
-        float conAttributes = 0;
-        float perAttributes = 0;
+    public void gotGear(List<ItemData> itemDataList, HabitRPGUser user) {
+        UserStatComputer userStatComputer = new UserStatComputer();
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
 
-        // Summarize stats and fill equipment table
-        for (ItemData i : obj) {
-            int str_ = (int) i.getStr();
-            int int_ = (int) i.get_int();
-            int con_ = (int) i.getCon();
-            int per_ = (int) i.getPer();
-
-            strAttributes += str_;
-            intAttributes += int_;
-            conAttributes += con_;
-            perAttributes += per_;
-
-            StringBuilder sb = new StringBuilder();
-
-            if (str_ != 0) {
-                sb.append("STR " + str_ + ", ");
-            }
-            if (int_ != 0) {
-                sb.append("INT " + int_ + ", ");
-            }
-            if (con_ != 0) {
-                sb.append("CON " + con_ + ", ");
-            }
-            if (per_ != 0) {
-                sb.append("PER " + per_ + ", ");
-            }
-
-            // remove the last comma
-            if (sb.length() > 2) {
-                sb.delete(sb.length() - 2, sb.length());
-            }
-
-            addEquipmentRow(equipmentTableLayout, i.getKey(), i.getText(), sb.toString());
-        }
+        // @TODO: MAke this dynamic by iterating over rows and check type?
+        UserStatComputer.EquipmentRow equipmentRow = (UserStatComputer.EquipmentRow) statsRows.get(0);
+        addEquipmentRow(equipmentTableLayout, equipmentRow.gearKey, equipmentRow.text, equipmentRow.stats);
 
         stopAndHideProgress(equipmentProgress);
         equipmentTableLayout.setVisibility(View.VISIBLE);
 
-        addAttributeRow(getString(R.string.battle_gear) + ": ", strAttributes, intAttributes, conAttributes, perAttributes, true, false);
+        // @TOOD: We could probably remove the excess parameters - thank you classes
+        UserStatComputer.AttributeRow attributeRow1 = (UserStatComputer.AttributeRow) statsRows.get(1);
+        addAttributeRow(getString(attributeRow1.labelId) + ": ", attributeRow1.strVal, attributeRow1.intVal, attributeRow1.conVal, attributeRow1.perVal, attributeRow1.roundDown, attributeRow1.isSummary);
 
-        if (!user.getPreferences().isDisableClasses()) {
-            float strClassBonus = 0;
-            float intClassBonus = 0;
-            float conClassBonus = 0;
-            float perClassBonus = 0;
-
-            switch (user.getStats().get_class()) {
-                case rogue:
-                    strClassBonus = strAttributes * 0.5f;
-                    perClassBonus = perAttributes * 0.5f;
-                    break;
-                case healer:
-                    conClassBonus = conAttributes * 0.5f;
-                    intClassBonus = intClassBonus * 0.5f;
-                    break;
-                case warrior:
-                    strClassBonus = strAttributes * 0.5f;
-                    conClassBonus = conAttributes * 0.5f;
-                    break;
-                case wizard:
-                    intClassBonus = intClassBonus * 0.5f;
-                    perClassBonus = perAttributes * 0.5f;
-                    break;
-            }
-
-            addAttributeRow(getString(R.string.profile_class_bonus), strClassBonus, intClassBonus, conClassBonus, perClassBonus, false, false);
-        }
+        UserStatComputer.AttributeRow attributeRow2 = (UserStatComputer.AttributeRow) statsRows.get(2);
+        addAttributeRow(getString(attributeRow2.labelId), attributeRow2.strVal, attributeRow2.intVal, attributeRow2.conVal, attributeRow2.perVal, attributeRow2.roundDown, attributeRow2.isSummary);
     }
 
     public void gotCostume(List<ItemData> obj) {
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 0bad93cd8..44855bc37 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,6 +1,7 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
@@ -9,6 +10,7 @@ import com.viewpagerindicator.IconPageIndicator;
 import com.viewpagerindicator.IconPagerAdapter;
 
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -17,6 +19,8 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.view.ViewPager;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
 
 import javax.inject.Inject;
@@ -26,7 +30,7 @@ import butterknife.BindView;
 public class IntroActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener {
 
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     @BindView(R.id.view_pager)
     ViewPager pager;
     @BindView(R.id.view_pager_indicator)
@@ -45,7 +49,7 @@ public class IntroActivity extends BaseActivity implements View.OnClickListener,
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getHabiticaApplication().getComponent().inject(this);
+        HabiticaBaseApplication.getComponent().inject(this);
 
         setupIntro();
         indicator.setViewPager(pager);
@@ -53,11 +57,15 @@ public class IntroActivity extends BaseActivity implements View.OnClickListener,
         this.skipButton.setOnClickListener(this);
         this.finishButton.setOnClickListener(this);
 
-        apiHelper.apiService.getContent(apiHelper.languageCode)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(contentResult -> {
-                }, throwable -> {
-                });
+        apiClient.getContent()
+                .subscribe(contentResult -> {}, throwable -> {});
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+
     }
 
     @Override
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 5b8874f58..81440b24b 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
@@ -1,37 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.google.android.gms.auth.GoogleAuthException;
-import com.google.android.gms.auth.GoogleAuthUtil;
-import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
-import com.google.android.gms.auth.UserRecoverableAuthException;
-import com.google.android.gms.common.AccountPicker;
-import com.google.android.gms.common.GooglePlayServicesUtil;
-import com.google.android.gms.common.Scopes;
-
-import com.facebook.AccessToken;
-import com.facebook.CallbackManager;
-import com.facebook.FacebookCallback;
-import com.facebook.FacebookException;
-import com.facebook.FacebookSdk;
-import com.facebook.login.LoginManager;
-import com.facebook.login.LoginResult;
-import com.facebook.login.widget.LoginButton;
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.HostConfig;
-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.helpers.AmplitudeManager;
-import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
-import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
-import com.habitrpg.android.habitica.ui.views.login.LockableScrollView;
-import com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.accounts.AccountManager;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -44,28 +12,60 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.PreferenceManager;
 import android.text.SpannableString;
 import android.text.style.UnderlineSpan;
 import android.util.Log;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
-import android.view.animation.AccelerateInterpolator;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import com.facebook.AccessToken;
+import com.facebook.CallbackManager;
+import com.facebook.FacebookCallback;
+import com.facebook.FacebookException;
+import com.facebook.login.LoginManager;
+import com.facebook.login.LoginResult;
+import com.google.android.gms.auth.GoogleAuthException;
+import com.google.android.gms.auth.GoogleAuthUtil;
+import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
+import com.google.android.gms.auth.UserRecoverableAuthException;
+import com.google.android.gms.common.AccountPicker;
+import com.google.android.gms.common.GooglePlayServicesUtil;
+import com.google.android.gms.common.Scopes;
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.HostConfig;
+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.helpers.AmplitudeManager;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
+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 org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -92,7 +92,7 @@ public class LoginActivity extends BaseActivity
 
 
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     @Inject
     public SharedPreferences sharedPrefs;
     @Inject
@@ -116,6 +116,8 @@ public class LoginActivity extends BaseActivity
     LinearLayout formWrapper;
     @BindView(R.id.back_button)
     Button backButton;
+    @BindView(R.id.logo_view)
+    ImageView logoView;
 
     @BindView(R.id.login_btn)
     Button mLoginNormalBtn;
@@ -133,58 +135,8 @@ public class LoginActivity extends BaseActivity
     Button mFacebookLoginBtn;
     @BindView(R.id.forgot_pw_tv)
     TextView mForgotPWTV;
-    private Menu menu;
     private CallbackManager callbackManager;
     private String googleEmail;
-    private View.OnClickListener mLoginNormalClick = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            mProgressBar.setVisibility(View.VISIBLE);
-            if (isRegistering) {
-                String username, email, password, cpassword;
-                username = String.valueOf(mUsernameET.getText()).trim();
-                email = String.valueOf(mEmail.getText()).trim();
-                password = String.valueOf(mPasswordET.getText());
-                cpassword = String.valueOf(mConfirmPassword.getText());
-                if (username.length() == 0 || password.length() == 0 || email.length() == 0 || cpassword.length() == 0) {
-                    showValidationError(R.string.login_validation_error_fieldsmissing);
-                    return;
-                }
-                apiHelper.registerUser(username, email, password, cpassword)
-                        .compose(apiHelper.configureApiCallObserver())
-                        .subscribe(LoginActivity.this, throwable -> {
-                            hideProgress();
-                        });
-            } else {
-                String username, password;
-                username = String.valueOf(mUsernameET.getText()).trim();
-                password = String.valueOf(mPasswordET.getText());
-                if (username.length() == 0 || password.length() == 0) {
-                    showValidationError(R.string.login_validation_error_fieldsmissing);
-                    return;
-                }
-                apiHelper.connectUser(username, password)
-                        .compose(apiHelper.configureApiCallObserver())
-                        .subscribe(LoginActivity.this, throwable -> {
-                            hideProgress();
-                        });
-            }
-        }
-    };
-    private View.OnClickListener mForgotPWClick = v -> {
-        String url = hostConfig.getAddress();
-        Intent i = new Intent(Intent.ACTION_VIEW);
-        i.setData(Uri.parse(url));
-        startActivity(i);
-    };
-
-    public static void show(final View v) {
-        v.setVisibility(View.VISIBLE);
-    }
-
-    public static void hide(final View v) {
-        v.setVisibility(View.GONE);
-    }
 
     @Override
     protected int getLayoutResId() {
@@ -222,6 +174,12 @@ public class LoginActivity extends BaseActivity
 
         backgroundContainer.post(() -> backgroundContainer.scrollTo(0, backgroundContainer.getBottom()));
         backgroundContainer.setScrollingEnabled(false);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
     }
 
     private void setupFacebookLogin() {
@@ -231,11 +189,8 @@ public class LoginActivity extends BaseActivity
                     @Override
                     public void onSuccess(LoginResult loginResult) {
                         AccessToken accessToken = AccessToken.getCurrentAccessToken();
-                        apiHelper.connectSocial("facebook", accessToken.getUserId(), accessToken.getToken())
-                                .compose(apiHelper.configureApiCallObserver())
-                                .subscribe(LoginActivity.this, throwable -> {
-                                    hideProgress();
-                                });
+                        apiClient.connectSocial("facebook", accessToken.getUserId(), accessToken.getToken())
+                                .subscribe(LoginActivity.this, throwable -> hideProgress());
                     }
 
                     @Override
@@ -278,6 +233,53 @@ public class LoginActivity extends BaseActivity
         }
     }
 
+    private View.OnClickListener mLoginNormalClick = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            mProgressBar.setVisibility(View.VISIBLE);
+            if (isRegistering) {
+                String username, email, password, cpassword;
+                username = String.valueOf(mUsernameET.getText()).trim();
+                email = String.valueOf(mEmail.getText()).trim();
+                password = String.valueOf(mPasswordET.getText());
+                cpassword = String.valueOf(mConfirmPassword.getText());
+                if (username.length() == 0 || password.length() == 0 || email.length() == 0 || cpassword.length() == 0) {
+                    showValidationError(R.string.login_validation_error_fieldsmissing);
+                    return;
+                }
+                apiClient.registerUser(username, email, password, cpassword)
+                        .subscribe(LoginActivity.this, throwable -> hideProgress());
+            } else {
+                String username, password;
+                username = String.valueOf(mUsernameET.getText()).trim();
+                password = String.valueOf(mPasswordET.getText());
+                if (username.length() == 0 || password.length() == 0) {
+                    showValidationError(R.string.login_validation_error_fieldsmissing);
+                    return;
+                }
+                apiClient.connectUser(username, password)
+
+                        .subscribe(LoginActivity.this, throwable -> hideProgress());
+            }
+        }
+    };
+
+    private View.OnClickListener mForgotPWClick = v -> {
+        String url = BuildConfig.BASE_URL;
+        Intent i = new Intent(Intent.ACTION_VIEW);
+        i.setData(Uri.parse(url));
+        startActivity(i);
+    };
+
+
+    public static void show(final View v) {
+        v.setVisibility(View.VISIBLE);
+    }
+
+    public static void hide(final View v) {
+        v.setVisibility(View.GONE);
+    }
+
     private void startMainActivity() {
         Intent intent = new Intent(LoginActivity.this, MainActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -383,7 +385,7 @@ public class LoginActivity extends BaseActivity
     }
 
     private void saveTokens(String api, String user) throws Exception {
-        this.apiHelper.updateAuthenticationCredentials(user, api);
+        this.apiClient.updateAuthenticationCredentials(user, api);
         SharedPreferences.Editor editor = sharedPrefs.edit();
         boolean ans = editor.putString(getString(R.string.SP_APIToken), api)
                 .putString(getString(R.string.SP_userID), user)
@@ -457,7 +459,7 @@ public class LoginActivity extends BaseActivity
     }
 
     private void handleGoogleLoginResult() {
-        String scopesString = Scopes.PLUS_LOGIN + " " + Scopes.PROFILE + " " + Scopes.EMAIL;
+        String scopesString = Scopes.PROFILE + " " + Scopes.EMAIL;
         String scopes = "oauth2:" + scopesString;
         Observable.defer(() -> {
             try {
@@ -466,8 +468,8 @@ public class LoginActivity extends BaseActivity
                 throw Exceptions.propagate(e);
             }
         })
-                .flatMap(token -> apiHelper.connectSocial("google", googleEmail, token))
-                .compose(apiHelper.configureApiCallObserver())
+                .flatMap(token -> apiClient.connectSocial("google", googleEmail, token))
+
                 .subscribe(LoginActivity.this, throwable -> {
                     hideProgress();
                     if (throwable.getCause() != null && GoogleAuthException.class.isAssignableFrom(throwable.getCause().getClass())) {
@@ -520,11 +522,16 @@ public class LoginActivity extends BaseActivity
 
     private void showForm() {
         isShowingForm = true;
-        ValueAnimator panAnimation = ObjectAnimator.ofInt(backgroundContainer, "scrollY",  0).setDuration(1000);
+        ValueAnimator panAnimation = ObjectAnimator.ofInt(backgroundContainer, "scrollY", 0).setDuration(1000);
         ValueAnimator newGameAlphaAnimation = ObjectAnimator.ofFloat(newGameButton, View.ALPHA, 0);
-
         ValueAnimator showLoginAlphaAnimation = ObjectAnimator.ofFloat(showLoginButton, View.ALPHA, 0);
-
+        ValueAnimator scaleLogoAnimation = ValueAnimator.ofInt(logoView.getMeasuredHeight(), (int)(logoView.getMeasuredHeight()*0.75));
+        scaleLogoAnimation.addUpdateListener(valueAnimator -> {
+            int val = (Integer) valueAnimator.getAnimatedValue();
+            ViewGroup.LayoutParams layoutParams = logoView.getLayoutParams();
+            layoutParams.height = val;
+            logoView.setLayoutParams(layoutParams);
+        });
         if (isRegistering) {
             newGameAlphaAnimation.setStartDelay(600);
             newGameAlphaAnimation.setDuration(400);
@@ -552,13 +559,13 @@ public class LoginActivity extends BaseActivity
         }
         ValueAnimator backAlphaAnimation = ObjectAnimator.ofFloat(backButton, View.ALPHA, 1).setDuration(800);
         AnimatorSet showAnimation = new AnimatorSet();
-        showAnimation.playTogether(panAnimation, newGameAlphaAnimation, showLoginAlphaAnimation);
+        showAnimation.playTogether(panAnimation, newGameAlphaAnimation, showLoginAlphaAnimation, scaleLogoAnimation);
         showAnimation.play(backAlphaAnimation).after(panAnimation);
         for (int i = 0; i < formWrapper.getChildCount(); i++) {
             View view = formWrapper.getChildAt(i);
             view.setAlpha(0);
             ValueAnimator animator = ObjectAnimator.ofFloat(view, View.ALPHA, 1).setDuration(400);
-            animator.setStartDelay(100*i);
+            animator.setStartDelay(100 * i);
             showAnimation.play(animator).after(panAnimation);
         }
 
@@ -567,9 +574,16 @@ public class LoginActivity extends BaseActivity
 
     private void hideForm() {
         isShowingForm = false;
-        ValueAnimator panAnimation = ObjectAnimator.ofInt(backgroundContainer, "scrollY",  backgroundContainer.getBottom()).setDuration(1000);
+        ValueAnimator panAnimation = ObjectAnimator.ofInt(backgroundContainer, "scrollY", backgroundContainer.getBottom()).setDuration(1000);
         ValueAnimator newGameAlphaAnimation = ObjectAnimator.ofFloat(newGameButton, View.ALPHA, 1).setDuration(700);
         ValueAnimator showLoginAlphaAnimation = ObjectAnimator.ofFloat(showLoginButton, View.ALPHA, 1).setDuration(700);
+        ValueAnimator scaleLogoAnimation = ValueAnimator.ofInt(logoView.getMeasuredHeight(), (int)(logoView.getMeasuredHeight()*1.333333));
+        scaleLogoAnimation.addUpdateListener(valueAnimator -> {
+            int val = (Integer) valueAnimator.getAnimatedValue();
+            ViewGroup.LayoutParams layoutParams = logoView.getLayoutParams();
+            layoutParams.height = val;
+            logoView.setLayoutParams(layoutParams);
+        });
         showLoginAlphaAnimation.setStartDelay(300);
         ValueAnimator scrollViewAlphaAnimation = ObjectAnimator.ofFloat(scrollView, View.ALPHA, 0).setDuration(800);
         scrollViewAlphaAnimation.addListener(new AnimatorListenerAdapter() {
@@ -581,7 +595,7 @@ public class LoginActivity extends BaseActivity
         });
         ValueAnimator backAlphaAnimation = ObjectAnimator.ofFloat(backButton, View.ALPHA, 0).setDuration(800);
         AnimatorSet showAnimation = new AnimatorSet();
-        showAnimation.playTogether(panAnimation, scrollViewAlphaAnimation, backAlphaAnimation);
+        showAnimation.playTogether(panAnimation, scrollViewAlphaAnimation, backAlphaAnimation, scaleLogoAnimation);
         showAnimation.play(newGameAlphaAnimation).after(scrollViewAlphaAnimation);
         showAnimation.play(showLoginAlphaAnimation).after(scrollViewAlphaAnimation);
         showAnimation.start();
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 7b89a8c6f..c9ee2f910 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
@@ -1,7 +1,46 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+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.content.res.Resources;
+import android.database.sqlite.SQLiteDoneException;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.design.widget.CoordinatorLayout;
+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.view.OnApplyWindowInsetsListener;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.WindowInsetsCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
@@ -13,6 +52,7 @@ 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.TaskRepository;
 import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.events.ContentReloadedEvent;
 import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
@@ -28,7 +68,6 @@ 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.UpdateGoldGemsPurchasedevent;
 import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
 import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
 import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
@@ -48,6 +87,14 @@ import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
+import com.habitrpg.android.habitica.interactors.BuyRewardUseCase;
+import com.habitrpg.android.habitica.interactors.CheckClassSelectionUseCase;
+import com.habitrpg.android.habitica.interactors.ChecklistCheckUseCase;
+import com.habitrpg.android.habitica.interactors.DailyCheckUseCase;
+import com.habitrpg.android.habitica.interactors.DisplayItemDropUseCase;
+import com.habitrpg.android.habitica.interactors.HabitScoreUseCase;
+import com.habitrpg.android.habitica.interactors.NotifyUserUseCase;
+import com.habitrpg.android.habitica.interactors.TodoCheckUseCase;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
@@ -61,15 +108,14 @@ 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.SuppressedModals;
 import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirection;
 import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
 import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
@@ -78,7 +124,6 @@ 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.HabitResponse;
 import com.magicmicky.habitrpgwrapper.lib.models.responses.MaintenanceResponse;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
@@ -104,42 +149,11 @@ 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;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-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;
-import android.graphics.Color;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.FragmentTransaction;
-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.Log;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -160,6 +174,7 @@ import rx.Observable;
 import rx.functions.Action1;
 
 import static android.os.Build.VERSION.SDK_INT;
+import static com.habitrpg.android.habitica.interactors.NotifyUserUseCase.MIN_LEVEL_FOR_SKILLS;
 import static com.habitrpg.android.habitica.ui.helpers.UiUtils.SnackbarDisplayType;
 import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
 
@@ -168,18 +183,20 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     public static final int SELECT_CLASS_RESULT = 11;
     public static final int GEM_PURCHASE_REQUEST = 111;
-    public static final int MIN_LEVEL_FOR_SKILLS = 11;
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
 
     @Inject
     public SoundManager soundManager;
+
     @Inject
     public MaintenanceApiService maintenanceService;
     public HabitRPGUser user;
     @BindView(R.id.floating_menu_wrapper)
     public
     FrameLayout floatingMenuWrapper;
+    @BindView(R.id.bottom_navigation)
+    BottomBar bottomNavigation;
     @Inject
     protected HostConfig hostConfig;
     @Inject
@@ -193,10 +210,40 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     @BindView(R.id.avatar_with_bars)
     View avatar_with_bars;
     @BindView(R.id.overlayFrameLayout)
-    FrameLayout overlayFrameLayout;
+    CoordinatorLayout overlayFrameLayout;
     PushNotificationManager pushNotificationManager;
+    // region UseCases
+
+    @Inject
+    HabitScoreUseCase habitScoreUseCase;
+
+    @Inject
+    DailyCheckUseCase dailyCheckUseCase;
+
+    @Inject
+    TodoCheckUseCase todoCheckUseCase;
+
+    @Inject
+    BuyRewardUseCase buyRewardUseCase;
+
+    @Inject
+    ChecklistCheckUseCase checklistCheckUseCase;
+
+    @Inject
+    CheckClassSelectionUseCase checkClassSelectionUseCase;
+
+    @Inject
+    DisplayItemDropUseCase displayItemDropUseCase;
+
+    @Inject
+    NotifyUserUseCase notifyUserUseCase;
+
+    @Inject
+    TaskRepository taskRepository;
+
+    // endregion
+
     private Drawer drawer;
-    private Drawer filterDrawer;
     private AccountHeader accountHeader;
     private BaseMainFragment activeFragment;
     private AvatarWithBarsViewModel avatarInHeader;
@@ -224,9 +271,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
     };
 
-    static public Double round(Double value, int n) {
-        return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
-    }
 
     @Override
     protected int getLayoutResId() {
@@ -241,7 +285,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString("language", "en"));
         Locale.setDefault(languageHelper.getLocale());
         Configuration configuration = new Configuration();
-        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
+        if (SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
             configuration.locale = languageHelper.getLocale();
         } else {
             configuration.setLocale(languageHelper.getLocale());
@@ -267,18 +311,38 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         drawer.setSelectionAtPosition(1, false);
         sideAvatarView = new AvatarView(this, true, false, false);
 
-        if (this.filterDrawer == null) {
-            filterDrawer = new DrawerBuilder()
-                    .withActivity(this)
-                    .withDrawerGravity(Gravity.END)
-                    .withCloseOnClick(false)
-                    .append(this.drawer);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            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());
+            avatar_with_bars.setPadding((int)px, getStatusBarHeight(), (int)px, 0);
+            floatingMenuWrapper.setPadding(0, 0, 0, getNavigationBarHeight());
         }
 
         EventBus.getDefault().register(this);
 
     }
 
+    public int getStatusBarHeight() {
+        int result = 0;
+        int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = getResources().getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+
+    private int getNavigationBarHeight() {
+        int result = 0;
+        int resourceId = getResources().getIdentifier("navigation_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = getResources().getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+
     @Override
     protected void injectActivity(AppComponent component) {
         component.inject(this);
@@ -290,11 +354,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
         //resync, if last sync was more than 10 minutes ago
         if (this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
-            if (this.apiHelper != null && this.apiHelper.hasAuthenticationKeys()) {
-                this.apiHelper.retrieveUser(true)
-                        .compose(apiHelper.configureApiCallObserver())
-                        .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                        });
+            if (this.apiClient != null && this.apiClient.hasAuthenticationKeys()) {
+                retrieveUser();
                 this.checkMaintenance();
             }
         }
@@ -380,6 +441,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         fragment.setUser(user);
         fragment.setActivity(this);
         fragment.setTabLayout(detail_tabs);
+        fragment.setBottomNavigation(bottomNavigation);
         fragment.setFloatingMenuWrapper(floatingMenuWrapper);
 
 
@@ -392,24 +454,23 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
     }
 
-    private void setUserData(boolean fromLocalDb) {
+    protected void setUserData(boolean fromLocalDb) {
         if (user != null) {
 
             Preferences preferences = user.getPreferences();
 
             if (preferences != null) {
-                apiHelper.languageCode = preferences.getLanguage();
+                apiClient.setLanguageCode(preferences.getLanguage());
+                soundManager.setSoundTheme(preferences.getSound());
             }
 
-            soundManager.setSoundTheme(preferences.getSound());
-
             Calendar calendar = new GregorianCalendar();
             TimeZone timeZone = calendar.getTimeZone();
             long offset = -TimeUnit.MINUTES.convert(timeZone.getOffset(calendar.getTimeInMillis()), TimeUnit.MILLISECONDS);
             if (offset != user.getPreferences().getTimezoneOffset()) {
                 Map<String, Object> updateData = new HashMap<>();
                 updateData.put("preferences.timezoneOffset", String.valueOf(offset));
-                apiHelper.apiService.updateUser(updateData).compose(apiHelper.configureApiCallObserver())
+                apiClient.updateUser(updateData)
                         .subscribe(new MergeUserCallback(this, user), throwable -> {
                         });
             }
@@ -843,7 +904,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                 drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
             }
         } else {
-            IDrawerItem newItem = item;
+            IDrawerItem newItem;
             if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS && !hasSpecialItems) {
                 newItem = new PrimaryDrawerItem()
                         .withName(this.getString(R.string.sidebar_skills))
@@ -881,7 +942,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         if (getSupportActionBar() == null) {
             return;
         }
-        if (fragment != null && fragment.isAdded() && fragment.customTitle() != null) {
+        if (fragment != null && fragment.customTitle() != null) {
             getSupportActionBar().setTitle(fragment.customTitle());
         } else if (user != null && user.getProfile() != null) {
             getSupportActionBar().setTitle(user.getProfile().getName());
@@ -908,15 +969,15 @@ 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.apiHelper != null) {
-                this.apiHelper.retrieveUser(true)
-                        .compose(apiHelper.configureApiCallObserver())
+            if (this.apiClient != null) {
+                this.apiClient.retrieveUser(true)
+
                         .subscribe(new HabitRPGUserCallback(this), throwable -> {
                         });
             }
         } else if (requestCode == GEM_PURCHASE_REQUEST) {
-            this.apiHelper.retrieveUser(true)
-                    .compose(apiHelper.configureApiCallObserver())
+            this.apiClient.retrieveUser(true)
+
                     .subscribe(new HabitRPGUserCallback(this), throwable -> {
                     });
         }
@@ -938,15 +999,14 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void onEvent(UpdateUserCommand event) {
-        apiHelper.apiService.updateUser(event.updateData).compose(apiHelper.configureApiCallObserver())
+        apiClient.updateUser(event.updateData)
                 .subscribe(new MergeUserCallback(this, user), throwable -> {
                 });
     }
 
     @Subscribe
     public void onEvent(EquipCommand event) {
-        this.apiHelper.apiService.equipItem(event.type, event.key)
-                .compose(apiHelper.configureApiCallObserver())
+        this.apiClient.equipItem(event.type, event.key)
                 .subscribe(new ItemsCallback(this, this.user), throwable -> {
                 });
     }
@@ -955,8 +1015,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     public void onEvent(UnlockPathCommand event) {
         this.user.setBalance(this.user.getBalance() - event.balanceDiff);
         this.setUserData(false);
-        apiHelper.apiService.unlockPath(event.path)
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.unlockPath(event.path)
+
                 .subscribe(new UnlockCallback(this, this.user), throwable -> {
                 });
     }
@@ -969,39 +1029,30 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     @Subscribe
     public void onEvent(final BuyGemItemCommand event) {
         if (event.item.canBuy(user) || !event.item.getCurrency().equals("gems")) {
-            Observable<HabitResponse<Void>> observable;
+            Observable<Void> observable;
             if (event.shopIdentifier.equals(Shop.TIME_TRAVELERS_SHOP)) {
                 if (event.item.purchaseType.equals("gear")) {
-                    observable = apiHelper.apiService.purchaseMysterySet(event.item.categoryIdentifier);
+                    observable = apiClient.purchaseMysterySet(event.item.categoryIdentifier);
                 } else {
-                    observable = apiHelper.apiService.purchaseHourglassItem(event.item.purchaseType, event.item.key);
+                    observable = apiClient.purchaseHourglassItem(event.item.purchaseType, event.item.key);
                 }
             } else if (event.item.purchaseType.equals("quests") && event.item.getCurrency().equals("gold")) {
-                observable = apiHelper.apiService.purchaseQuest(event.item.key);
+                observable = apiClient.purchaseQuest(event.item.key);
             } else {
-                observable = apiHelper.apiService.purchaseItem(event.item.purchaseType, event.item.key);
+                observable = apiClient.purchaseItem(event.item.purchaseType, event.item.key);
             }
             observable
-                    .compose(apiHelper.configureApiCallObserver())
+
                     .doOnNext(aVoid -> showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL))
-                    .subscribe(buyResponse -> {
-                                apiHelper.retrieveUser(false)
-                                        .compose(apiHelper.configureApiCallObserver())
-                                        .subscribe(new HabitRPGUserCallback(user1 -> {
-                                                    UpdateGoldGemsPurchasedevent event1 = new UpdateGoldGemsPurchasedevent();
-                                                    event1.numberLeft = user1.getPurchased().getPlan().numberOfGemsLeft();
-                                                    EventBus.getDefault().post(event1);
-                                                    MainActivity.this.onUserReceived(user1);
-                                                }), throwable -> {
-                                                }
-                                        );
-                            }, throwable -> {
-                                HttpException error = (HttpException) throwable;
-                                if (error.code() == 401 && event.item.getCurrency().equals("gems")) {
-                                    openGemPurchaseFragment(null);
-                                }
-                            }
-                    );
+                    .subscribe(buyResponse -> apiClient.retrieveUser(false)
+
+                            .subscribe(new HabitRPGUserCallback(this), throwable -> {
+                            }), throwable -> {
+                        HttpException error = (HttpException) throwable;
+                        if (error.code() == 401 && event.item.getCurrency().equals("gems")) {
+                            openGemPurchaseFragment(null);
+                        }
+                    });
         } else {
             openGemPurchaseFragment(null);
         }
@@ -1027,8 +1078,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
 
         if (event.Reward.specialTag != null && event.Reward.specialTag.equals("item")) {
-            apiHelper.apiService.buyItem(event.Reward.getId())
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.buyItem(event.Reward.getId())
                     .subscribe(buyResponse -> {
                                 String snackbarMessage = getString(R.string.successful_purchase, event.Reward.getText());
 
@@ -1071,11 +1121,10 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                             }
                     );
         } else {
-            soundManager.loadAndPlayAudio(SoundManager.SoundReward);
-            // user created Rewards
-            apiHelper.apiService.postTaskDirection(rewardKey, TaskDirection.down.toString())
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(new TaskScoringCallback(this, rewardKey), throwable -> {
+            buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(event.Reward))
+                    .subscribe(res -> {
+                        onTaskDataReceived(res, event.Reward);
+                    }, error -> {
                     });
         }
 
@@ -1090,7 +1139,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void onEvent(final DeleteTaskCommand cmd) {
-        apiHelper.apiService.deleteTask(cmd.TaskIdToDelete).compose(apiHelper.configureApiCallObserver())
+        apiClient.deleteTask(cmd.TaskIdToDelete)
                 .subscribe(aVoid -> {
                     EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete));
                 }, throwable -> {});
@@ -1098,9 +1147,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void openMysteryItem(OpenMysteryItemEvent event) {
-        apiHelper.apiService.openMysteryItem().compose(apiHelper.configureApiCallObserver())
+        apiClient.openMysteryItem()
                 .subscribe(mysteryItem -> {
-                    apiHelper.retrieveUser(false).compose(apiHelper.configureApiCallObserver())
+                    apiClient.retrieveUser(false)
                             .subscribe(new HabitRPGUserCallback(user1 -> {
                                 OpenedMysteryItemEvent openedEvent = new OpenedMysteryItemEvent();
                                 openedEvent.numberLeft = user1.getPurchased().getPlan().mysteryItems.size();
@@ -1109,11 +1158,12 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                                 MainActivity.this.onUserReceived(user1);
                             }), throwable -> {
                             });
-                }, throwable -> {});
+                }, throwable -> {
+                });
     }
 
     @Subscribe
-    public void openGemPurchaseFragment(OpenGemPurchaseFragmentCommand cmd) {
+    public void openGemPurchaseFragment(@Nullable OpenGemPurchaseFragmentCommand cmd) {
         drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE);
     }
 
@@ -1129,8 +1179,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void onEvent(SellItemCommand event) {
-        this.apiHelper.apiService.sellItem(event.item.getType(), event.item.getKey())
-                .compose(apiHelper.configureApiCallObserver())
+        this.apiClient.sellItem(event.item.getType(), event.item.getKey())
+
                 .subscribe(habitRPGUser -> {
                     user.setItems(habitRPGUser.getItems());
                     user.save();
@@ -1145,8 +1195,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         if (event.usingEgg == null || event.usingHatchingPotion == null) {
             return;
         }
-        this.apiHelper.apiService.hatchPet(event.usingEgg.getKey(), event.usingHatchingPotion.getKey())
-                .compose(apiHelper.configureApiCallObserver())
+        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);
@@ -1183,8 +1233,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             return;
         }
         final Pet pet = event.usingPet;
-        this.apiHelper.apiService.feedPet(event.usingPet.getKey(), event.usingFood.getKey())
-                .compose(apiHelper.configureApiCallObserver())
+        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);
@@ -1227,8 +1277,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     public void reloadContent(ReloadContentEvent event) {
         if (!this.isloadingContent) {
             this.isloadingContent = true;
-            this.apiHelper.apiService.getContent(apiHelper.languageCode)
-                    .compose(apiHelper.configureApiCallObserver())
+            this.apiClient.getContent()
                     .subscribe(contentResult -> {
                         isloadingContent = false;
                         ContentReloadedEvent event1 = new ContentReloadedEvent();
@@ -1247,65 +1296,15 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         } else {
 
             if (user != null) {
-                notifyUser(data.getExp(), data.getHp(), data.getGp(), data.getMp(), data.getLvl());
+                notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper, this::retrieveUser,
+                        user, data.getExp(), data.getHp(), data.getGp(), data.getMp(), data.getLvl()));
             }
 
-            showSnackBarForDataReceived(data);
+            displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
+                    .subscribe(aVoid -> {}, throwable -> {});
         }
     }
 
-    private void showSnackBarForDataReceived(final TaskDirectionData data) {
-        if (data.get_tmp() != null) {
-            if (data.get_tmp().getDrop() != null) {
-                new Handler().postDelayed(() -> {
-                    showSnackbar(MainActivity.this, floatingMenuWrapper, data.get_tmp().getDrop().getDialog(), SnackbarDisplayType.DROP);
-                    soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop);
-                }, 3000L);
-            }
-        }
-    }
-
-    private void notifyUser(double xp, double hp, double gold, double mp, int lvl) {
-        StringBuilder message = new StringBuilder();
-        SnackbarDisplayType displayType = SnackbarDisplayType.NORMAL;
-        if (lvl > user.getStats().getLvl()) {
-            displayLevelUpDialog(lvl);
-
-            this.apiHelper.retrieveUser(true)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                    });
-            user.getStats().setLvl(lvl);
-
-            showSnackbar(this, floatingMenuWrapper, message.toString(), SnackbarDisplayType.NORMAL);
-        } else {
-            com.magicmicky.habitrpgwrapper.lib.models.Stats stats = user.getStats();
-
-            if (xp > stats.getExp()) {
-                message.append(" + ").append(round(xp - stats.getExp(), 2)).append(" XP");
-                user.getStats().setExp(xp);
-            }
-            if (hp != stats.getHp()) {
-                displayType = SnackbarDisplayType.FAILURE;
-                message.append(" - ").append(round(stats.getHp() - hp, 2)).append(" HP");
-                user.getStats().setHp(hp);
-            }
-            if (gold > stats.getGp()) {
-                message.append(" + ").append(round(gold - stats.getGp(), 2)).append(" GP");
-                stats.setGp(gold);
-            } else if (gold < stats.getGp()) {
-                displayType = SnackbarDisplayType.FAILURE;
-                message.append(" - ").append(round(stats.getGp() - gold, 2)).append(" GP");
-                stats.setGp(gold);
-            }
-            if (mp > stats.getMp() && stats.getLvl() >= MIN_LEVEL_FOR_SKILLS) {
-                message.append(" + ").append(round(mp - stats.getMp(), 2)).append(" MP");
-                stats.setMp(mp);
-            }
-            showSnackbar(this, floatingMenuWrapper, message.toString(), displayType);
-        }
-        setUserData(true);
-    }
 
     private void displayDeathDialogIfNeeded() {
 
@@ -1332,8 +1331,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                     .setView(customView)
                     .setPositiveButton(R.string.faint_button, (dialog, which) -> {
                         faintDialog = null;
-                        apiHelper.apiService.revive()
-                                .compose(apiHelper.configureApiCallObserver())
+                        apiClient.revive()
+
                                 .subscribe(new MergeUserCallback(MainActivity.this, MainActivity.this.user), throwable -> {
                                 });
                     })
@@ -1344,57 +1343,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
     }
 
-    private void displayLevelUpDialog(int level) {
-        soundManager.loadAndPlayAudio(SoundManager.SoundLevelUp);
-
-        SuppressedModals suppressedModals = user.getPreferences().getSuppressModals();
-        if (suppressedModals != null) {
-            if (suppressedModals.getLevelUp()) {
-                checkClassSelection();
-                return;
-            }
-        }
-
-        View customView = getLayoutInflater().inflate(R.layout.dialog_levelup, null);
-        if (customView != null) {
-            TextView detailView = (TextView) customView.findViewById(R.id.levelupDetail);
-            detailView.setText(this.getString(R.string.levelup_detail, level));
-            dialogAvatarView = (AvatarView) customView.findViewById(R.id.avatarView);
-            dialogAvatarView.setUser(user);
-        }
-
-        final ShareEvent event = new ShareEvent();
-        event.sharedMessage = getString(R.string.share_levelup, level) + " https://habitica.com/social/level-up";
-        AvatarView avatarView = new AvatarView(this, true, true, true);
-        avatarView.setUser(user);
-        avatarView.onAvatarImageReady(avatarImage -> event.shareImage = avatarImage);
-
-        AlertDialog alert = new AlertDialog.Builder(this)
-                .setTitle(R.string.levelup_header)
-                .setView(customView)
-                .setPositiveButton(R.string.levelup_button, (dialog, which) -> {
-                    checkClassSelection();
-                })
-                .setNeutralButton(R.string.share, (dialog, which) -> {
-                    EventBus.getDefault().post(event);
-                    dialog.dismiss();
-                })
-                .create();
-        if (!this.isFinishing()) {
-            alert.show();
-        }
-    }
-
-    private void checkClassSelection() {
-        if (user.getStats().getLvl() > 10 &&
-                !user.getPreferences().getDisableClasses() &&
-                !user.getFlags().getClassSelected()) {
-            SelectClassEvent event = new SelectClassEvent();
-            event.isInitialSelection = true;
-            event.currentClass = user.getStats().get_class().toString();
-            displayClassSelectionActivity(event);
-        }
-    }
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
@@ -1410,23 +1358,18 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         return floatingMenuWrapper;
     }
 
+    protected void retrieveUser() {
+        this.apiClient.retrieveUser(true)
+                .subscribe(new HabitRPGUserCallback(this), throwable -> {
+                });
+    }
+
     @Subscribe
     public void displayClassSelectionActivity(SelectClassEvent event) {
-        Bundle bundle = new Bundle();
-        bundle.putString("size", user.getPreferences().getSize());
-        bundle.putString("skin", user.getPreferences().getSkin());
-        bundle.putString("shirt", user.getPreferences().getShirt());
-        bundle.putInt("hairBangs", user.getPreferences().getHair().getBangs());
-        bundle.putInt("hairBase", user.getPreferences().getHair().getBase());
-        bundle.putString("hairColor", user.getPreferences().getHair().getColor());
-        bundle.putInt("hairMustache", user.getPreferences().getHair().getMustache());
-        bundle.putInt("hairBeard", user.getPreferences().getHair().getBeard());
-        bundle.putBoolean("isInitialSelection", event.isInitialSelection);
-        bundle.putString("currentClass", event.currentClass);
-
-        Intent intent = new Intent(this, ClassSelectionActivity.class);
-        intent.putExtras(bundle);
-        startActivityForResult(intent, SELECT_CLASS_RESULT);
+        checkClassSelectionUseCase.observable(new CheckClassSelectionUseCase.RequestValues(user, event))
+                .subscribe(aVoid -> {
+                }, throwable -> {
+                });
     }
 
     private void displayTutorialStep(TutorialStep step, String text) {
@@ -1448,8 +1391,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);
-        apiHelper.apiService.updateUser(updateData)
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.updateUser(updateData)
+
                 .subscribe(new MergeUserCallback(this, user), throwable -> {
                 });
         this.overlayFrameLayout.removeView(this.activeTutorialView);
@@ -1503,21 +1446,21 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void onEvent(TaskCheckedCommand event) {
-        apiHelper.apiService.postTaskDirection(event.Task.getId(), (event.Task.getCompleted() ? TaskDirection.down : TaskDirection.up).toString())
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(new TaskScoringCallback(this, event.Task.getId()), throwable -> {
-                    event.Task.completed = !event.Task.completed;
-                    event.Task.save();
-                    EventBus.getDefault().post(new TaskUpdatedEvent(event.Task));
-                });
-
         switch (event.Task.type) {
             case Task.TYPE_DAILY: {
-                soundManager.loadAndPlayAudio(SoundManager.SoundDaily);
+                dailyCheckUseCase.observable(new DailyCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted()))
+                        .subscribe(res -> {
+                            EventBus.getDefault().post(new TaskUpdatedEvent(event.Task));
+                        }, error -> {
+                        });
             }
             break;
             case Task.TYPE_TODO: {
-                soundManager.loadAndPlayAudio(SoundManager.SoundTodo);
+                todoCheckUseCase.observable(new TodoCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted()))
+                        .subscribe(res -> {
+                            EventBus.getDefault().post(new TaskUpdatedEvent(event.Task));
+                        }, error -> {
+                        });
             }
             break;
         }
@@ -1525,33 +1468,26 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void onEvent(ChecklistCheckedCommand event) {
-        apiHelper.apiService.scoreChecklistItem(event.task.getId(), event.item.getId())
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(new TaskUpdateCallback(), throwable -> {
+        checklistCheckUseCase.observable(new ChecklistCheckUseCase.RequestValues(event.task.getId(), event.item.getId()))
+                .subscribe(res -> EventBus.getDefault().post(new TaskUpdatedEvent(event.task)), error -> {
                 });
     }
 
     @Subscribe
     public void onEvent(HabitScoreEvent event) {
-        apiHelper.apiService.postTaskDirection(event.habit.getId(), (event.Up ? TaskDirection.up : TaskDirection.down).toString())
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(new TaskScoringCallback(this, event.habit.getId()), throwable -> {
+        habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(event.habit, event.Up))
+                .subscribe(res -> onTaskDataReceived(res, event.habit), error -> {
                 });
-
-        soundManager.loadAndPlayAudio(event.Up ? SoundManager.SoundPlusHabit : SoundManager.SoundMinusHabit);
     }
 
     @Subscribe
     public void onEvent(final TaskSaveEvent event) {
         Task task = event.task;
         if (event.created) {
-            this.apiHelper.apiService.createItem(task)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(new TaskCreationCallback(), throwable -> {
+            this.taskRepository.createTask(task).subscribe(new TaskCreationCallback(), throwable -> {
                     });
         } else {
-            this.apiHelper.apiService.updateTask(task.getId(), task)
-                    .compose(apiHelper.configureApiCallObserver())
+            this.taskRepository.updateTask(task)
                     .subscribe(new TaskUpdateCallback(), throwable -> {
                     });
         }
@@ -1559,7 +1495,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     private void checkMaintenance() {
         this.maintenanceService.getMaintenanceStatus()
-                .compose(apiHelper.configureApiCallObserver())
+                .compose(apiClient.configureApiCallObserver())
                 .subscribe(maintenanceResponse -> {
                     if (maintenanceResponse.activeMaintenance) {
                         Intent intent = createMaintenanceIntent(maintenanceResponse, false);
@@ -1611,44 +1547,14 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     }
 
     public void closeDrawer(int gravity) {
-        Drawer drawer;
-        if (gravity == GravityCompat.START) {
-            drawer = this.drawer;
-        } else {
-            drawer = this.filterDrawer;
-        }
-        if (drawer != null) {
-            drawer.closeDrawer();
-        }
+        this.drawer.closeDrawer();
     }
 
     public void openDrawer(int gravity) {
-        Drawer drawer;
-        if (gravity == GravityCompat.START) {
-            drawer = this.drawer;
-        } else {
-            drawer = this.filterDrawer;
-        }
-        if (drawer != null) {
-            EventBus.getDefault().post(new ToggledEditTagsEvent(false));
-            drawer.openDrawer();
-        }
+        EventBus.getDefault().post(new ToggledEditTagsEvent(false));
+        this.drawer.openDrawer();
     }
 
-    public void fillFilterDrawer(List<IDrawerItem> items) {
-        if (this.filterDrawer != null) {
-            this.filterDrawer.removeAllItems();
-            for (IDrawerItem item : items) {
-                this.filterDrawer.addItem(item);
-            }
-        }
-    }
-
-    public void addFilterDrawerItem(IDrawerItem item) {
-        this.filterDrawer.addItem(item);
-    }
-
-
     @Subscribe
     public void onEvent(OpenFullProfileCommand cmd) {
         if (cmd.MemberId.equals("system"))
@@ -1662,13 +1568,4 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
         startActivity(intent);
     }
-
-    public void removeFilterDrawerItem(int position) {
-        this.filterDrawer.removeItemByPosition(position);
-    }
-
-    public void updateFilterDrawerItem(IDrawerItem item, int position) {
-        this.filterDrawer.removeItemByPosition(position);
-        this.filterDrawer.addItemAtPosition(item, position);
-    }
 }
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 9d17e2651..973ecb35a 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,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.activities;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
@@ -28,7 +28,7 @@ public class MaintenanceActivity extends BaseActivity {
     public MaintenanceApiService maintenanceService;
 
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
 
     @BindView(R.id.titleTextView)
     TextView titleTextView;
@@ -75,7 +75,7 @@ public class MaintenanceActivity extends BaseActivity {
         super.onResume();
         if (!isDeprecationNotice) {
             this.maintenanceService.getMaintenanceStatus()
-                    .compose(apiHelper.configureApiCallObserver())
+                    .compose(apiClient.configureApiCallObserver())
                     .subscribe(maintenanceResponse -> {
                         if (!maintenanceResponse.activeMaintenance) {
                             finish();
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 3d94e5c1c..0a484df5f 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,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
@@ -43,7 +43,7 @@ public class PartyInviteActivity extends BaseActivity {
     @Inject
     protected HostConfig hostConfig;
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
     @BindView(R.id.tab_layout)
     TabLayout tabLayout;
     @BindView(R.id.view_pager)
@@ -200,10 +200,7 @@ public class PartyInviteActivity extends BaseActivity {
         invites.add(userIdToInvite);
         inviteData.put("uuids", invites);
 
-        this.apiHelper.apiService.inviteToGroup(this.user.getParty().getId(), inviteData)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(aVoid -> {
-                }, throwable -> {
-                });
+        this.apiClient.inviteToGroup(this.user.getParty().getId(), inviteData)
+                .subscribe(aVoid -> {}, throwable -> {});
     }
 }
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 bb1d419f9..c3ea65f3b 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,11 +1,23 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.APIHelper;
+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.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;
@@ -30,6 +42,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.content.res.AppCompatResources;
 import android.support.v7.preference.PreferenceManager;
@@ -51,7 +64,7 @@ import butterknife.OnClick;
 public class SetupActivity extends BaseActivity implements ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
 
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     @Inject
     protected HostConfig hostConfig;
     @BindView(R.id.view_pager)
@@ -86,8 +99,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
         String currentDeviceLanguage = Locale.getDefault().getLanguage();
         for (String language : getResources().getStringArray(R.array.LanguageValues)) {
             if (language.equals(currentDeviceLanguage)) {
-                apiHelper.apiService.registrationLanguage(currentDeviceLanguage)
-                        .compose(apiHelper.configureApiCallObserver())
+                apiClient.registrationLanguage(currentDeviceLanguage)
                         .subscribe(new MergeUserCallback(this, user), throwable -> {
                         });
             }
@@ -95,7 +107,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             Window window = getWindow();
-            window.setStatusBarColor(getResources().getColor(R.color.light_gray_bg));
+            window.setStatusBarColor(ContextCompat.getColor(this, R.color.days_gray));
         }
     }
 
@@ -113,8 +125,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
             if (this.user != null) {
                 setupViewpager();
             } else {
-                this.apiHelper.apiService.getUser()
-                        .compose(this.apiHelper.configureApiCallObserver())
+                this.apiClient.getUser()
                         .subscribe(new HabitRPGUserCallback(this), throwable -> {
                         });
             }
@@ -138,12 +149,18 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
 
     @Subscribe
     public void onEvent(UpdateUserCommand event) {
-        this.apiHelper.apiService.updateUser(event.updateData)
-                .compose(this.apiHelper.configureApiCallObserver())
+        this.apiClient.updateUser(event.updateData)
                 .subscribe(new MergeUserCallback(this, user), throwable -> {
                 });
     }
 
+    @Subscribe
+    public void onEvent(EquipCommand event) {
+        this.apiClient.equipItem(event.type, event.key)
+                .subscribe(new ItemsCallback(this, this.user), throwable -> {
+                });
+    }
+
     @OnClick(R.id.nextButton)
     public void nextClicked(View v) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -154,8 +171,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
         if (isLastPage()) {
             List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
             this.completedSetup = true;
-            this.apiHelper.apiService.createTasks(newTasks)
-                    .compose(this.apiHelper.configureApiCallObserver())
+            this.apiClient.createTasks(newTasks)
                     .subscribe(tasks -> {
                         onUserReceived(user);
                     }, throwable -> {
@@ -197,6 +213,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
             this.nextButton.setText(this.getString(R.string.intro_finish_button));
         } else {
             this.setPreviousButtonEnabled(true);
+            this.nextButton.setText(this.getString(R.string.next_button));
         }
     }
 
@@ -257,6 +274,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
                 }
                 case 2: {
                     taskSetupFragment = new TaskSetupFragment();
+                    taskSetupFragment.setUser(user);
                     fragment = taskSetupFragment;
                     break;
                 }
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 7a3f6699f..405835ff3 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.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
@@ -20,13 +20,13 @@ import javax.inject.Inject;
 import butterknife.BindView;
 
 public class SkillMemberActivity extends BaseActivity {
-
-    @Inject
-    public APIHelper apiHelper;
     @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
     private PartyMemberRecyclerViewAdapter viewAdapter;
 
+    @Inject
+    public ApiClient apiClient;
+
     @Override
     protected int getLayoutResId() {
         return R.layout.activity_skill_members;
@@ -46,21 +46,18 @@ public class SkillMemberActivity extends BaseActivity {
     }
 
     private void loadMemberList() {
-
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         viewAdapter = new PartyMemberRecyclerViewAdapter();
         viewAdapter.context = this;
         recyclerView.setAdapter(viewAdapter);
 
-        apiHelper.apiService.getGroup("party")
-                .compose(this.apiHelper.configureApiCallObserver())
+        apiClient.getGroup("party")
                 .subscribe(group -> {
                             if (group == null) {
                                 return;
                             }
 
-                            apiHelper.apiService.getGroupMembers(group.id, true)
-                                    .compose(apiHelper.configureApiCallObserver())
+                            apiClient.getGroupMembers(group.id, true)
                                     .subscribe(members -> {
                                                 viewAdapter.setMemberList(members, true);
                                             },
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 8e3fe3f03..66f390344 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
@@ -6,7 +6,7 @@ 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.TagsHelper;
+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;
@@ -195,7 +195,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
     LinearLayout tagsContainerLinearLayout;
 
     @Inject
-    TagsHelper tagsHelper;
+    TaskFilterHelper taskFilterHelper;
 
     EmojiPopup popup;
 
@@ -529,7 +529,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                     }
                 }
             });
-            checkbox.setChecked(tagsHelper.isTagChecked(tag.getId()));
+            checkbox.setChecked(taskFilterHelper.isTagChecked(tag.getId()));
             tagsContainerLinearLayout.addView(row);
             tagCheckBoxList.add(checkbox);
             position++;
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 0cb5cdac7..00280f097 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,21 +1,29 @@
 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 org.greenrobot.eventbus.EventBus;
 
 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;
 
@@ -31,56 +39,27 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
 
     public String userSize;
     public HabitRPGUser user;
-    private List<Object> customizationList;
+    private List<SetupCustomization> customizationList;
 
-    public void setCustomizationList(List<Customization> newCustomizationList) {
-        this.customizationList = new ArrayList<>();
-        String lastSectionTitle = "";
-        for (Customization customization : newCustomizationList) {
-            String sectionTitle = customization.getType();
-            if (customization.getCategory() != null) {
-                if (customization.getCategory().equals("mustache") || customization.getCategory().equals("beard")) {
-                    continue;
-                }
-                sectionTitle = sectionTitle + " - " + customization.getCategory();
-            }
-            if (!sectionTitle.equals(lastSectionTitle)) {
-                lastSectionTitle = sectionTitle;
-                customizationList.add(sectionTitle);
-            }
-            customizationList.add(customization);
-        }
+    public void setCustomizationList(List<SetupCustomization> newCustomizationList) {
+        this.customizationList = newCustomizationList;
         this.notifyDataSetChanged();
     }
 
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        int viewID = R.layout.setup_customization_item;
 
-        if (viewType == 0) {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.customization_section_header, parent, false);
-
-            return new SectionViewHolder(view);
-        } else {
-            int viewID = R.layout.customization_grid_item;
-
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(viewID, parent, false);
-
-            return new CustomizationViewHolder(view);
-        }
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(viewID, parent, false);
 
+        return new CustomizationViewHolder(view);
     }
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         Object obj = customizationList.get(position);
-        if (obj.getClass().equals(String.class)) {
-            ((SectionViewHolder) holder).bind((String) obj);
-        } else {
-            ((CustomizationViewHolder) holder).bind((Customization) customizationList.get(position));
-
-        }
+        ((CustomizationViewHolder) holder).bind(customizationList.get(position));
     }
 
     @Override
@@ -88,39 +67,46 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
         return customizationList == null ? 0 : customizationList.size();
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        if (this.customizationList.get(position).getClass().equals(String.class)) {
-            return 0;
-        } else {
-            return 1;
-        }
-    }
-
-    private boolean isCustomizationActive(Customization customization) {
+    private boolean isCustomizationActive(SetupCustomization customization) {
         Preferences prefs = this.user.getPreferences();
-        switch (customization.getType()) {
-            case "skin":
-                return customization.getIdentifier().equals(prefs.getSkin());
-            case "shirt":
-                return customization.getIdentifier().equals(prefs.getShirt());
-            case "background":
-                return customization.getIdentifier().equals(prefs.getBackground());
-            case "hair":
-                switch (customization.getCategory()) {
-                    case "bangs":
-                        return Integer.parseInt(customization.getIdentifier()) == prefs.getHair().getBangs();
-                    case "base":
-                        return Integer.parseInt(customization.getIdentifier()) == prefs.getHair().getBase();
-                    case "color":
-                        return customization.getIdentifier().equals(prefs.getHair().getColor());
-                    case "flower":
-                        return Integer.parseInt(customization.getIdentifier()) == prefs.getHair().getFlower();
-                    case "beard":
-                        return Integer.parseInt(customization.getIdentifier()) == prefs.getHair().getBeard();
-                    case "mustache":
-                        return Integer.parseInt(customization.getIdentifier()) == prefs.getHair().getMustache();
+        switch (customization.category) {
+            case "body": {
+                switch (customization.subcategory) {
+                    case "size":
+                        return customization.key.equals(prefs.getSize());
+                    case "shirt":
+                        return customization.key.equals(prefs.getShirt());
                 }
+            }
+            case "skin":
+                return customization.key.equals(prefs.getSkin());
+            case "background":
+                return customization.key.equals(prefs.getBackground());
+            case "hair":
+                switch (customization.subcategory) {
+                    case "bangs":
+                        return Integer.parseInt(customization.key) == prefs.getHair().getBangs();
+                    case "base":
+                        return Integer.parseInt(customization.key) == prefs.getHair().getBase();
+                    case "color":
+                        return customization.key.equals(prefs.getHair().getColor());
+                    case "flower":
+                        return Integer.parseInt(customization.key) == prefs.getHair().getFlower();
+                    case "beard":
+                        return Integer.parseInt(customization.key) == prefs.getHair().getBeard();
+                    case "mustache":
+                        return Integer.parseInt(customization.key) == prefs.getHair().getMustache();
+                }
+            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);
+                    case "flower":
+                        return Integer.parseInt(customization.key) == prefs.getHair().getFlower();
+                    case "wheelchair":
+                        return ("chair_"+customization.key).equals(prefs.getChair()) || customization.key.equals(prefs.getChair()) || (customization.key.equals("none") && prefs.getChair() == null);
+                }
+            }
         }
         return false;
     }
@@ -135,19 +121,13 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
 
     class CustomizationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        @BindView(R.id.card_view)
-        CardView cardView;
-
-        @BindView(R.id.linearLayout)
-        RelativeLayout linearLayout;
-
         @BindView(R.id.imageView)
-        SimpleDraweeView imageView;
+        ImageView imageView;
 
-        @BindView(R.id.purchaseOverlay)
-        View purchaseOverlay;
+        @BindView(R.id.textView)
+        TextView textView;
 
-        Customization customization;
+        SetupCustomization customization;
 
         Context context;
 
@@ -155,53 +135,52 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
             super(itemView);
             ButterKnife.bind(this, itemView);
 
-            linearLayout.setOnClickListener(this);
+            itemView.setOnClickListener(this);
 
             context = itemView.getContext();
         }
 
-        public void bind(Customization customization) {
+        public void bind(SetupCustomization customization) {
             this.customization = customization;
 
-            DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, getHairColor()));
-            cardView.setCardBackgroundColor(context.getResources().getColor(android.R.color.white));
-            imageView.setAlpha(1.0f);
-            purchaseOverlay.setAlpha(0.0f);
-            if (isCustomizationActive(this.customization)) {
-                cardView.setCardBackgroundColor(context.getResources().getColor(R.color.brand_500));
+            if (customization.drawableId != null) {
+                imageView.setImageResource(customization.drawableId);
+            } else if (customization.colorId != null) {
+                Drawable drawable = ContextCompat.getDrawable(context, R.drawable.setup_customization_circle);
+                if (drawable != null) {
+                    drawable.setColorFilter(ContextCompat.getColor(context, customization.colorId), PorterDuff.Mode.MULTIPLY);
+                }
+                imageView.setImageDrawable(drawable);
+            } else {
+                imageView.setImageDrawable(null);
+            }
+            textView.setText(customization.text);
+            if (isCustomizationActive(customization)) {
+                imageView.setBackgroundResource(R.drawable.setup_customization_bg_selected);
+                textView.setTextColor(ContextCompat.getColor(context, R.color.white));
+            } else {
+                imageView.setBackgroundResource(R.drawable.setup_customization_bg);
+                textView.setTextColor(ContextCompat.getColor(context, R.color.white_50_alpha));
             }
         }
 
         @Override
         public void onClick(View v) {
-            UpdateUserCommand command = new UpdateUserCommand();
-            Map<String, Object> updateData = new HashMap<>();
-            String updatePath = "preferences." + customization.getType();
-            if (customization.getCategory() != null) {
-                updatePath = updatePath + "." + customization.getCategory();
+            if (customization.path.equals("glasses")) {
+                EquipCommand command = new EquipCommand();
+                command.key = customization.key;
+                command.type = "equipped";
+                EventBus.getDefault().post(command);
+            } else {
+                UpdateUserCommand command = new UpdateUserCommand();
+                Map<String, Object> updateData = new HashMap<>();
+                String updatePath = "preferences." + customization.getPath();
+                updateData.put(updatePath, customization.key);
+
+                command.updateData = updateData;
+
+                EventBus.getDefault().post(command);
             }
-            updateData.put(updatePath, customization.getIdentifier());
-            command.updateData = updateData;
-
-            EventBus.getDefault().post(command);
-        }
-    }
-
-    class SectionViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.label)
-        TextView label;
-
-        Context context;
-
-        public SectionViewHolder(View itemView) {
-            super(itemView);
-            context = itemView.getContext();
-            ButterKnife.bind(this, itemView);
-        }
-
-        public void bind(String sectionTitle) {
-            this.label.setText(sectionTitle);
         }
     }
 }
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 8ae6d05b8..c0380b3a3 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
@@ -2,7 +2,11 @@ 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.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -51,28 +55,26 @@ public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.Task
 
     class TaskViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        @BindView(R.id.checkedTextView)
+        private final Drawable icon;
+        @BindView(R.id.textView)
         TextView textView;
 
-        @BindView(R.id.checkBoxHolder)
-        RelativeLayout checkBoxHolder;
-
-        @BindView(R.id.checkBox)
-        CheckBox checkBox;
-
         String[] taskGroup;
         Boolean isChecked;
 
-        Resources resources;
+        Context context;
 
         public TaskViewHolder(View itemView) {
             super(itemView);
 
             ButterKnife.bind(this, itemView);
 
-            resources = itemView.getResources();
+            context = itemView.getContext();
 
             itemView.setOnClickListener(this);
+
+            icon = ContextCompat.getDrawable(context, R.drawable.ic_check);
+            icon.setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY);
         }
 
         public void bind(String[] taskGroup, Boolean isChecked) {
@@ -80,8 +82,15 @@ public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.Task
             this.isChecked = isChecked;
 
             this.textView.setText(this.taskGroup[0]);
-            this.checkBox.setChecked(this.isChecked);
-            this.checkBoxHolder.setBackgroundResource(R.color.brand_200);
+            if (this.isChecked) {
+                this.textView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+                textView.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.MULTIPLY);
+                textView.setTextColor(ContextCompat.getColor(context, R.color.brand_100));
+            } else {
+                this.textView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+                textView.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY);
+                textView.setTextColor(ContextCompat.getColor(context, R.color.white));
+            }
         }
 
         @Override
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 a5ed67792..068c09c7a 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
@@ -25,6 +25,7 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -39,9 +40,10 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
     private List<Challenge> challengesSource = new ArrayList<>();
 
     private boolean viewUserChallengesOnly;
+    @Nullable
     private HabitRPGUser user;
 
-    public ChallengesListViewAdapter(boolean viewUserChallengesOnly, HabitRPGUser user) {
+    public ChallengesListViewAdapter(boolean viewUserChallengesOnly, @Nullable HabitRPGUser user) {
         this.viewUserChallengesOnly = viewUserChallengesOnly;
         this.user = user;
     }
@@ -55,15 +57,15 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
     public void setFilterByGroups(ChallengeFilterOptions filterOptions){
         this.challenges = $.filter(challengesSource, arg ->
         {
-            boolean showChallenge = $.find(filterOptions.ShowByGroups, g -> g.id.contains(arg.groupId)).isPresent();
+            boolean showChallenge = $.find(filterOptions.showByGroups, g -> g.id.contains(arg.groupId)).isPresent();
 
-            boolean showByOwnership = false;
-            if(filterOptions.ShowOwned){
-                showByOwnership |= arg.leaderId == this.user.getId();
-            }
-
-            if(filterOptions.NotOwned){
-                showByOwnership |= arg.leaderId != this.user.getId();
+            boolean showByOwnership = true;
+            if(filterOptions.showOwned == filterOptions.notOwned && this.user != null){
+                if (filterOptions.showOwned) {
+                    showByOwnership = Objects.equals(arg.leaderId, this.user.getId());
+                } else {
+                    showByOwnership = !Objects.equals(arg.leaderId, this.user.getId());
+                }
             }
 
             return showChallenge && showByOwnership;
@@ -148,7 +150,7 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
         private Challenge challenge;
         private boolean viewUserChallengesOnly;
 
-        public ChallengeViewHolder(View itemView, boolean viewUserChallengesOnly) {
+        ChallengeViewHolder(View itemView, boolean viewUserChallengesOnly) {
             super(itemView);
             this.viewUserChallengesOnly = viewUserChallengesOnly;
 
@@ -162,11 +164,11 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
         }
 
         public static String getLabelByTypeAndCount(Context context, String type, int count) {
-            if (type == Challenge.TASK_ORDER_DAILYS) {
+            if (Objects.equals(type, Challenge.TASK_ORDER_DAILYS)) {
                 return context.getString(count == 1 ? R.string.daily : R.string.dailies);
-            } else if (type == Challenge.TASK_ORDER_HABITS) {
+            } else if (Objects.equals(type, Challenge.TASK_ORDER_HABITS)) {
                 return context.getString(count == 1 ? R.string.habit : R.string.habits);
-            } else if (type == Challenge.TASK_ORDER_REWARDS) {
+            } else if (Objects.equals(type, Challenge.TASK_ORDER_REWARDS)) {
                 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 bbf70b5ca..bccc4919c 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
@@ -249,10 +249,12 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
             if (layoutType != TYPE_DANIEL && layoutType != TYPE_NEW_MESSAGE) {
                 setLikeProperties(msg);
 
-                if (msg.sent != null && msg.sent.equals("true")) {
-                    DataBindingUtils.setRoundedBackgroundInt(userBackground, sendingUser.getContributor().getContributorColor());
-                } else {
-                    DataBindingUtils.setRoundedBackgroundInt(userBackground, msg.getContributorColor());
+                if (userBackground != null) {
+                    if (msg.sent != null && msg.sent.equals("true")) {
+                        DataBindingUtils.setRoundedBackgroundInt(userBackground, sendingUser.getContributor().getContributorColor());
+                    } else {
+                        DataBindingUtils.setRoundedBackgroundInt(userBackground, msg.getContributorColor());
+                    }
                 }
 
                 if (msg.user == null || msg.user.equals("")) {
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 d4b96f266..7b2c592d1 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,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.adapter.social;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
@@ -26,7 +26,7 @@ import butterknife.ButterKnife;
 
 public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<PublicGuildsRecyclerViewAdapter.GuildViewHolder> implements Filterable {
 
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     private List<Group> publicGuildList;
     private List<Group> fullPublicGuildList;
     private List<String> memberGuildIDs;
@@ -59,8 +59,8 @@ public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<Public
             Group guild = (Group) v.getTag();
             boolean isMember = this.memberGuildIDs != null && this.memberGuildIDs.contains(guild.id);
             if (isMember) {
-                PublicGuildsRecyclerViewAdapter.this.apiHelper.apiService.leaveGroup(guild.id)
-                        .compose(apiHelper.configureApiCallObserver())
+                PublicGuildsRecyclerViewAdapter.this.apiClient.leaveGroup(guild.id)
+
                         .subscribe(aVoid -> {
                             memberGuildIDs.remove(guild.id);
                             int indexOfGroup = publicGuildList.indexOf(guild);
@@ -68,8 +68,8 @@ public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<Public
                         }, throwable -> {
                         });
             } else {
-                PublicGuildsRecyclerViewAdapter.this.apiHelper.apiService.joinGroup(guild.id)
-                        .compose(apiHelper.configureApiCallObserver())
+                PublicGuildsRecyclerViewAdapter.this.apiClient.joinGroup(guild.id)
+
                         .subscribe(group -> {
                             memberGuildIDs.add(group.id);
                             int indexOfGroup = publicGuildList.indexOf(group);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java
index 135b43a95..4c75178fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.ui.adapter.social.challenges;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -9,6 +10,7 @@ import android.widget.TextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TagsHelper;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
@@ -35,8 +37,8 @@ public class ChallengeTasksRecyclerViewAdapter extends SortableTasksRecyclerView
     private boolean openTaskDisabled;
     private boolean taskActionsDisabled;
 
-    public ChallengeTasksRecyclerViewAdapter(TagsHelper tagsHelper, int layoutResource,
-                                             Context newContext, String userID, SortTasksCallback sortCallback,
+    public ChallengeTasksRecyclerViewAdapter(@Nullable TaskFilterHelper taskFilterHelper, int layoutResource,
+                                             Context newContext, String userID, @Nullable SortTasksCallback sortCallback,
                                              boolean openTaskDisabled, boolean taskActionsDisabled) {
         super("", tagsHelper, layoutResource, newContext, userID, sortCallback);
         this.openTaskDisabled = openTaskDisabled;
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 1139fdfc9..d8a05b562 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
@@ -2,7 +2,7 @@ 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.TagsHelper;
+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;
@@ -37,14 +37,14 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
     protected List<Task> filteredContent;
     int layoutResource;
     Context context;
-    private TagsHelper tagsHelper;
+    private TaskFilterHelper taskFilterHelper;
 
-    public BaseTasksRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource,
+    public BaseTasksRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
                                         Context newContext, String userID) {
         this.setHasStableIds(true);
         this.taskType = taskType;
         this.context = newContext.getApplicationContext();
-        this.tagsHelper = tagsHelper;
+        this.taskFilterHelper = taskFilterHelper;
         this.userID = userID;
         this.filteredContent = new ArrayList<>();
         injectThis(HabiticaBaseApplication.getComponent());
@@ -105,11 +105,11 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
     }
 
     public void filter() {
-        if (this.tagsHelper == null || this.tagsHelper.howMany() == 0) {
+        if (this.taskFilterHelper == null || this.taskFilterHelper.howMany() == 0) {
             filteredContent = content;
         } else {
             filteredContent = new ObservableArrayList<>();
-            filteredContent.addAll(this.tagsHelper.filter(content));
+            filteredContent.addAll(this.taskFilterHelper.filter(content));
         }
 
         this.notifyDataSetChanged();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java
index decc5ab01..80abc53a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java
@@ -2,20 +2,21 @@ 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.TagsHelper;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
 public class DailiesRecyclerViewHolder extends SortableTasksRecyclerViewAdapter<DailyViewHolder> {
 
     public int dailyResetOffset;
 
-    public DailiesRecyclerViewHolder(String taskType, TagsHelper tagsHelper, int layoutResource,
+    public DailiesRecyclerViewHolder(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
                                      Context newContext, String userID, int dailyResetOffset,
-                                     SortTasksCallback sortTasksCallback) {
-        super(taskType, tagsHelper, layoutResource, newContext, userID, sortTasksCallback);
+                                     @Nullable SortTasksCallback sortTasksCallback) {
+        super(taskType, taskFilterHelper, layoutResource, newContext, userID, sortTasksCallback);
         this.dailyResetOffset = dailyResetOffset;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.java
index 25b63e630..fc0ba7a74 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.java
@@ -2,17 +2,18 @@ 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.TagsHelper;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
 public class HabitsRecyclerViewAdapter extends SortableTasksRecyclerViewAdapter<HabitViewHolder> {
 
 
-    public HabitsRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource, Context newContext, String userID, SortTasksCallback sortCallback) {
-        super(taskType, tagsHelper, layoutResource, newContext, userID, sortCallback);
+    public HabitsRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource, Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
+        super(taskType, taskFilterHelper, layoutResource, newContext, userID, sortCallback);
     }
 
     @Override
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 8e5f9fb1a..c024cd110 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
@@ -1,12 +1,13 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
-import com.habitrpg.android.habitica.APIHelper;
+
 import com.habitrpg.android.habitica.ContentCache;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.helpers.TagsHelper;
+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;
@@ -25,13 +26,13 @@ public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter<Rew
 
     private final ContentCache contentCache;
     private final HabitRPGUser user;
-    private APIHelper apiHelper;
+    private ApiClient apiClient;
 
-    public RewardsRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource, Context newContext, HabitRPGUser user, APIHelper apiHelper) {
-        super(taskType, tagsHelper, layoutResource, newContext, user.getId());
+    public RewardsRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource, Context newContext, HabitRPGUser user, ApiClient apiClient) {
+        super(taskType, taskFilterHelper, layoutResource, newContext, user.getId());
         this.user = user;
-        this.apiHelper = apiHelper;
-        this.contentCache = new ContentCache(apiHelper);
+        this.apiClient = apiClient;
+        this.contentCache = new ContentCache(apiClient);
     }
 
     @Override
@@ -40,9 +41,9 @@ public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter<Rew
     }
 
     public void loadEquipmentRewards() {
-        if (apiHelper != null) {
-            apiHelper.apiService.getInventoryBuyableGear()
-                    .compose(apiHelper.configureApiCallObserver())
+        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 6e7a2fbe6..3cb18cbd7 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
@@ -1,12 +1,13 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
-import com.habitrpg.android.habitica.helpers.TagsHelper;
+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 android.content.Context;
+import android.support.annotation.Nullable;
 
 import java.util.Collections;
 
@@ -18,9 +19,9 @@ public abstract class SortableTasksRecyclerViewAdapter<VH extends BaseTaskViewHo
 
     private SortTasksCallback sortCallback;
 
-    public SortableTasksRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource,
-                                            Context newContext, String userID, SortTasksCallback sortCallback) {
-        super(taskType, tagsHelper, layoutResource, newContext, userID);
+    public SortableTasksRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
+                                            Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
+        super(taskType, taskFilterHelper, layoutResource, newContext, userID);
         this.sortCallback = sortCallback;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.java
index 604be2755..cdefd913b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.java
@@ -2,17 +2,18 @@ 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.TagsHelper;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
 public class TodosRecyclerViewAdapter extends SortableTasksRecyclerViewAdapter<TodoViewHolder> {
 
-    public TodosRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource,
-                                    Context newContext, String userID, SortTasksCallback sortCallback) {
-        super(taskType, tagsHelper, layoutResource, newContext, userID, sortCallback);
+    public TodosRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
+                                    Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
+        super(taskType, taskFilterHelper, layoutResource, newContext, userID, sortCallback);
     }
 
     @Override
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 1026f4449..4f3c3a59b 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
@@ -1,10 +1,18 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
+import android.os.Bundle;
+import android.support.annotation.CallSuper;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import com.habitrpg.android.habitica.HabiticaApplication;
+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.habitrpg.android.habitica.ui.activities.BaseActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
@@ -15,14 +23,6 @@ import com.squareup.leakcanary.RefWatcher;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBusException;
 
-import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -78,7 +78,7 @@ public abstract class BaseFragment extends DialogFragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        injectFragment(((BaseActivity) getActivity()).getHabiticaApplication().getComponent());
+        injectFragment(HabiticaBaseApplication.getComponent());
     }
 
     @Nullable
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 becff3b16..342117b67 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
@@ -1,36 +1,41 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.design.widget.TabLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+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.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.roughike.bottombar.BottomBar;
+
 import javax.inject.Inject;
 
 public abstract class BaseMainFragment extends BaseFragment {
 
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     public MainActivity activity;
     public TabLayout tabLayout;
+    public BottomBar bottomNavigation;
     public FrameLayout floatingMenuWrapper;
     public boolean usesTabLayout;
+    public boolean usesBottomNavigation = false;
     public int fragmentSidebarPosition;
     @Inject
     protected SoundManager soundManager;
+    @Nullable
     protected HabitRPGUser user;
 
-    public void setUser(HabitRPGUser user) {
+    public void setUser(@Nullable HabitRPGUser user) {
         this.user = user;
     }
 
@@ -42,6 +47,10 @@ public abstract class BaseMainFragment extends BaseFragment {
         this.tabLayout = tabLayout;
     }
 
+    public void setBottomNavigation(BottomBar bottomNavigation) {
+        this.bottomNavigation = bottomNavigation;
+    }
+
     public void setFloatingMenuWrapper(FrameLayout view) {
         this.floatingMenuWrapper = view;
     }
@@ -86,6 +95,16 @@ public abstract class BaseMainFragment extends BaseFragment {
             }
         }
 
+        if (bottomNavigation != null) {
+            if (this.usesBottomNavigation) {
+                bottomNavigation.removeOnTabSelectListener();
+                bottomNavigation.removeOnTabReselectListener();
+                bottomNavigation.setVisibility(View.VISIBLE);
+            } else {
+                bottomNavigation.setVisibility(View.GONE);
+            }
+        }
+
         if (floatingMenuWrapper != null) {
             floatingMenuWrapper.removeAllViews();
         }
@@ -111,4 +130,6 @@ public abstract class BaseMainFragment extends BaseFragment {
     public String customTitle() {
         return null;
     }
+
+
 }
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 aef267e58..3d89b1767 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
@@ -1,25 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.UserSubscribedEvent;
-import com.habitrpg.android.habitica.helpers.PurchaseTypes;
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
-import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView;
-import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.solovyev.android.checkout.ActivityCheckout;
-import org.solovyev.android.checkout.BillingRequests;
-import org.solovyev.android.checkout.Inventory;
-import org.solovyev.android.checkout.ProductTypes;
-import org.solovyev.android.checkout.RequestListener;
-import org.solovyev.android.checkout.Sku;
-
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -31,6 +11,26 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.events.UserSubscribedEvent;
+import com.habitrpg.android.habitica.helpers.PurchaseTypes;
+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 org.greenrobot.eventbus.Subscribe;
+import org.solovyev.android.checkout.ActivityCheckout;
+import org.solovyev.android.checkout.BillingRequests;
+import org.solovyev.android.checkout.Inventory;
+import org.solovyev.android.checkout.ProductTypes;
+import org.solovyev.android.checkout.RequestListener;
+import org.solovyev.android.checkout.Sku;
+
 import java.util.List;
 
 import javax.inject.Inject;
@@ -44,7 +44,7 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     CrashlyticsProxy crashlyticsProxy;
 
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
 
     @BindView(R.id.subscribe_listitem1_box)
     View subscribeListitem1Box;
@@ -125,8 +125,7 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
 
     @Subscribe
     public void fetchUser(@Nullable UserSubscribedEvent event) {
-        apiHelper.apiService.getUser().compose(apiHelper.configureApiCallObserver())
-                .subscribe(this::setUser, throwable -> {
+        apiClient.getUser().subscribe(this::setUser, throwable -> {
                 });
     }
 
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 609961e8e..1dcd18a25 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
@@ -9,6 +9,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -60,14 +61,10 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (this.apiHelper != null) {
-            this.apiHelper.apiService.getContent(apiHelper.languageCode)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(contentResult -> {
-                    }, throwable -> {
-                    });
+        if (apiClient != null) {
+            apiClient.getContent()
+                    .subscribe(contentResult -> {}, throwable -> {});
         }
-
     }
 
     @Override
@@ -108,7 +105,7 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
         component.inject(this);
     }
 
-    private void displayCustomizationFragment(String type, String category) {
+    private void displayCustomizationFragment(String type, @Nullable String category) {
         AvatarCustomizationFragment fragment = new AvatarCustomizationFragment();
         fragment.type = type;
         fragment.category = category;
@@ -139,11 +136,10 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
             newSize = "broad";
         }
 
-        if (!this.user.getPreferences().getSize().equals(newSize)) {
+        if (this.user != null && !this.user.getPreferences().getSize().equals(newSize)) {
             Map<String, Object> updateData = new HashMap<>();
             updateData.put("preferences.size", newSize);
-            apiHelper.apiService.updateUser(updateData)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.updateUser(updateData)
                     .subscribe(new MergeUserCallback(activity, user), throwable -> {
                     });
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
index 37112e833..7dcd075ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
@@ -114,8 +114,8 @@ public class ItemsFragment extends BaseMainFragment {
 
     @Subscribe
     public void onEvent(InvitePartyToQuestCommand event) {
-        this.apiHelper.apiService.inviteToQuest("party", event.questKey)
-                .compose(apiHelper.configureApiCallObserver())
+        this.apiClient.inviteToQuest("party", event.questKey)
+
                 .subscribe(group -> {
                     OpenMenuItemCommand event1 = new OpenMenuItemCommand();
                     event1.identifier = MainDrawerBuilder.SIDEBAR_PARTY;
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 2b7fb61df..9fe33024e 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.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.UpdateGoldGemsPurchasedevent;
@@ -42,7 +42,7 @@ public class ShopFragment extends BaseFragment {
     public HabitRPGUser user;
     public Shop shop;
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
     private View view;
 
     @Nullable
@@ -103,8 +103,7 @@ public class ShopFragment extends BaseFragment {
                 shopUrl = "seasonal";
                 break;
         }
-        this.apiHelper.apiService.fetchShopInventory(shopUrl)
-                .compose(this.apiHelper.configureApiCallObserver())
+        this.apiClient.fetchShopInventory(shopUrl)
                 .map(shop1 -> {
                     if (shop1.identifier.equals(Shop.MARKET)) {
                         if (user.getPurchased().getPlan().isActive()) {
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 a5995c6bb..733fd88c1 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,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
@@ -41,7 +41,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
         SharedPreferences.OnSharedPreferenceChangeListener {
 
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     @Inject
     public SoundManager soundManager;
     public MainActivity activity;
@@ -184,8 +184,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             int hour = Integer.parseInt(pieces[0]);
             Map<String, Object> updateObject = new HashMap<>();
             updateObject.put("dayStart", hour);
-            apiHelper.apiService.changeCustomDayStart(updateObject)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.changeCustomDayStart(updateObject)
                     .subscribe(user -> {
                     }, throwable -> {
                     });
@@ -204,16 +203,15 @@ public class PreferencesFragment extends BasePreferencesFragment implements
 
             Map<String, Object> updateData = new HashMap<>();
             updateData.put("preferences.language", languageHelper.getLanguageCode());
-            apiHelper.apiService.updateUser(updateData)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.updateUser(updateData)
+
                     .subscribe(new MergeUserCallback(activity, user), throwable -> {
                     });
 
             Preferences preferences = user.getPreferences();
             preferences.setLanguage(languageHelper.getLanguageCode());
-            apiHelper.languageCode = preferences.getLanguage();
-            apiHelper.apiService.getContent(apiHelper.languageCode)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.setLanguageCode(preferences.getLanguage());
+            apiClient.getContent()
                     .subscribe(contentResult -> {
                     }, throwable -> {
                     });
@@ -235,8 +233,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             Map<String, Object> updateData = new HashMap<>();
             updateData.put("preferences.sound", newAudioTheme);
             MergeUserCallback mergeUserCallback = new MergeUserCallback(activity, user);
-            apiHelper.apiService.updateUser(updateData)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.updateUser(updateData)
                     .subscribe(mergeUserCallback, throwable -> {
                     });
 
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 7559b41a4..003f8b5ef 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,48 +1,82 @@
 package com.habitrpg.android.habitica.ui.fragments.setup;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.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.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
-import com.magicmicky.habitrpgwrapper.lib.models.Customization;
+import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
+import com.magicmicky.habitrpgwrapper.lib.models.SetupCustomization;
 
+import org.greenrobot.eventbus.EventBus;
+
+import android.content.res.Resources;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+import android.support.design.widget.TabLayout;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
 import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 public class AvatarSetupFragment extends BaseFragment {
 
     public SetupActivity activity;
     public int width;
     View view;
-    @BindView(R.id.recyclerView)
-    RecyclerView recyclerView;
     @BindView(R.id.avatarView)
     AvatarView avatarView;
+    @BindView(R.id.customization_list)
+    RecyclerView customizationList;
+    @BindView(R.id.subcategory_tabs)
+    TabLayout subCategoryTabs;
+    @BindView(R.id.body_button)
+    AvatarCategoryView bodyButton;
+    @BindView(R.id.skin_button)
+    AvatarCategoryView skinButton;
+    @BindView(R.id.hair_button)
+    AvatarCategoryView hairButton;
+    @BindView(R.id.extras_button)
+    AvatarCategoryView extrasButton;
+    @BindView(R.id.caret_view)
+    ImageView caretView;
+
     CustomizationSetupAdapter adapter;
-    GridLayoutManager layoutManager;
+    LinearLayoutManager layoutManager;
     @Inject
-    APIHelper apiHelper;
+    SetupCustomizationRepository customizationRepository;
+    @Inject
+    ApiClient apiClient;
+
     private HabitRPGUser user;
+    private List<String> subcategories;
+    private AvatarCategoryView activeButton;
+    private String activeCategory;
+    private String activeSubCategory;
+    private Random random;
 
     @Nullable
     @Override
@@ -60,22 +94,36 @@ public class AvatarSetupFragment extends BaseFragment {
             this.adapter.userSize = "slim";
         }
         this.adapter.user = this.user;
-        this.layoutManager = new GridLayoutManager(activity, 2);
-        this.layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+        this.layoutManager = new LinearLayoutManager(activity);
+        this.layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+        this.customizationList.setLayoutManager(this.layoutManager);
+
+        this.customizationList.setAdapter(this.adapter);
+
+        this.subCategoryTabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
-            public int getSpanSize(int position) {
-                if (adapter.getItemViewType(position) == 0) {
-                    return layoutManager.getSpanCount();
-                } else {
-                    return 1;
+            public void onTabSelected(TabLayout.Tab tab) {
+                int position = tab.getPosition();
+                if (subcategories != null && position < subcategories.size()) {
+                    activeSubCategory = subcategories.get(position);
                 }
+                loadCustomizations();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
             }
         });
-        this.recyclerView.setLayoutManager(this.layoutManager);
-        this.recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
 
-        this.recyclerView.setAdapter(this.adapter);
-        this.loadCustomizations();
+        this.selectedBodyCategory();
+
+        this.random = new Random();
 
         if (this.user != null) {
             this.updateAvatar();
@@ -88,42 +136,12 @@ public class AvatarSetupFragment extends BaseFragment {
         component.inject(this);
     }
 
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        setGridSpanCount(width);
-    }
-
     private void loadCustomizations() {
-        if (this.user == null || this.adapter == null) {
+        if (this.user == null || this.adapter == null || this.activeCategory == null) {
             return;
         }
 
-        Where<Customization> select = new Select()
-                .from(Customization.class)
-                .where(Condition.CombinedCondition.begin(Condition.column("price").eq(0))
-                        .or(Condition.column("price").isNull())
-                );
-
-        List<Customization> customizations = select.queryList();
-        if (customizations.size() == 0) {
-            this.apiHelper.getContent().compose(this.apiHelper.configureApiCallObserver())
-                    .subscribe(contentResult -> {
-                        this.loadCustomizations();
-                    }, throwable -> {
-                    });
-        }
-        this.adapter.setCustomizationList(customizations);
-    }
-
-    private void setGridSpanCount(int width) {
-        float itemWidth = getContext().getResources().getDimension(R.dimen.customization_width);
-
-        int spanCount = (int) (width / itemWidth);
-        if (spanCount == 0) {
-            spanCount = 1;
-        }
-        this.layoutManager.setSpanCount(spanCount);
+        this.adapter.setCustomizationList(customizationRepository.getCustomizations(activeCategory, activeSubCategory, user));
     }
 
     public void setUser(HabitRPGUser user) {
@@ -141,4 +159,101 @@ public class AvatarSetupFragment extends BaseFragment {
         avatarView.setUser(user);
     }
 
+
+    @OnClick(R.id.body_button)
+    protected void selectedBodyCategory() {
+        activateButton(bodyButton);
+        this.activeCategory = "body";
+        this.subCategoryTabs.removeAllTabs();
+        this.subcategories = Arrays.asList("size", "shirt");
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_size));
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_shirt));
+        loadCustomizations();
+    }
+
+    @OnClick(R.id.skin_button)
+    protected void selectedSkinCategory() {
+        activateButton(skinButton);
+        this.activeCategory = "skin";
+        this.subCategoryTabs.removeAllTabs();
+        this.subcategories = Collections.singletonList("color");
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_skin_color));
+        loadCustomizations();
+    }
+
+    @OnClick(R.id.hair_button)
+    protected void selectedHairCategory() {
+        activateButton(hairButton);
+        this.activeCategory = "hair";
+        this.subCategoryTabs.removeAllTabs();
+        this.subcategories = Arrays.asList("color", "bangs", "ponytail");
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_color));
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_bangs));
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_ponytail));
+        loadCustomizations();
+    }
+
+    @OnClick(R.id.extras_button)
+    protected void selectedExtrasCategory() {
+        activateButton(extrasButton);
+        this.activeCategory = "extras";
+        this.subCategoryTabs.removeAllTabs();
+        this.subcategories = Arrays.asList("glasses", "flower", "wheelchair");
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_glasses));
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_flower));
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_wheelchair));
+        loadCustomizations();
+    }
+
+    @OnClick(R.id.randomize_button)
+    protected  void randomizeCharacter() {
+        if (user == null) {
+            return;
+        }
+        UpdateUserCommand command = new UpdateUserCommand();
+        Map<String, Object> updateData = new HashMap<>();
+        updateData.put("preferences.size", chooseRandomKey(customizationRepository.getCustomizations("body", "size", user), false));
+        updateData.put("preferences.shirt", chooseRandomKey(customizationRepository.getCustomizations("body", "shirt", user), false));
+        updateData.put("preferences.skin", chooseRandomKey(customizationRepository.getCustomizations("skin", "color", user), false));
+        updateData.put("preferences.hair.color", chooseRandomKey(customizationRepository.getCustomizations("hair", "color", user), false));
+        updateData.put("preferences.hair.base", chooseRandomKey(customizationRepository.getCustomizations("hair", "ponytail", user), false));
+        updateData.put("preferences.hair.bangs", chooseRandomKey(customizationRepository.getCustomizations("hair", "bangs", user), false));
+        updateData.put("preferences.hair.flower", chooseRandomKey(customizationRepository.getCustomizations("extras", "flower", user), true));
+        updateData.put("preferences.chair", chooseRandomKey(customizationRepository.getCustomizations("extras", "wheelchair", user), true));
+        command.updateData = updateData;
+
+        EventBus.getDefault().post(command);
+    }
+
+    private String chooseRandomKey(List<SetupCustomization> customizations, boolean weighFirstOption) {
+        if (customizations.size() == 0) {
+            return null;
+        }
+        if (weighFirstOption) {
+            if (random.nextInt(10) > 3) {
+                return customizations.get(0).key;
+            }
+        }
+        return customizations.get(random.nextInt(customizations.size())).key;
+    }
+
+    private void activateButton(AvatarCategoryView button) {
+        if (this.activeButton != null) {
+            this.activeButton.setActive(false);
+        }
+        this.activeButton = button;
+        this.activeButton.setActive(true);
+        int[] location = new int[2];
+        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams)this.caretView.getLayoutParams();
+        this.activeButton.getLocationOnScreen(location);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            Resources r = getResources();
+            int px = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40, r.getDisplayMetrics());
+            params.setMarginStart(location[0]+px);
+            this.caretView.setLayoutParams(params);
+        } else {
+            caretView.setVisibility(View.GONE);
+        }
+
+    }
 }
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 62e9ad0fd..f7c4ba71b 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
@@ -1,21 +1,23 @@
 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.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.tasks.Days;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 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.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 java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -31,9 +33,12 @@ public class TaskSetupFragment extends BaseFragment {
     View view;
     @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
+    @BindView(R.id.avatarView)
+    AvatarView avatarView;
     TaskSetupAdapter adapter;
     private String[][] taskGroups;
     private Object[][] tasks;
+    private HabitRPGUser user;
 
     @Nullable
     @Override
@@ -47,11 +52,27 @@ public class TaskSetupFragment extends BaseFragment {
         unbinder = ButterKnife.bind(this, view);
         this.adapter = new TaskSetupAdapter();
         this.adapter.setTaskList(this.taskGroups);
-        this.recyclerView.setLayoutManager(new LinearLayoutManager(activity));
+        this.recyclerView.setLayoutManager(new GridLayoutManager(activity, 2));
         this.recyclerView.setAdapter(this.adapter);
+
+        if (this.user != null) {
+            this.updateAvatar();
+        }
+
         return view;
     }
 
+    public void setUser(HabitRPGUser user) {
+        this.user = user;
+        if (avatarView != null) {
+            updateAvatar();
+        }
+    }
+
+    private void updateAvatar() {
+        avatarView.setUser(user);
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
@@ -66,6 +87,7 @@ public class TaskSetupFragment extends BaseFragment {
                 {getString(R.string.setup_group_teams), "teams"},
                 {getString(R.string.setup_group_chores), "chores"},
                 {getString(R.string.setup_group_creativity), "creativity"},
+                {getString(R.string.setuP_group_other), "other"}
         };
 
         this.tasks = new Object[][]{
@@ -110,7 +132,8 @@ public class TaskSetupFragment extends BaseFragment {
         }
         List<Task> tasks = new ArrayList<>();
         for (Object[] task : this.tasks) {
-            if (groups.contains((String) task[0])) {
+            String taskGroup = (String) task[0];
+            if (groups.contains(taskGroup)) {
                 Task taskObject;
                 if (task.length == 5) {
                     taskObject = this.makeTaskObject((String) task[1], (String) task[2], (Boolean) task[3], (Boolean) task[4]);
@@ -123,7 +146,7 @@ public class TaskSetupFragment extends BaseFragment {
         return tasks;
     }
 
-    private Task makeTaskObject(String type, String text, Boolean up, Boolean down) {
+    private Task makeTaskObject(String type, String text, @Nullable Boolean up, @Nullable Boolean down) {
         Task task = new Task();
         task.text = text;
         task.priority = 1.0f;
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 5855d8366..649b60ed4 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
@@ -37,6 +37,8 @@ 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;
@@ -179,8 +181,8 @@ public class SkillsFragment extends BaseMainFragment {
             message.append(" + ").append(round(event.gold, 2)).append(" GP");
         }
         UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL);
-        apiHelper.apiService.getUser()
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.getUser()
+
                 .subscribe(new MergeUserCallback(activity, user), throwable -> {
                 });
     }
@@ -210,13 +212,13 @@ public class SkillsFragment extends BaseMainFragment {
 
     private void useSkill(Skill skill, String taskId) {
         displayProgressDialog();
-        Observable<HabitResponse<SkillResponse>> observable;
+        Observable<SkillResponse> observable;
         if (taskId != null) {
-            observable = apiHelper.apiService.useSkill(skill.key, skill.target, taskId);
+            observable = apiClient.useSkill(skill.key, skill.target, taskId);
         } else {
-            observable = apiHelper.apiService.useSkill(skill.key, skill.target);
+            observable = apiClient.useSkill(skill.key, skill.target);
         }
-        observable.compose(apiHelper.configureApiCallObserver())
+        observable
                 .subscribe(new SkillCallback(activity, user, skill), throwable -> {
                     removeProgressDialog();
                 });
@@ -235,9 +237,7 @@ public class SkillsFragment extends BaseMainFragment {
         }
     }
 
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_skills);
-    }
+	@Override
+	public String customTitle() {	return getString(R.string.sidebar_skills);	}
 
 }
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 6f624cae6..0a6baab87 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,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.social;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
@@ -52,7 +52,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
     public String seenGroupId;
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     public boolean isTavern;
     @BindView(R.id.chat_list)
     RecyclerView mRecyclerView;
@@ -137,7 +137,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     public void onRefresh() {
         swipeRefreshLayout.setRefreshing(true);
 
-        apiHelper.apiService.listGroupChat(groupId).compose(apiHelper.configureApiCallObserver())
+        apiClient.listGroupChat(groupId)
                 .subscribe(this, throwable -> {
                 });
     }
@@ -155,8 +155,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
             gotNewMessages = false;
 
-            apiHelper.apiService.seenMessages(seenGroupId)
-                    .compose(apiHelper.configureApiCallObserver())
+            apiClient.seenMessages(seenGroupId)
                     .subscribe(s -> {
                     }, throwable -> {
                     });
@@ -177,8 +176,8 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(R.string.chat_flag_confirmation)
                 .setPositiveButton(R.string.flag_confirm, (dialog, id) -> {
-                    apiHelper.apiService.flagMessage(cmd.groupId, cmd.chatMessage.id)
-                            .compose(apiHelper.configureApiCallObserver())
+                    apiClient.flagMessage(cmd.groupId, cmd.chatMessage.id)
+
                             .subscribe(aVoid -> {
                                 MainActivity activity = (MainActivity) getActivity();
                                 UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), "Flagged message by " + cmd.chatMessage.user, UiUtils.SnackbarDisplayType.NORMAL);
@@ -192,7 +191,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
     @Subscribe
     public void onEvent(final ToggleLikeMessageCommand cmd) {
-        apiHelper.apiService.likeMessage(cmd.groupId, cmd.chatMessage.id).compose(apiHelper.configureApiCallObserver())
+        apiClient.likeMessage(cmd.groupId, cmd.chatMessage.id)
                 .subscribe(voids -> {
                 }, throwable -> {
                 });
@@ -200,8 +199,8 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
     @Subscribe
     public void onEvent(final DeleteChatMessageCommand cmd) {
-        apiHelper.apiService.deleteMessage(cmd.groupId, cmd.chatMessage.id)
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.deleteMessage(cmd.groupId, cmd.chatMessage.id)
+
                 .subscribe(aVoid -> {
                     if (currentChatMessages != null) {
                         currentChatMessages.remove(cmd.chatMessage);
@@ -216,8 +215,8 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     public void onEvent(SendNewGroupMessageCommand cmd) {
         HashMap<String, String> messageObject = new HashMap<>();
         messageObject.put("message", cmd.Message);
-        apiHelper.apiService.postGroupChat(cmd.TargetGroupId, messageObject)
-                .compose(apiHelper.configureApiCallObserver())
+        apiClient.postGroupChat(cmd.TargetGroupId, messageObject)
+
                 .subscribe(postChatMessageResult -> {
                     if (currentChatMessages != null) {
                         currentChatMessages.add(0, postChatMessageResult.message);
@@ -233,7 +232,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     // If the ChatList is Tavern, we're able to toggle the sleep-mode
     @Subscribe
     public void onEvent(ToggleInnCommand event) {
-        apiHelper.apiService.sleep().compose(apiHelper.configureApiCallObserver())
+        apiClient.sleep()
                 .subscribe(aVoid -> {
                     ToggledInnStateEvent innState = new ToggledInnStateEvent();
                     innState.Inn = !user.getPreferences().getSleep();
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 8ce3ea3ee..c5b82b7d0 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
@@ -1,17 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.social;
 
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.databinding.FragmentGroupInfoBinding;
-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.models.Group;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.databinding.DataBindingUtil;
@@ -27,6 +15,18 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.databinding.FragmentGroupInfoBinding;
+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 javax.inject.Inject;
 
 import butterknife.BindView;
@@ -39,7 +39,7 @@ public class GroupInformationFragment extends BaseFragment {
     FragmentGroupInfoBinding viewBinding;
 
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
 
     @BindView(R.id.questMemberView)
     LinearLayout questMemberView;
@@ -56,7 +56,9 @@ public class GroupInformationFragment extends BaseFragment {
     CardView qrWrapper;
 
     private View view;
+    @Nullable
     private Group group;
+    @Nullable
     private HabitRPGUser user;
     private QuestContent quest;
     private ValueBarBinding bossHpBar;
@@ -68,7 +70,7 @@ public class GroupInformationFragment extends BaseFragment {
 
     }
 
-    public static GroupInformationFragment newInstance(Group group, HabitRPGUser user) {
+    public static GroupInformationFragment newInstance(@Nullable Group group, HabitRPGUser user) {
         Bundle args = new Bundle();
 
         GroupInformationFragment fragment = new GroupInformationFragment();
@@ -125,7 +127,11 @@ public class GroupInformationFragment extends BaseFragment {
         super.onViewCreated(view, savedInstanceState);
     }
 
-    public void setGroup(Group group) {
+    public void setGroup(@Nullable Group group) {
+        if (group == null) {
+            this.group = null;
+            return;
+        }
         if (viewBinding != null) {
             viewBinding.setGroup(group);
         }
@@ -141,7 +147,10 @@ public class GroupInformationFragment extends BaseFragment {
         }
     }
 
-    public void setQuestContent(QuestContent quest) {
+    public void setQuestContent(@Nullable QuestContent quest) {
+        if (quest == null) {
+            return;
+        }
         if (viewBinding != null) {
             viewBinding.setQuest(quest);
         }
@@ -151,7 +160,7 @@ public class GroupInformationFragment extends BaseFragment {
         this.quest = quest;
     }
 
-    private void updateQuestProgress(Group group, QuestContent quest) {
+    private void updateQuestProgress(@Nullable Group group, QuestContent quest) {
         if (group == null || quest == null) {
             return;
         }
@@ -215,29 +224,35 @@ public class GroupInformationFragment extends BaseFragment {
 
     @OnClick(R.id.btnQuestAccept)
     public void onQuestAccept() {
-        apiHelper.apiService.acceptQuest(group.id)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(aVoid -> {
-                    user.getParty().getQuest().RSVPNeeded = false;
-                    group.quest.members.put(user.getId(), true);
-                    setGroup(group);
-                    viewBinding.setUser(user);
-                }, throwable -> {
-                });
+        if (group != null) {
+            apiClient.acceptQuest(group.id)
+                    .subscribe(aVoid -> {
+                        if (user != null) {
+                            user.getParty().getQuest().RSVPNeeded = false;
+                            group.quest.members.put(user.getId(), true);
+                        }
+                        setGroup(group);
+                        viewBinding.setUser(user);
+                    }, throwable -> {
+                    });
+        }
     }
 
 
     @OnClick(R.id.btnQuestReject)
     public void onQuestReject() {
-        apiHelper.apiService.rejectQuest(group.id)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(aVoid -> {
-                    user.getParty().getQuest().RSVPNeeded = false;
-                    group.quest.members.put(user.getId(), false);
-                    setGroup(group);
-                    viewBinding.setUser(user);
-                }, throwable -> {
-                });
+        if (group != null) {
+            apiClient.rejectQuest(group.id)
+                    .subscribe(aVoid -> {
+                        if (user != null) {
+                            user.getParty().getQuest().RSVPNeeded = false;
+                            group.quest.members.put(user.getId(), false);
+                        }
+                        setGroup(group);
+                        viewBinding.setUser(user);
+                    }, throwable -> {
+                    });
+        }
     }
 
 
@@ -246,13 +261,16 @@ public class GroupInformationFragment extends BaseFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
                 .setMessage("Are you sure you want to leave the active quest? All your quest progress will be lost.")
                 .setPositiveButton("Yes", (dialog, which) -> {
-                    apiHelper.apiService.leaveQuest(group.id)
-                            .compose(apiHelper.configureApiCallObserver())
-                            .subscribe(aVoid -> {
-                                group.quest.members.remove(user.getId());
-                                setGroup(group);
-                            }, throwable -> {
-                            });
+                    if (group != null) {
+                        apiClient.leaveQuest(group.id)
+                                .subscribe(aVoid -> {
+                                    if (user != null) {
+                                        group.quest.members.remove(user.getId());
+                                    }
+                                    setGroup(group);
+                                }, throwable -> {
+                                });
+                    }
                 }).setNegativeButton("No", (dialog, which) -> {
 
                 });
@@ -265,13 +283,14 @@ public class GroupInformationFragment extends BaseFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
                 .setMessage(R.string.quest_begin_message)
                 .setPositiveButton(R.string.yes, (dialog, which) -> {
-                    apiHelper.apiService.forceStartQuest(group.id, group)
-                            .compose(apiHelper.configureApiCallObserver())
-                            .subscribe(quest -> {
-                                group.quest = quest;
-                                setGroup(group);
-                            }, throwable -> {
-                            });
+                    if (group != null) {
+                        apiClient.forceStartQuest(group.id, group)
+                                .subscribe(quest -> {
+                                    group.quest = quest;
+                                    setGroup(group);
+                                }, throwable -> {
+                                });
+                    }
                 }).setNegativeButton(R.string.no, (dialog, which) -> {
 
                 });
@@ -283,13 +302,14 @@ public class GroupInformationFragment extends BaseFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
                 .setMessage(R.string.quest_cancel_message)
                 .setPositiveButton(R.string.yes, (dialog, which) -> {
-                    apiHelper.apiService.cancelQuest(group.id)
-                            .compose(apiHelper.configureApiCallObserver())
-                            .subscribe(aVoid -> {
-                                setGroup(group);
-                                setQuestContent(null);
-                            }, throwable -> {
-                            });
+                    if (group != null) {
+                        apiClient.cancelQuest(group.id)
+                                .subscribe(aVoid -> {
+                                    setGroup(group);
+                                    setQuestContent(null);
+                                }, throwable -> {
+                                });
+                    }
                 }).setNegativeButton(R.string.no, (dialog, which) -> {
 
                 });
@@ -301,14 +321,15 @@ public class GroupInformationFragment extends BaseFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
                 .setMessage("Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.")
                 .setPositiveButton("Yes", (dialog, which) -> {
-                    apiHelper.apiService.abortQuest(group.id)
-                            .compose(apiHelper.configureApiCallObserver())
-                            .subscribe(quest -> {
-                                group.quest = quest;
-                                setGroup(group);
-                                setQuestContent(null);
-                            }, throwable -> {
-                            });
+                    if (group != null) {
+                        apiClient.abortQuest(group.id)
+                                .subscribe(quest -> {
+                                    group.quest = quest;
+                                    setGroup(group);
+                                    setQuestContent(null);
+                                }, throwable -> {
+                                });
+                    }
                 }).setNegativeButton("No", (dialog, which) -> {
 
                 });
@@ -317,22 +338,21 @@ public class GroupInformationFragment extends BaseFragment {
 
     @OnClick(R.id.btnPartyInviteAccept)
     public void onPartyInviteAccepted() {
-        apiHelper.apiService.joinGroup(user.getInvitations().getParty().getId())
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(group -> {
-                    setGroup(group);
-                    viewBinding.setInvitation(null);
-                }, throwable -> {
-                });
+        if (user != null) {
+            apiClient.joinGroup(user.getInvitations().getParty().getId())
+                    .subscribe(group -> {
+                        setGroup(group);
+                        viewBinding.setInvitation(null);
+                    }, throwable -> {
+                    });
+        }
     }
 
     @OnClick(R.id.btnPartyInviteReject)
     public void onPartyInviteRejected() {
-        apiHelper.apiService.rejectGroupInvite(user.getInvitations().getParty().getId())
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(aVoid -> {
-                    viewBinding.setInvitation(null);
-                }, throwable -> {
-                });
+        if (user != null) {
+            apiClient.rejectGroupInvite(user.getInvitations().getParty().getId())
+                    .subscribe(aVoid -> viewBinding.setInvitation(null), throwable -> {});
+        }
     }
 }
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 0c3f714c2..d5c1b284a 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
@@ -34,12 +34,10 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
         if (this.guildInformationFragment != null) {
             this.guildInformationFragment.setGroup(guild);
         }
-        if (this.guild.chat == null) {
-            if (this.apiHelper != null) {
-                apiHelper.apiService.getGroup(this.guild.id).compose(apiHelper.configureApiCallObserver())
-                        .subscribe(this, throwable -> {
-                        });
-            }
+        if (this.guild.chat == null && this.apiClient != null) {
+            apiClient.getGroup(this.guild.id)
+                    .subscribe(this, throwable -> {
+                    });
         }
     }
 
@@ -67,8 +65,8 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (this.apiHelper != null && this.guild != null) {
-            apiHelper.apiService.getGroup(this.guild.id).compose(apiHelper.configureApiCallObserver())
+        if (this.apiClient != null && this.guild != null) {
+            apiClient.getGroup(this.guild.id)
                     .subscribe(this, throwable -> {
                     });
         }
@@ -94,16 +92,14 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
 
         switch (id) {
             case R.id.menu_guild_join:
-                this.apiHelper.apiService.joinGroup(this.guild.id).compose(apiHelper.configureApiCallObserver())
+                this.apiClient.joinGroup(this.guild.id)
                         .subscribe(this, throwable -> {
                         });
                 this.isMember = true;
                 return true;
             case R.id.menu_guild_leave:
-                this.apiHelper.apiService.leaveGroup(this.guild.id).compose(apiHelper.configureApiCallObserver())
-                        .subscribe(aVoid -> {
-                            this.activity.supportInvalidateOptionsMenu();
-                        }, throwable -> {
+                this.apiClient.leaveGroup(this.guild.id)
+                        .subscribe(aVoid -> this.activity.supportInvalidateOptionsMenu(), throwable -> {
                         });
                 this.isMember = false;
                 return true;
@@ -224,8 +220,8 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
                         needsSaving = true;
                     }
                     if (needsSaving) {
-                        this.apiHelper.apiService.updateGroup(this.guild.id, this.guild)
-                                .compose(apiHelper.configureApiCallObserver())
+                        this.apiClient.updateGroup(this.guild.id, this.guild)
+
                                 .subscribe(aVoid -> {
                                 }, throwable -> {
                                 });
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 25aea7430..42273c28a 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
@@ -68,9 +68,9 @@ public class GuildsOverviewFragment extends BaseMainFragment implements View.OnC
     }
 
     private void fetchGuilds() {
-        if (this.apiHelper != null && this.apiHelper.apiService != null) {
-            this.apiHelper.apiService.listGroups("guilds")
-                    .compose(apiHelper.configureApiCallObserver())
+        if (this.apiClient != null && this.apiClient != null) {
+            this.apiClient.listGroups("guilds")
+
                     .subscribe(groups -> {
                         GuildsOverviewFragment.this.guilds = groups;
                         GuildsOverviewFragment.this.setGuildsOnListView();
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 bce66c1bf..99776caaa 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
@@ -52,8 +52,8 @@ public class InboxFragment extends BaseMainFragment
                              Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        this.apiHelper.apiService.markPrivateMessagesRead()
-                .compose(apiHelper.configureApiCallObserver())
+        this.apiClient.markPrivateMessagesRead()
+
                 .subscribe(aVoid -> {
                 }, throwable -> {
                 });
@@ -63,9 +63,11 @@ public class InboxFragment extends BaseMainFragment
 
         swipeRefreshLayout.setOnRefreshListener(this);
 
-        this.messages = this.user.getInbox().getMessages();
-        if (this.messages != null) {
-            this.setInboxMessages();
+        if (this.user != null) {
+            this.messages = this.user.getInbox().getMessages();
+            if (this.messages != null) {
+                this.setInboxMessages();
+            }
         }
 
         return v;
@@ -121,8 +123,7 @@ public class InboxFragment extends BaseMainFragment
     @Override
     public void onRefresh() {
         swipeRefreshLayout.setRefreshing(true);
-        this.apiHelper.retrieveUser(true)
-                .compose(apiHelper.configureApiCallObserver())
+        this.apiClient.retrieveUser(true)
                 .subscribe(new HabitRPGUserCallback(this), throwable -> {
                 });
     }
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 2bd1498bf..a60f4d2b1 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
@@ -76,13 +76,12 @@ public class InboxMessageListFragment extends BaseMainFragment
         component.inject(this);
     }
 
-    private void refreshUserInbox() {
-        this.swipeRefreshLayout.setRefreshing(true);
-        this.apiHelper.retrieveUser(true)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                });
-    }
+        private void refreshUserInbox () {
+            this.swipeRefreshLayout.setRefreshing(true);
+            this.apiClient.retrieveUser(true)
+
+                    .subscribe(new HabitRPGUserCallback(this), throwable -> {});
+        }
 
     @Override
     public void onRefresh() {
@@ -124,12 +123,12 @@ public class InboxMessageListFragment extends BaseMainFragment
         messageObject.put("message", cmd.Message);
         messageObject.put("toUserId", cmd.UserToSendTo);
 
-        apiHelper.apiService.postPrivateMessage(messageObject)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(postChatMessageResult -> {
-                    this.refreshUserInbox();
-                }, throwable -> {
-                });
+            apiClient.postPrivateMessage(messageObject)
+
+                    .subscribe(postChatMessageResult -> {
+                        this.refreshUserInbox();
+                    }, throwable -> {
+                    });
 
         UiUtils.dismissKeyboard(HabiticaApplication.currentActivity);
     }
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 f83623777..032e795a7 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
@@ -50,7 +50,7 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
             recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
             viewAdapter = new PublicGuildsRecyclerViewAdapter();
             viewAdapter.setMemberGuildIDs(this.memberGuildIDs);
-            viewAdapter.apiHelper = this.apiHelper;
+            viewAdapter.apiClient = this.apiClient;
             recyclerView.setAdapter(viewAdapter);
             if (this.guilds != null) {
                 this.viewAdapter.setPublicGuildList(this.guilds);
@@ -71,9 +71,9 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
     }
 
     private void fetchGuilds() {
-        if (this.apiHelper != null) {
-            this.apiHelper.apiService.listGroups("publicGuilds")
-                    .compose(apiHelper.configureApiCallObserver())
+        if (this.apiClient != null) {
+            this.apiClient.listGroups("publicGuilds")
+
                     .subscribe(groups -> {
                         PublicGuildsFragment.this.guilds = groups;
                         if (PublicGuildsFragment.this.viewAdapter != null) {
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 e201f32ce..0c25b4025 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
@@ -53,9 +53,8 @@ public class TavernFragment extends BaseMainFragment {
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (this.apiHelper != null) {
-            apiHelper.apiService.getGroup("habitrpg")
-                    .compose(apiHelper.configureApiCallObserver())
+        if (this.apiClient != null) {
+            apiClient.getGroup("habitrpg")
                     .subscribe(group -> {
                         TavernFragment.this.tavern = group;
                         if (group.quest != null && group.quest.key != null && TavernFragment.this.isAdded()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
index a7bf33945..1c536ddd2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
@@ -1,12 +1,23 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
-import com.habitrpg.android.habitica.APIHelper;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 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;
@@ -17,16 +28,6 @@ import net.pherth.android.emoji_library.EmojiTextView;
 
 import org.greenrobot.eventbus.EventBus;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
 import java.util.ArrayList;
 import java.util.Map;
 
@@ -68,7 +69,7 @@ public class ChallegeDetailDialogHolder {
     LinearLayout task_group_layout;
 
     private AlertDialog dialog;
-    private APIHelper apiHelper;
+    private ApiClient apiClient;
     private HabitRPGUser user;
     private Challenge challenge;
     private Action1<Challenge> challengeJoinedAction;
@@ -76,12 +77,12 @@ public class ChallegeDetailDialogHolder {
     private Activity context;
 
 
-    protected ChallegeDetailDialogHolder(View view, Activity context) {
+    private ChallegeDetailDialogHolder(View view, Activity context) {
         this.context = context;
         ButterKnife.bind(this, view);
     }
 
-    public static void showDialog(Activity activity, APIHelper apiHelper, HabitRPGUser user, Challenge challenge,
+    public static void showDialog(Activity activity, ApiClient apiClient, @Nullable HabitRPGUser user, Challenge challenge,
                                   Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
         View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_detail, null);
 
@@ -90,13 +91,13 @@ public class ChallegeDetailDialogHolder {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity)
                 .setView(dialogLayout);
 
-        challegeDetailDialogHolder.bind(builder.show(), apiHelper, user, challenge, challengeJoinedAction, challengeLeftAction);
+        challegeDetailDialogHolder.bind(builder.show(), apiClient, user, challenge, challengeJoinedAction, challengeLeftAction);
     }
 
-    public void bind(AlertDialog dialog, APIHelper apiHelper, HabitRPGUser user, Challenge challenge,
+    public void bind(AlertDialog dialog, ApiClient apiClient, HabitRPGUser user, Challenge challenge,
                      Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
         this.dialog = dialog;
-        this.apiHelper = apiHelper;
+        this.apiClient = apiClient;
         this.user = user;
         this.challenge = challenge;
         this.challengeJoinedAction = challengeJoinedAction;
@@ -115,8 +116,7 @@ public class ChallegeDetailDialogHolder {
         gem_amount.setText(challenge.prize + "");
         member_count.setText(challenge.memberCount + "");
 
-        apiHelper.apiService.getChallengeTasks(challenge.id)
-                .compose(this.apiHelper.configureApiCallObserver())
+        apiClient.getChallengeTasks(challenge.id)
                 .subscribe(taskList -> {
                             ArrayList<Task> todos = new ArrayList<>();
                             ArrayList<Task> habits = new ArrayList<>();
@@ -301,8 +301,7 @@ public class ChallegeDetailDialogHolder {
 
     @OnClick(R.id.challenge_join_btn)
     public void joinChallenge() {
-        this.apiHelper.apiService.joinChallenge(challenge.id)
-                .compose(apiHelper.configureApiCallObserver())
+        this.apiClient.joinChallenge(challenge.id)
                 .subscribe(challenge -> {
                     challenge.user_id = this.user.getId();
                     challenge.async().save();
@@ -323,24 +322,20 @@ public class ChallegeDetailDialogHolder {
                 .setMessage(String.format(context.getString(R.string.challenge_leave_text), challenge.name))
                 .setPositiveButton(context.getString(R.string.yes), (dialog, which) ->
 
-                        showRemoveTasksDialog(keepTasks -> {
+                        showRemoveTasksDialog(keepTasks -> this.apiClient.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
+                                .subscribe(aVoid -> {
+                                    challenge.user_id = null;
+                                    challenge.async().save();
 
-                            this.apiHelper.apiService.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
-                                    .compose(apiHelper.configureApiCallObserver())
-                                    .subscribe(aVoid -> {
-                                        challenge.user_id = null;
-                                        challenge.async().save();
+                                    this.user.resetChallengeList();
 
-                                        this.user.resetChallengeList();
+                                    if (challengeLeftAction != null) {
+                                        challengeLeftAction.call(challenge);
+                                    }
 
-                                        if (challengeLeftAction != null) {
-                                            challengeLeftAction.call(challenge);
-                                        }
-
-                                        this.dialog.dismiss();
-                                    }, throwable -> {
-                                    });
-                        })).setNegativeButton(context.getString(R.string.no), (dialog, which) -> {
+                                    this.dialog.dismiss();
+                                }, throwable -> {
+                                }))).setNegativeButton(context.getString(R.string.no), (dialog, which) -> {
             dialog.dismiss();
         }).show();
     }
@@ -359,5 +354,4 @@ public class ChallegeDetailDialogHolder {
                     dialog.dismiss();
                 }).show();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeFilterDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeFilterDialogHolder.java
index fc8a9e523..c18cd208a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeFilterDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeFilterDialogHolder.java
@@ -8,9 +8,9 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
 
-import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengesFilterRecyclerViewAdapter;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
 import com.magicmicky.habitrpgwrapper.lib.models.Group;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
@@ -24,7 +24,7 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.functions.Action1;
 
-public class ChallegeFilterDialogHolder {
+class ChallegeFilterDialogHolder {
 
     @BindView(R.id.challenge_filter_recycler_view)
     RecyclerView groupRecyclerView;
@@ -45,7 +45,7 @@ public class ChallegeFilterDialogHolder {
     CheckBox checkboxNotOwned;
 
     private AlertDialog dialog;
-    private APIHelper apiHelper;
+    private ApiClient apiClient;
     private HabitRPGUser user;
     private List<Challenge> challengesViewed;
     private ChallengeFilterOptions currentFilter;
@@ -59,7 +59,7 @@ public class ChallegeFilterDialogHolder {
         ButterKnife.bind(this, view);
     }
 
-    public static void showDialog(Activity activity, APIHelper apiHelper, HabitRPGUser user, List<Challenge> challengesViewed,
+    public static void showDialog(Activity activity, ApiClient apiClient, HabitRPGUser user, List<Challenge> challengesViewed,
                                   ChallengeFilterOptions currentFilter,
                                   Action1<ChallengeFilterOptions> selectedGroupsCallback) {
         View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_filter, null);
@@ -69,14 +69,14 @@ public class ChallegeFilterDialogHolder {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity)
                 .setView(dialogLayout);
 
-        challegeFilterDialogHolder.bind(builder.show(), apiHelper, user, challengesViewed, currentFilter, selectedGroupsCallback);
+        challegeFilterDialogHolder.bind(builder.show(), apiClient, user, challengesViewed, currentFilter, selectedGroupsCallback);
     }
 
-    public void bind(AlertDialog dialog, APIHelper apiHelper, HabitRPGUser user, List<Challenge> challengesViewed,
+    public void bind(AlertDialog dialog, ApiClient apiClient, HabitRPGUser user, List<Challenge> challengesViewed,
                      ChallengeFilterOptions currentFilter,
                      Action1<ChallengeFilterOptions> selectedGroupsCallback) {
         this.dialog = dialog;
-        this.apiHelper = apiHelper;
+        this.apiClient = apiClient;
         this.user = user;
         this.challengesViewed = challengesViewed;
         this.currentFilter = currentFilter;
@@ -85,8 +85,8 @@ public class ChallegeFilterDialogHolder {
         fillChallengeGroups();
 
         if(currentFilter != null ){
-            checkboxOwned.setChecked(currentFilter.ShowOwned);
-            checkboxNotOwned.setChecked(currentFilter.NotOwned);
+            checkboxOwned.setChecked(currentFilter.showOwned);
+            checkboxNotOwned.setChecked(currentFilter.notOwned);
         }
     }
 
@@ -94,8 +94,8 @@ public class ChallegeFilterDialogHolder {
 
        this.groupRecyclerView.setLayoutManager(new LinearLayoutManager(context));
        adapter = new ChallengesFilterRecyclerViewAdapter(getGroups(challengesViewed));
-        if(currentFilter != null && currentFilter.ShowByGroups != null){
-            adapter.selectAll(currentFilter.ShowByGroups);
+        if(currentFilter != null && currentFilter.showByGroups != null){
+            adapter.selectAll(currentFilter.showByGroups);
         }
 
        this.groupRecyclerView.setAdapter(adapter);
@@ -120,9 +120,9 @@ public class ChallegeFilterDialogHolder {
     @OnClick(R.id.challenge_filter_button_done)
     public void doneClicked() {
         ChallengeFilterOptions options = new ChallengeFilterOptions();
-        options.ShowByGroups = this.adapter.getCheckedEntries();
-        options.ShowOwned = checkboxOwned.isChecked();
-        options.NotOwned = checkboxNotOwned.isChecked();
+        options.showByGroups = this.adapter.getCheckedEntries();
+        options.showOwned = checkboxOwned.isChecked();
+        options.notOwned = checkboxNotOwned.isChecked();
 
         selectedGroupsCallback.call(options);
         this.dialog.hide();
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 3163eb53e..3427d3ff9 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
@@ -5,7 +5,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.Group;
 import java.util.List;
 
 public class ChallengeFilterOptions {
-    public List<Group> ShowByGroups;
-    public boolean ShowOwned;
-    public boolean NotOwned;
+    public List<Group> showByGroups;
+    public boolean showOwned;
+    public boolean notOwned;
 }
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 ffe730e48..83152dc7b 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
@@ -1,20 +1,6 @@
 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.ui.activities.ChallengeDetailActivity;
-import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.magicmicky.habitrpgwrapper.lib.models.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;
-
-import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -24,6 +10,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+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.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.sql.language.Where;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -75,7 +71,7 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
         listObservable
                 .subscribe(challenges -> {
 
-                    List<Challenge> userChallenges = this.user.getChallengeList();
+                    List<Challenge> userChallenges = this.user != null ? this.user.getChallengeList() : new ArrayList<>();
 
                     HashSet<String> userChallengesHash = new HashSet<>();
 
@@ -128,13 +124,11 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
 
         challengeFilterLayout.setVisibility(withFilter?View.VISIBLE:View.GONE);
         challengeFilterLayout.setClickable(true);
-        challengeFilterLayout.setOnClickListener(view -> {
-            ChallegeFilterDialogHolder.showDialog(HabiticaApplication.currentActivity, this.apiHelper,
-                    HabiticaApplication.User, currentChallengesInView, lastFilterOptions, filterOptions -> {
-                        challengeAdapter.setFilterByGroups(filterOptions);
-                        this.lastFilterOptions = filterOptions;
-                    });
-        });
+        challengeFilterLayout.setOnClickListener(view -> ChallegeFilterDialogHolder.showDialog(HabiticaApplication.currentActivity, this.apiClient,
+                HabiticaApplication.User, currentChallengesInView, lastFilterOptions, filterOptions -> {
+                    challengeAdapter.setFilterByGroups(filterOptions);
+                    this.lastFilterOptions = filterOptions;
+                }));
 
         recyclerView.setLayoutManager(new LinearLayoutManager(this.activity));
         recyclerView.setAdapter(challengeAdapter);
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 4395bc985..116050a67 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
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.helpers.TagsHelper;
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
@@ -38,7 +38,7 @@ public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
     @Named("UserID")
     String userID;
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
 
     ObservableList<Task> 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 bc4712a49..97a1a225c 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
@@ -72,13 +72,10 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
     }
 
     private void subscribeGetChallenges() {
-        this.apiHelper.apiService.getUserChallenges()
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(challenges -> {
-                    getUserChallengesObservable.onNext(challenges);
-                }, e -> {
-                    getUserChallengesObservable.onError(e);
-                });
+        this.apiClient.getUserChallenges()
+
+                .subscribe(challenges -> getUserChallengesObservable.onNext(challenges),
+                        e -> getUserChallengesObservable.onError(e));
     }
 
     @Override
@@ -151,7 +148,7 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
     public void onEvent(ShowChallengeDetailDialogCommand cmd) {
         Challenge challenge = new Select().from(Challenge.class).where(Condition.column("id").is(cmd.challengeId)).querySingle();
 
-        ChallegeDetailDialogHolder.showDialog(HabiticaApplication.currentActivity, apiHelper, user, challenge, challenge1 -> {
+        ChallegeDetailDialogHolder.showDialog(HabiticaApplication.currentActivity, apiClient, user, challenge, challenge1 ->  {
             // challenge joined
             userChallengesFragment.addItem(challenge1);
             availableChallengesFragment.updateItem(challenge1);
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 0e27f8558..ae5c5fb4b 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
@@ -15,6 +15,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;
 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.ViewPager;
@@ -39,6 +40,7 @@ public class PartyFragment extends BaseMainFragment {
     public ViewPager viewPager;
     @Inject
     ContentCache contentCache;
+    @Nullable
     private Group group;
     private PartyMemberListFragment partyMemberListFragment;
     private GroupInformationFragment groupInformationFragment;
@@ -58,8 +60,7 @@ public class PartyFragment extends BaseMainFragment {
 
         // Get the full group data
         if (this.user != null && this.user.getParty() != null && this.user.getParty().id != null) {
-            apiHelper.apiService.getGroup("party")
-                    .compose(this.apiHelper.configureApiCallObserver())
+            apiClient.getGroup("party")
                     .subscribe(group -> {
                         if (group == null) {
                             return;
@@ -68,8 +69,8 @@ public class PartyFragment extends BaseMainFragment {
 
                         updateGroupUI();
 
-                        apiHelper.apiService.getGroupMembers(group.id, true)
-                                .compose(apiHelper.configureApiCallObserver())
+                        apiClient.getGroupMembers(group.id, true)
+
                                 .subscribe(members -> {
                                             PartyFragment.this.group.members = members;
                                             updateGroupUI();
@@ -109,7 +110,7 @@ public class PartyFragment extends BaseMainFragment {
             }
         }
 
-        if (partyMemberListFragment != null) {
+        if (partyMemberListFragment != null && group != null) {
             partyMemberListFragment.setMemberList(group.members);
         }
 
@@ -117,7 +118,7 @@ public class PartyFragment extends BaseMainFragment {
             groupInformationFragment.setGroup(group);
         }
 
-        if (chatListFragment != null) {
+        if (chatListFragment != null && group != null) {
             chatListFragment.seenGroupId = group.id;
         }
 
@@ -135,7 +136,7 @@ public class PartyFragment extends BaseMainFragment {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (this.group != null) {
+        if (this.group != null && this.user != null) {
             if (this.group.leaderID.equals(this.user.getId())) {
                 inflater.inflate(R.menu.menu_party_admin, menu);
             } else {
@@ -163,15 +164,14 @@ public class PartyFragment extends BaseMainFragment {
                 new AlertDialog.Builder(viewPager.getContext())
                         .setTitle(viewPager.getContext().getString(R.string.party_leave))
                         .setMessage(viewPager.getContext().getString(R.string.party_leave_confirmation))
-                        .setPositiveButton(viewPager.getContext().getString(R.string.yes), (dialog, which) ->  this.apiHelper.apiService.leaveGroup(this.group.id)
-                                .compose(apiHelper.configureApiCallObserver())
-                                .subscribe(group -> {
-                                    getActivity().getSupportFragmentManager().beginTransaction().remove(PartyFragment.this).commit();
-                                }, throwable -> {
-                            }))
-                        .setNegativeButton(viewPager.getContext().getString(R.string.no), (dialog, which) -> {
-                            dialog.dismiss();
+                        .setPositiveButton(viewPager.getContext().getString(R.string.yes), (dialog, which) ->  {
+                            if (this.group != null){
+                                this.apiClient.leaveGroup(this.group.id)
+                                        .subscribe(group -> getActivity().getSupportFragmentManager().beginTransaction().remove(PartyFragment.this).commit(), throwable -> {
+                                        });
+                            }
                         })
+                        .setNegativeButton(viewPager.getContext().getString(R.string.no), (dialog, which) -> dialog.dismiss())
                         .show();
                 return true;
         }
@@ -181,7 +181,7 @@ public class PartyFragment extends BaseMainFragment {
 
     private void displayEditForm() {
         Bundle bundle = new Bundle();
-        bundle.putString("groupID", this.group.id);
+        bundle.putString("groupID", this.group != null ? this.group.id : null);
         bundle.putString("name", this.group.name);
         bundle.putString("description", this.group.description);
         bundle.putString("leader", this.group.leaderID);
@@ -200,6 +200,9 @@ public class PartyFragment extends BaseMainFragment {
                 if (resultCode == Activity.RESULT_OK) {
                     boolean needsSaving = false;
                     Bundle bundle = data.getExtras();
+                    if (this.group == null) {
+                        break;
+                    }
                     if (this.group.name != null && !this.group.name.equals(bundle.getString("name"))) {
                         this.group.name = bundle.getString("name");
                         needsSaving = true;
@@ -217,8 +220,8 @@ public class PartyFragment extends BaseMainFragment {
                         needsSaving = true;
                     }
                     if (needsSaving) {
-                        this.apiHelper.apiService.updateGroup(this.group.id, this.group)
-                                .compose(apiHelper.configureApiCallObserver())
+                        this.apiClient.updateGroup(this.group.id, this.group)
+
                                 .subscribe(aVoid -> {
                                 }, throwable -> {
                                 });
@@ -230,7 +233,7 @@ public class PartyFragment extends BaseMainFragment {
             case (PartyInviteActivity.RESULT_SEND_INVITES): {
                 if (resultCode == Activity.RESULT_OK) {
                     Map<String, Object> inviteData = new HashMap<>();
-                    inviteData.put("inviter", this.user.getProfile().getName());
+                    inviteData.put("inviter", this.user != null ? this.user.getProfile().getName() : null);
                     if (data.getBooleanExtra(PartyInviteActivity.IS_EMAIL_KEY, false)) {
                         String[] emails = data.getStringArrayExtra(PartyInviteActivity.EMAILS_KEY);
                         List<HashMap<String, String>> invites = new ArrayList<>();
@@ -247,11 +250,13 @@ public class PartyFragment extends BaseMainFragment {
                         Collections.addAll(invites, userIDs);
                         inviteData.put("uuids", invites);
                     }
-                    this.apiHelper.apiService.inviteToGroup(this.group.id, inviteData)
-                            .compose(apiHelper.configureApiCallObserver())
-                            .subscribe(aVoid -> {
-                            }, throwable -> {
-                            });
+                    if (this.group != null) {
+                        this.apiClient.inviteToGroup(this.group.id, inviteData)
+
+                                .subscribe(aVoid -> {
+                                }, throwable -> {
+                                });
+                    }
                 }
             }
         }
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 e03321fb4..cdbd62b28 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
@@ -1,11 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.social.party;
 
-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 android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -15,6 +9,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+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 java.util.List;
 
 import butterknife.BindView;
@@ -31,7 +31,7 @@ public class PartyMemberListFragment extends BaseFragment {
     private PartyMemberRecyclerViewAdapter viewAdapter;
     private View view;
 
-    public void configure(Context ctx, List<HabitRPGUser> members) {
+    public void configure(Context ctx, @Nullable List<HabitRPGUser> members) {
         this.ctx = ctx;
         this.members = members;
 
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 893e2ffc0..5a4afb717 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,7 +1,18 @@
 package com.habitrpg.android.habitica.ui.fragments.tasks;
 
-import com.habitrpg.android.habitica.APIHelper;
+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.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.events.TaskCreatedEvent;
 import com.habitrpg.android.habitica.events.TaskRemovedEvent;
@@ -9,7 +20,8 @@ import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
 import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
 import com.habitrpg.android.habitica.events.commands.FilterTasksByTagsCommand;
 import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
-import com.habitrpg.android.habitica.helpers.TagsHelper;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
 import com.habitrpg.android.habitica.ui.adapter.tasks.HabitsRecyclerViewAdapter;
@@ -19,56 +31,59 @@ 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 org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
 /**
  * TaskRecyclerViewFragment
  * - Creates the View only once
  * - Adds FAB Icon
  * - Handles the ScrollPosition - if anyone has a better solution please share it
  */
-public class TaskRecyclerViewFragment extends BaseFragment implements View.OnClickListener {
+public class TaskRecyclerViewFragment extends BaseFragment implements View.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
     private static final String CLASS_TYPE_KEY = "CLASS_TYPE_KEY";
-    public RecyclerView recyclerView;
     public BaseTasksRecyclerViewAdapter recyclerAdapter;
     @Inject
     @Named("UserID")
     String userID;
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
     @Inject
-    TagsHelper tagsHelper;
+    TaskFilterHelper taskFilterHelper;
     LinearLayoutManager layoutManager = null;
-    private String classType;
+
+
+    @BindView(R.id.refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
+    @BindView(R.id.recyclerView)
+    public RecyclerView recyclerView;
+
+    String classType;
     private HabitRPGUser user;
     private View view;
+    @Nullable
     private SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback;
     private ItemTouchHelper.Callback mItemTouchCallback;
+    private String activeFilter;
 
-    public static TaskRecyclerViewFragment newInstance(HabitRPGUser user, String classType,
-                                                       SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback) {
+    public static TaskRecyclerViewFragment newInstance(@Nullable HabitRPGUser user, String classType, @Nullable String activeFilter,
+                                                       @Nullable SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback) {
         TaskRecyclerViewFragment fragment = new TaskRecyclerViewFragment();
         fragment.setRetainInstance(true);
         fragment.user = user;
         fragment.classType = classType;
         fragment.sortCallback = sortCallback;
+        fragment.activeFilter = activeFilter;
         return fragment;
     }
 
@@ -79,7 +94,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
             switch (this.classType) {
                 case Task.TYPE_HABIT:
                     layoutOfType = R.layout.habit_item_card;
-                    this.recyclerAdapter = new HabitsRecyclerViewAdapter(Task.TYPE_HABIT, tagsHelper, layoutOfType, getContext(), userID, sortCallback);
+                    this.recyclerAdapter = new HabitsRecyclerViewAdapter(Task.TYPE_HABIT, taskFilterHelper, layoutOfType, getContext(), userID, sortCallback);
                     allowReordering();
                     break;
                 case Task.TYPE_DAILY:
@@ -88,17 +103,17 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
                     if (user != null) {
                         dailyResetOffset = user.getPreferences().getDayStart();
                     }
-                    this.recyclerAdapter = new DailiesRecyclerViewHolder(Task.TYPE_DAILY, tagsHelper, layoutOfType, getContext(), userID, dailyResetOffset, sortCallback);
+                    this.recyclerAdapter = new DailiesRecyclerViewHolder(Task.TYPE_DAILY, taskFilterHelper, layoutOfType, getContext(), userID, dailyResetOffset, sortCallback);
                     allowReordering();
                     break;
                 case Task.TYPE_TODO:
                     layoutOfType = R.layout.todo_item_card;
-                    this.recyclerAdapter = new TodosRecyclerViewAdapter(Task.TYPE_TODO, tagsHelper, layoutOfType, getContext(), userID, sortCallback);
+                    this.recyclerAdapter = new TodosRecyclerViewAdapter(Task.TYPE_TODO, taskFilterHelper, layoutOfType, getContext(), userID, sortCallback);
                     allowReordering();
                     return;
                 case Task.TYPE_REWARD:
                     layoutOfType = R.layout.reward_item_card;
-                    this.recyclerAdapter = new RewardsRecyclerViewAdapter(Task.TYPE_REWARD, tagsHelper, layoutOfType, getContext(), user, apiHelper);
+                    this.recyclerAdapter = new RewardsRecyclerViewAdapter(Task.TYPE_REWARD, taskFilterHelper, layoutOfType, getContext(), user, apiClient);
                     break;
             }
         }
@@ -112,6 +127,9 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
+
+        taskFilterHelper.setActiveFilter(activeFilter);
+
         mItemTouchCallback = new ItemTouchHelper.Callback() {
             private Integer mFromPosition = null;
 
@@ -152,9 +170,9 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
         };
 
         if (view == null) {
-            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+            view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
 
-            recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
+            ButterKnife.bind(this, view);
 
             android.support.v4.app.FragmentActivity context = getActivity();
 
@@ -168,6 +186,8 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
             if (recyclerView.getAdapter() == null) {
                 this.setInnerAdapter();
             }
+
+            swipeRefreshLayout.setOnRefreshListener(this);
         }
 
         if (savedInstanceState != null) {
@@ -258,4 +278,21 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     public void onEvent(TaskRemovedEvent event) {
         recyclerAdapter.removeTask(event.deletedTaskId);
     }
+
+    @Override
+    public void onRefresh() {
+        swipeRefreshLayout.setRefreshing(true);
+        apiClient.retrieveUser(true)
+                .doOnTerminate(() -> swipeRefreshLayout.setRefreshing(false))
+                .subscribe(
+                        new HabitRPGUserCallback((MainActivity)getActivity()),
+                        throwable -> {}
+                );
+    }
+
+    public void setActiveFilter(String activeFilter) {
+        this.activeFilter = activeFilter;
+        taskFilterHelper.setActiveFilter(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 2032d667b..94d5cc9f6 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
@@ -1,107 +1,66 @@
 package com.habitrpg.android.habitica.ui.fragments.tasks;
 
-import com.github.clans.fab.FloatingActionButton;
-import com.github.clans.fab.FloatingActionMenu;
-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;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
-import com.habitrpg.android.habitica.events.TaskTappedEvent;
-import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
-import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
-import com.habitrpg.android.habitica.events.commands.CreateTagCommand;
-import com.habitrpg.android.habitica.events.commands.DeleteTagCommand;
-import com.habitrpg.android.habitica.events.commands.EditTagCommand;
-import com.habitrpg.android.habitica.events.commands.FilterTasksByTagsCommand;
-import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
-import com.habitrpg.android.habitica.events.commands.UpdateTagCommand;
-import com.habitrpg.android.habitica.helpers.TagsHelper;
-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;
-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.helpers.Debounce;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.habitrpg.android.habitica.ui.menu.EditTagsDrawerItem;
-import com.habitrpg.android.habitica.ui.menu.EditTagsSectionDrawer;
-import com.habitrpg.android.habitica.ui.menu.EditTextDrawer;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.mikepenz.materialdrawer.interfaces.OnCheckedChangeListener;
-import com.mikepenz.materialdrawer.model.SwitchDrawerItem;
-import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 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.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 
-import java.util.ArrayList;
+import com.github.clans.fab.FloatingActionButton;
+import com.github.clans.fab.FloatingActionMenu;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+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.TaskTappedEvent;
+import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
+import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+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;
+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 org.greenrobot.eventbus.Subscribe;
+
 import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
 import javax.inject.Inject;
 
-public class TasksFragment extends BaseMainFragment implements OnCheckedChangeListener {
+public class TasksFragment extends BaseMainFragment {
 
     private static final int TASK_CREATED_RESULT = 1;
     private static final int TASK_UPDATED_RESULT = 2;
 
     public ViewPager viewPager;
     @Inject
-    public TagsHelper tagsHelper; // This will be used for this fragment. Currently being used to help filtering
+    public TaskFilterHelper taskFilterHelper; // This will be used for this fragment. Currently being used to help filtering
     MenuItem refreshItem;
     FloatingActionMenu floatingMenu;
-    Map<Integer, TaskRecyclerViewFragment> ViewFragmentsDictionary = new HashMap<>();
+    SparseArray<TaskRecyclerViewFragment> viewFragmentsDictionary = new SparseArray<>();
+    Map<String, String> activeTaskFilters = new HashMap<>();
 
     private boolean displayingTaskForm;
-    private boolean editingTags;
-    private List<Tag> tags;
-    private HashMap<String, Boolean> tagFilterMap = new HashMap<>();
-    private Debounce filterChangedHandler = new Debounce(1500, 1000) {
-        @Override
-        public void execute() {
-            ArrayList<String> tagList = new ArrayList<>();
-
-            for (Map.Entry<String, Boolean> f : tagFilterMap.entrySet()) {
-                if (f.getValue()) {
-                    tagList.add(f.getKey());
-                }
-            }
-            tagsHelper.setTags(tagList);
-            EventBus.getDefault().post(new FilterTasksByTagsCommand());
-        }
-    };
 
     public void setActivity(MainActivity activity) {
         super.setActivity(activity);
@@ -111,11 +70,11 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        this.usesTabLayout = true;
+        this.usesTabLayout = false;
+        this.usesBottomNavigation = true;
         this.displayingTaskForm = false;
-        this.editingTags = false;
         super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
+        View v = inflater.inflate(R.layout.fragment_fading_viewpager, container, false);
 
 
         viewPager = (ViewPager) v.findViewById(R.id.view_pager);
@@ -140,27 +99,29 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
         loadTaskLists();
 
+        bottomNavigation.setOnTabSelectListener(tabId -> {
+            if (tabId == R.id.tab_habits) {
+                viewPager.setCurrentItem(0);
+            } else if (tabId == R.id.tab_dailies) {
+                viewPager.setCurrentItem(1);
+            } else if (tabId == R.id.tab_todos) {
+                viewPager.setCurrentItem(2);
+            } else if (tabId == R.id.tab_rewards) {
+                viewPager.setCurrentItem(3);
+            }
+        });
+
         return v;
     }
 
     private boolean onFloatingMenuLongClicked(View view) {
         int currentType = viewPager.getCurrentItem();
-        TaskRecyclerViewFragment currentFragment = ViewFragmentsDictionary.get(currentType);
+        TaskRecyclerViewFragment currentFragment = viewFragmentsDictionary.get(currentType);
         String className = currentFragment.getClassName();
         openNewTaskActivity(className);
         return true;
     }
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        if (user != null) {
-            tags = user.getTags();
-            fillTagFilterDrawer(tags);
-        }
-    }
-
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
@@ -177,7 +138,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
         switch (id) {
             case R.id.action_search:
-                this.activity.openDrawer(GravityCompat.END);
+                showFilterDialog();
                 return true;
             case R.id.action_reload:
                 refreshItem = item;
@@ -188,25 +149,24 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
         return super.onOptionsItemSelected(item);
     }
 
-    public void refresh() {
-     /* Attach a rotating ImageView to the refresh item as an ActionView */
-        LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        ImageView iv = (ImageView) inflater.inflate(R.layout.refresh_actionview, null);
-
-        Animation rotation = AnimationUtils.loadAnimation(getActivity(), R.anim.clockwise_rotate);
-        rotation.setRepeatCount(Animation.INFINITE);
-        iv.startAnimation(rotation);
-
-        refreshItem.setActionView(iv);
-
-        if (apiHelper != null) {
-            apiHelper.retrieveUser(true)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(
-                            new HabitRPGUserCallback(activity),
-                            throwable -> stopAnimatingRefreshItem()
-                    );
+    private void showFilterDialog() {
+        TaskFilterDialog dialog = new TaskFilterDialog(getContext(), HabiticaBaseApplication.getComponent());
+        if (user != null) {
+            dialog.setTags(user.getTags());
         }
+        dialog.setActiveTags(taskFilterHelper.getTags());
+        String taskType = getActiveFragment().classType;
+        dialog.setTaskType(taskType, activeTaskFilters.get(taskType));
+        dialog.setListener((activeTaskFilter, activeTags) -> {
+            activeTaskFilters.put(taskType, activeTaskFilter);
+            getActiveFragment().setActiveFilter(activeTaskFilter);
+            taskFilterHelper.setTags(activeTags);
+        });
+        dialog.show();
+    }
+
+    public void refresh() {
+        getActiveFragment().onRefresh();
     }
 
     public void loadTaskLists() {
@@ -219,9 +179,8 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
                 TaskRecyclerViewFragment fragment;
                 SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback =
                         (task, from, to) -> {
-                            if (apiHelper != null) {
-                                apiHelper.apiService.postTaskNewPosition(task.getId(), String.valueOf(to))
-                                        .compose(apiHelper.configureApiCallObserver())
+                            if (apiClient != null){
+                                apiClient.postTaskNewPosition(task.getId(), String.valueOf(to))
                                         .subscribe(aVoid -> {
                                         }, e -> {
                                         });
@@ -230,19 +189,19 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
                 switch (position) {
                     case 0:
-                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_HABIT, sortCallback);
+                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_HABIT, activeTaskFilters.get(Task.TYPE_HABIT), sortCallback);
                         break;
                     case 1:
-                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_DAILY, sortCallback);
+                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_DAILY, activeTaskFilters.get(Task.TYPE_DAILY), sortCallback);
                         break;
                     case 3:
-                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_REWARD, null);
+                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_REWARD, null, null);
                         break;
                     default:
-                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_TODO, sortCallback);
+                        fragment = TaskRecyclerViewFragment.newInstance(user, Task.TYPE_TODO, activeTaskFilters.get(Task.TYPE_TODO),sortCallback);
                 }
 
-                ViewFragmentsDictionary.put(position, fragment);
+                viewFragmentsDictionary.put(position, fragment);
 
                 return fragment;
             }
@@ -267,24 +226,19 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
                 return "";
             }
         });
-
-        if (tabLayout != null) {
-            tabLayout.setupWithViewPager(viewPager);
-        }
     }
     // endregion
 
     //region Events
     public void updateUserData(HabitRPGUser user) {
         super.updateUserData(user);
-        stopAnimatingRefreshItem();
         if (this.user != null) {
-            fillTagFilterDrawer(tags);
-            for (TaskRecyclerViewFragment fragm : ViewFragmentsDictionary.values()) {
-                if (fragm != null) {
-                    BaseTasksRecyclerViewAdapter adapter = fragm.recyclerAdapter;
+            for (int index = 0; index < viewFragmentsDictionary.size(); index++) {
+                TaskRecyclerViewFragment fragment = viewFragmentsDictionary.get(index);
+                if (fragment != null) {
+                    BaseTasksRecyclerViewAdapter adapter = fragment.recyclerAdapter;
                     if (adapter.getClass().equals(DailiesRecyclerViewHolder.class)) {
-                        final DailiesRecyclerViewHolder dailyAdapter = (DailiesRecyclerViewHolder) fragm.recyclerAdapter;
+                        final DailiesRecyclerViewHolder dailyAdapter = (DailiesRecyclerViewHolder) fragment.recyclerAdapter;
                         dailyAdapter.dailyResetOffset = this.user.getPreferences().getDayStart();
                     }
                     AsyncTask.execute(() -> adapter.loadContent(true));
@@ -305,7 +259,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
         Bundle bundle = new Bundle();
         bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type);
-        bundle.putString(TaskFormActivity.USER_ID_KEY, this.user.getId());
+        bundle.putString(TaskFormActivity.USER_ID_KEY, this.user != null ? this.user.getId() : null);
         bundle.putString(TaskFormActivity.ALLOCATION_MODE_KEY, allocationMode);
 
         Intent intent = new Intent(activity, TaskFormActivity.class);
@@ -317,76 +271,13 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
         }
     }
 
-    @Subscribe
-    public void onEvent(final CreateTagCommand event) {
-        UiUtils.dismissKeyboard(activity);
-        final Tag t = new Tag();
-        t.setName(event.tagName);
-        if (apiHelper != null) {
-            apiHelper.apiService.createTag(t)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(tag -> {
-                        // Since we get a list of all tags, we just save them all
-                        tag.user_id = user.getId();
-                        tag.async().save();
-
-                        tags.add(tag);
-                        addTagFilterDrawerItem(tag);
-                    }, throwable -> {
-                        UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), "Error: " + throwable.getMessage(), UiUtils.SnackbarDisplayType.FAILURE);
-                    });
-        }
-    }
-
-    @Subscribe
-    public void onEvent(final DeleteTagCommand event) {
-        final Tag t = event.tag;
-        if (apiHelper != null) {
-            apiHelper.apiService.deleteTag(t.getId())
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(tag -> {
-                        tagFilterMap.remove(t.getId());
-                        filterChangedHandler.hit();
-                        removeTagFilterDrawerItem(t);
-                        EventBus.getDefault().post(new RefreshUserCommand());
-                    }, throwable -> {
-                        UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), "Error: " + throwable.getMessage(), UiUtils.SnackbarDisplayType.FAILURE);
-                    });
-        }
-    }
-
-    @Subscribe
-    public void onEvent(final EditTagCommand event) {
-        showEditTagDialog(event.tag);
-    }
-
-    @Subscribe
-    public void onEvent(final UpdateTagCommand event) {
-        final Tag t = event.tag;
-        final String uuid = event.uuid;
-        if (apiHelper != null) {
-            apiHelper.apiService.updateTag(uuid, t)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(tag -> {
-                        UiUtils.dismissKeyboard(this.activity);
-                        updateTagFilterDrawerItem(tag);
-                        EventBus.getDefault().post(new RefreshUserCommand());
-                    }, throwable -> {
-                        UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), "Error: " + throwable.getMessage(), UiUtils.SnackbarDisplayType.FAILURE);
-                    });
-        }
-    }
-
     @Subscribe
     public void onEvent(RefreshUserCommand event) {
-        if (apiHelper != null) {
-            apiHelper.retrieveUser(true)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(
-                            new HabitRPGUserCallback(activity),
-                            throwable -> stopAnimatingRefreshItem()
-                    );
-        }
+        getActiveFragment().onRefresh();
+    }
+
+    private TaskRecyclerViewFragment getActiveFragment() {
+        return viewFragmentsDictionary.get(viewPager.getCurrentItem());
     }
 
     @Subscribe
@@ -403,7 +294,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
         Bundle bundle = new Bundle();
         bundle.putString(TaskFormActivity.TASK_TYPE_KEY, event.Task.getType());
         bundle.putString(TaskFormActivity.TASK_ID_KEY, event.Task.getId());
-        bundle.putString(TaskFormActivity.USER_ID_KEY, this.user.getId());
+        bundle.putString(TaskFormActivity.USER_ID_KEY, this.user != null ? this.user.getId() : null);
         bundle.putString(TaskFormActivity.ALLOCATION_MODE_KEY, allocationMode);
 
         Intent intent = new Intent(activity, TaskFormActivity.class);
@@ -424,115 +315,8 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
         floatingMenu.close(true);
     }
 
-    @Subscribe
-    public void onEvent(ToggledEditTagsEvent event) {
-        if (user != null) {
-            if (this.editingTags == event.editing) {
-                return;
-            }
-            this.editingTags = event.editing;
-            fillTagFilterDrawer(tags);
-        }
-    }
-
     //endregion Events
 
-    public void fillTagFilterDrawer(List<Tag> tagList) {
-        if (this.tagsHelper != null) {
-            List<IDrawerItem> items = new ArrayList<>();
-
-            if (this.editingTags) {
-                items.add(new EditTagsSectionDrawer().withEditing(this.editingTags).withName(getString(R.string.filter_drawer_edit_tags)));
-                items.add(new EditTextDrawer());
-                if (tagList != null) {
-                    for (Tag t : tagList) {
-                        items.add(new EditTagsDrawerItem()
-                                .withName(t.getName())
-                                .withTag(t)
-                        );
-                    }
-                }
-                if (isAdded()) {
-                    this.activity.fillFilterDrawer(items);
-                }
-            } else {
-                items.add(new EditTagsSectionDrawer().withEditing(this.editingTags).withName(getString(R.string.filter_drawer_filter_tags)));
-                items.add(new EditTextDrawer());
-                if (tagList != null) {
-                    for (Tag t : tagList) {
-                        items.add(new SwitchDrawerItem()
-                                .withName(t.getName())
-                                .withTag(t)
-                                .withChecked(this.tagsHelper.isTagChecked(t.getId()))
-                                .withOnCheckedChangeListener(this)
-                        );
-                    }
-                }
-                if (isAdded()) {
-                    this.activity.fillFilterDrawer(items);
-                }
-            }
-        }
-    }
-
-    public void addTagFilterDrawerItem(Tag tag) {
-        if (this.tagsHelper != null) {
-            if (this.editingTags) {
-                IDrawerItem item = new EditTagsDrawerItem()
-                        .withName(tag.getName())
-                        .withTag(tag);
-                this.activity.addFilterDrawerItem(item);
-            } else {
-                IDrawerItem item = new SwitchDrawerItem()
-                        .withName(tag.getName())
-                        .withTag(tag)
-                        .withChecked(this.tagsHelper.isTagChecked(tag.getId()))
-                        .withOnCheckedChangeListener(this);
-                this.activity.addFilterDrawerItem(item);
-            }
-        }
-    }
-
-    public void removeTagFilterDrawerItem(Tag t) {
-        //Have to add 2 for the Drawer components that reside above the actual tags' ui component.
-        int pos = tags.indexOf(t) + 2;
-        tags.remove(t);
-
-        this.activity.removeFilterDrawerItem(pos);
-    }
-
-    public void updateTagFilterDrawerItem(Tag t) {
-
-        if (this.tagsHelper != null) {
-
-            //Add 2 for the same reason as above
-            int pos = tags.indexOf(t) + 2;
-            IDrawerItem item;
-
-            if (this.editingTags) {
-                item = new EditTagsDrawerItem()
-                        .withName(t.getName())
-                        .withTag(t);
-            } else {
-                item = new SwitchDrawerItem()
-                        .withName(t.getName())
-                        .withTag(t)
-                        .withChecked(this.tagsHelper.isTagChecked(t.getId()))
-                        .withOnCheckedChangeListener(this);
-            }
-            this.activity.updateFilterDrawerItem(item, pos);
-        }
-    }
-
-    @Override
-    public void onCheckedChanged(IDrawerItem iDrawerItem, CompoundButton compoundButton, boolean b) {
-        Tag t = (Tag) iDrawerItem.getTag();
-        if (t != null) {
-            tagFilterMap.put(t.getId(), b);
-            filterChangedHandler.hit();
-        }
-    }
-
     @Override
     public void onDestroyView() {
         this.activity.lockDrawer(GravityCompat.END);
@@ -562,111 +346,22 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
     }
 
     private void switchToTaskTab(String taskType) {
-        HashMap<Integer, TaskRecyclerViewFragment> dict = new HashMap<>(ViewFragmentsDictionary);
-        for (Map.Entry<Integer, TaskRecyclerViewFragment> tabEntry : dict.entrySet()) {
-            if (tabEntry.getValue().getClassName().equals(taskType)) {
-                viewPager.setCurrentItem(tabEntry.getKey());
+        for (int index = 0; index < viewFragmentsDictionary.size(); index++) {
+            if (viewFragmentsDictionary.get(index).getClassName().equals(taskType)) {
+                viewPager.setCurrentItem(index);
             }
         }
     }
 
+    @Nullable
     @Override
     public String getDisplayedClassName() {
         return null;
     }
 
-    public void stopAnimatingRefreshItem() {
-        if (refreshItem != null) {
-            View actionView = refreshItem.getActionView();
-            if (actionView != null) {
-                actionView.clearAnimation();
-            }
-            refreshItem.setActionView(null);
-        }
-    }
-
-    public void showEditTagDialog(Tag tag) {
-
-        Button btnDelete = null;
-
-        final View editTagDialogView = this.activity.getLayoutInflater().inflate(R.layout.dialog_edit_tag, null);
-
-        if (editTagDialogView != null) {
-            EditText tagEditText = (EditText) editTagDialogView.findViewById(R.id.tagEditText);
-            tagEditText.setText(tag.getName());
-
-            btnDelete = (Button) editTagDialogView.findViewById(R.id.btnDelete);
-            ViewHelper.SetBackgroundTint(btnDelete, ContextCompat.getColor(this.activity, R.color.worse_10));
-        }
-
-        AlertDialog alert = new AlertDialog.Builder(this.activity)
-                .setTitle(getString(R.string.edit_tag_title))
-                .setPositiveButton(getString(R.string.save_changes), null)
-                .setNeutralButton(getString(R.string.dialog_go_back), (dialog, which) -> {
-                    EditText tagEditText = (EditText) editTagDialogView.findViewById(R.id.tagEditText);
-                    UiUtils.dismissKeyboard(this.activity, tagEditText);
-                    dialog.cancel();
-                })
-                .create();
-        btnDelete.setOnClickListener((View v) -> {
-            showDeleteTagDialog(alert, tag);
-        });
-        alert.setView(editTagDialogView);
-        alert.show();
-
-        alert.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                EditText tagEditText = (EditText) editTagDialogView.findViewById(R.id.tagEditText);
-                if (attemptUpdateTag(tagEditText, tag)) {
-                    alert.dismiss();
-                }
-            }
-        });
-    }
-
-    public boolean attemptUpdateTag(EditText tagEditText, Tag tag) {
-        String newTagName = tagEditText.getText().toString();
-        boolean dismiss = true;
-
-        if (newTagName.equals("")) {
-            dismiss = false;
-            return dismiss;
-        }
-
-        UiUtils.dismissKeyboard(activity, tagEditText);
-
-        if (newTagName.equals(tag.getName())) {
-            return dismiss;
-        }
-
-        String uuid = tag.getId();
-        tag.setName(newTagName);
-        EventBus.getDefault().post(new UpdateTagCommand(tag, uuid));
-        return dismiss;
-    }
-
-    public void showDeleteTagDialog(AlertDialog d, Tag tag) {
-        AlertDialog confirmDeleteAlert = new AlertDialog.Builder(this.activity)
-                .setTitle(getString(R.string.confirm_delete_tag_title)).setMessage(getString(R.string.confirm_delete_tag_message))
-                .setPositiveButton(getString(R.string.yes), (dialog, which) -> {
-                    EventBus.getDefault().post(new DeleteTagCommand(tag));
-                    UiUtils.dismissKeyboard(this.activity, d.getCurrentFocus());
-                    //dismiss both dialogs
-                    dialog.dismiss();
-                    d.dismiss();
-                })
-                .setNegativeButton(getString(R.string.no), (dialog, which) -> {
-                    dialog.dismiss();
-                })
-                .create();
-        confirmDeleteAlert.show();
-    }
-
-
+    @Nullable
     @Override
     public String customTitle() {
         return null;
     }
-}
+}
\ No newline at end of file
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 909fbe526..07e8a01aa 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
@@ -57,7 +57,7 @@ public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
             if (Math.abs(translationY - this.mTranslationY) == (float) dependency.getHeight()) {
                 ViewCompat.animate(child)
                         .translationY(translationY)
-                        .setListener((ViewPropertyAnimatorListener) null);
+                        .setListener(null);
             } else {
                 ViewCompat.setTranslationY(child, translationY);
             }
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 c92a4e054..8353967d0 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
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.WindowInsets;
 
 //http://stackoverflow.com/a/27801394/1315039
 public class RecyclerViewEmptySupport extends RecyclerView {
@@ -37,6 +38,11 @@ public class RecyclerViewEmptySupport extends RecyclerView {
         super(context, attrs, defStyle);
     }
 
+    @Override
+    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+        return super.onApplyWindowInsets(insets);
+    }
+
     void checkIfEmpty() {
         if (emptyView != null && getAdapter() != null) {
             final boolean emptyViewVisible = getAdapter().getItemCount() == 0;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java
index 91f96e5f4..fb1ab641f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java
@@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.R;
 
 import android.app.Activity;
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
@@ -35,7 +36,7 @@ public class UiUtils {
      * @param view     View that currently has focus
      * @param activity - Current activity
      */
-    public static void dismissKeyboard(Activity activity, View view) {
+    public static void dismissKeyboard(Activity activity, @Nullable View view) {
         InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
         if (view != null) {
             imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsDrawerItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsDrawerItem.java
deleted file mode 100644
index 30a1d09b1..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsDrawerItem.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.habitrpg.android.habitica.ui.menu;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.EditTagCommand;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.mikepenz.fastadapter.utils.ViewHolderFactory;
-import com.mikepenz.materialdrawer.holder.ColorHolder;
-import com.mikepenz.materialdrawer.holder.StringHolder;
-import com.mikepenz.materialdrawer.model.BasePrimaryDrawerItem;
-import com.mikepenz.materialdrawer.model.BaseViewHolder;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Created by jjbillings on 8/12/16.
- */
-public class EditTagsDrawerItem extends BasePrimaryDrawerItem<EditTagsDrawerItem, EditTagsDrawerItem.ViewHolder> {
-
-    private StringHolder name;
-
-    public EditTagsDrawerItem withName(StringHolder name) {
-        this.name = name;
-        return this;
-    }
-
-    public EditTagsDrawerItem withName(String name) {
-        this.name = new StringHolder(name);
-        return this;
-    }
-
-    public EditTagsDrawerItem withName(@StringRes int nameRes) {
-        this.name = new StringHolder(nameRes);
-        return this;
-    }
-
-    public StringHolder getName() {
-        return name;
-    }
-
-
-    @Override
-    public int getType() {
-        return R.id.material_drawer_item_primary_toggle;
-    }
-
-    @Override
-    @LayoutRes
-    public int getLayoutRes() {
-        return R.layout.edit_tags_drawer_item;
-    }
-
-    @Override
-    public void bindView(final ViewHolder viewHolder) {
-        Context ctx = viewHolder.itemView.getContext();
-
-        //set the text for the name
-        StringHolder.applyTo(this.getName(), viewHolder.tagTextView);
-        viewHolder.tagTextView.setTextColor(ColorHolder.color(getTextColor(), ctx, com.mikepenz.materialdrawer.R.attr.material_drawer_primary_text, com.mikepenz.materialdrawer.R.color.material_drawer_primary_text));
-
-        //Setup the Delete Button
-        ViewHelper.SetBackgroundTint(viewHolder.btnEdit, ContextCompat.getColor(ctx, R.color.brand));
-        viewHolder.btnEdit.setEnabled(true);
-
-        viewHolder.tag = (Tag) this.getTag();
-
-        //call the onPostBindView method to trigger post bind view actions (like the listener to modify the item if required)
-        onPostBindView(this, viewHolder.itemView);
-    }
-
-    @Override
-    public ViewHolderFactory<ViewHolder> getFactory() {
-        return new ItemFactory();
-    }
-
-    public static class ItemFactory implements ViewHolderFactory<ViewHolder> {
-        public ViewHolder create(View v) {
-            return new ViewHolder(v);
-        }
-    }
-
-    public static class ViewHolder extends BaseViewHolder implements View.OnClickListener {
-        private TextView tagTextView;
-        private Button btnEdit;
-        private Tag tag;
-
-        private ViewHolder(View view) {
-            super(view);
-            tagTextView = (TextView) view.findViewById(R.id.tagTextView);
-
-            btnEdit = (Button) view.findViewById(R.id.btnEdit);
-            btnEdit.setOnClickListener(this);
-        }
-
-        @Override
-        public void onClick(View view) {
-            if (this.tag != null) {
-                EventBus.getDefault().post(new EditTagCommand(this.tag));
-                //EventBus.getDefault().post(new DeleteTagCommand(this.tag));
-            }
-        }
-
-    }
-
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsSectionDrawer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsSectionDrawer.java
deleted file mode 100644
index 086ad693c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsSectionDrawer.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.habitrpg.android.habitica.ui.menu;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.mikepenz.fastadapter.utils.ViewHolderFactory;
-import com.mikepenz.materialdrawer.holder.ColorHolder;
-import com.mikepenz.materialdrawer.holder.StringHolder;
-import com.mikepenz.materialdrawer.model.AbstractDrawerItem;
-import com.mikepenz.materialdrawer.model.interfaces.Nameable;
-import com.mikepenz.materialdrawer.model.interfaces.Typefaceable;
-import com.mikepenz.materialize.util.UIUtils;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Created by jjbillings on 8/12/16.
- */
-public class EditTagsSectionDrawer extends AbstractDrawerItem<EditTagsSectionDrawer, EditTagsSectionDrawer.ViewHolder> implements Nameable<EditTagsSectionDrawer>, Typefaceable<EditTagsSectionDrawer> {
-
-    private StringHolder name;
-    private boolean divider = true;
-    private boolean editing = false;
-
-    private ColorHolder textColor;
-
-    private Typeface typeface = null;
-
-    public EditTagsSectionDrawer withName(StringHolder name) {
-        this.name = name;
-        return this;
-    }
-
-    public EditTagsSectionDrawer withName(String name) {
-        this.name = new StringHolder(name);
-        return this;
-    }
-
-    public EditTagsSectionDrawer withName(@StringRes int nameRes) {
-        this.name = new StringHolder(nameRes);
-        return this;
-    }
-
-    public EditTagsSectionDrawer withEditing(boolean edit) {
-        this.editing = edit;
-        return this;
-    }
-
-    public EditTagsSectionDrawer withDivider(boolean divider) {
-        this.divider = divider;
-        return this;
-    }
-
-    public EditTagsSectionDrawer withTextColor(int textColor) {
-        this.textColor = ColorHolder.fromColor(textColor);
-        return this;
-    }
-
-    public EditTagsSectionDrawer withTextColorRes(int textColorRes) {
-        this.textColor = ColorHolder.fromColorRes(textColorRes);
-        return this;
-    }
-
-    public EditTagsSectionDrawer withTypeface(Typeface typeface) {
-        this.typeface = typeface;
-        return this;
-    }
-
-    public boolean hasDivider() {
-        return divider;
-    }
-
-    public ColorHolder getTextColor() {
-        return textColor;
-    }
-
-    public StringHolder getName() {
-        return name;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isSelected() {
-        return false;
-    }
-
-    @Override
-    public int getType() {
-        return R.id.material_drawer_item_section;
-    }
-
-    @Override
-    @LayoutRes
-    public int getLayoutRes() {
-        return R.layout.edit_tags_section_drawer_item;
-    }
-
-    @Override
-    public Typeface getTypeface() {
-        return typeface;
-    }
-
-    @Override
-    public void bindView(ViewHolder viewHolder) {
-        Context ctx = viewHolder.itemView.getContext();
-
-        //set the identifier from the drawerItem here. It can be used to run tests
-        viewHolder.itemView.setId(hashCode());
-
-        //define this item to be not clickable nor enabled
-        viewHolder.view.setClickable(false);
-        viewHolder.view.setEnabled(false);
-
-        //define the text color
-        viewHolder.name.setTextColor(ColorHolder.color(getTextColor(), ctx, com.mikepenz.materialdrawer.R.attr.material_drawer_secondary_text, com.mikepenz.materialdrawer.R.color.material_drawer_secondary_text));
-
-        viewHolder.editing = this.editing;
-
-        if (this.editing) {
-            viewHolder.btnEdit.setText(ctx.getString(R.string.edit_tag_btn_done));
-        } else {
-            viewHolder.btnEdit.setText(ctx.getString(R.string.edit_tag_btn_edit));
-        }
-
-        ViewHelper.SetBackgroundTint(viewHolder.btnEdit, ContextCompat.getColor(ctx, R.color.brand));
-
-        //set the text for the name
-        StringHolder.applyTo(this.getName(), viewHolder.name);
-
-        //define the typeface for our textViews
-        if (getTypeface() != null) {
-            viewHolder.name.setTypeface(getTypeface());
-        }
-
-        //hide the divider if we do not need one
-        if (this.hasDivider()) {
-            viewHolder.divider.setVisibility(View.VISIBLE);
-        } else {
-            viewHolder.divider.setVisibility(View.GONE);
-        }
-
-        //set the color for the divider
-        viewHolder.divider.setBackgroundColor(UIUtils.getThemeColorFromAttrOrRes(ctx, com.mikepenz.materialdrawer.R.attr.material_drawer_divider, com.mikepenz.materialdrawer.R.color.material_drawer_divider));
-
-        //call the onPostBindView method to trigger post bind view actions (like the listener to modify the item if required)
-        onPostBindView(this, viewHolder.itemView);
-    }
-
-    @Override
-    public ViewHolderFactory<ViewHolder> getFactory() {
-        return new ItemFactory();
-    }
-
-    public static class ItemFactory implements ViewHolderFactory<ViewHolder> {
-        public ViewHolder create(View v) {
-            return new ViewHolder(v);
-        }
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        private View view;
-        private View divider;
-        private TextView name;
-        private Button btnEdit;
-
-        private boolean editing;
-
-        private ViewHolder(View view) {
-            super(view);
-            this.view = view;
-            this.divider = view.findViewById(R.id.material_drawer_divider);
-            this.name = (TextView) view.findViewById(R.id.drawer_section_name);
-
-            this.btnEdit = (Button) view.findViewById(R.id.btnEdit);
-            this.btnEdit.setOnClickListener(this);
-        }
-
-        @Override
-        public void onClick(View view) {
-            ToggledEditTagsEvent editTagsEvent = new ToggledEditTagsEvent(!this.editing);
-            EventBus.getDefault().post(editTagsEvent);
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTextDrawer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTextDrawer.java
deleted file mode 100644
index d7b86e398..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTextDrawer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.habitrpg.android.habitica.ui.menu;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.CreateTagCommand;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.mikepenz.fastadapter.utils.ViewHolderFactory;
-import com.mikepenz.materialdrawer.model.BasePrimaryDrawerItem;
-import com.mikepenz.materialdrawer.model.BaseViewHolder;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.support.v4.content.ContextCompat;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class EditTextDrawer extends BasePrimaryDrawerItem<EditTextDrawer, EditTextDrawer.ViewHolder> {
-    @Override
-    public int getType() {
-        return R.id.material_drawer_item_primary;
-    }
-
-    @Override
-    public int getLayoutRes() {
-        return R.layout.edit_text_drawer_item;
-    }
-
-    @Override
-    public void bindView(ViewHolder holder) {
-        onPostBindView(this, holder.itemView);
-    }
-
-    @Override
-    public ViewHolderFactory getFactory() {
-        return new ItemFactory();
-    }
-
-    public static class ItemFactory implements ViewHolderFactory<EditTextDrawer.ViewHolder> {
-        public ViewHolder create(View v) {
-            return new ViewHolder(v);
-        }
-    }
-
-    public static class ViewHolder extends BaseViewHolder implements View.OnClickListener {
-
-        View view;
-
-        @BindView(R.id.editText)
-        EditText editText;
-
-        @BindView(R.id.btnAdd)
-        Button btnAdd;
-
-        private ViewHolder(View view) {
-            super(view);
-            this.view = view;
-            ButterKnife.bind(this, view);
-
-            ViewHelper.SetBackgroundTint(btnAdd, ContextCompat.getColor(view.getContext(), R.color.brand));
-
-            btnAdd.setOnClickListener(this);
-        }
-
-        @Override
-        public void onClick(View v) {
-            String text = editText.getText().toString();
-
-            if (text.equals(""))
-                return;
-
-            EventBus.getDefault().post(new CreateTagCommand(editText.getText().toString()));
-
-            editText.setText("");
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java
index 0fd7ded68..db12d14bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java
@@ -70,7 +70,8 @@ public class MainDrawerBuilder {
 
     public static DrawerBuilder CreateDefaultBuilderSettings(final MainActivity activity, SharedPreferences sharedPreferences, Toolbar toolbar, final AccountHeader accountHeader) {
         DrawerBuilder builder = new DrawerBuilder()
-                .withActivity(activity);
+                .withActivity(activity)
+                .withFullscreen(true);
 
         if (toolbar != null) {
             builder.withToolbar(toolbar);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java
index 78e89cd83..787797fcd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java
@@ -16,6 +16,8 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
+import java.util.List;
+
 /**
  * Created by mikepenz on 03.02.15.
  */
@@ -75,29 +77,30 @@ public class SectionIconDrawerItem extends AbstractDrawerItem<SectionIconDrawerI
     }
 
     @Override
-    public void bindView(ViewHolder viewHolder) {
-        Context ctx = viewHolder.itemView.getContext();
+    public void bindView(ViewHolder holder, List<Object> payloads) {
+        super.bindView(holder, payloads);
+        Context ctx = holder.itemView.getContext();
 
         //set the identifier from the drawerItem here. It can be used to run tests
-        viewHolder.itemView.setId(hashCode());
+        holder.itemView.setId(hashCode());
 
         //define this item to be not clickable nor enabled
-        viewHolder.view.setClickable(false);
-        viewHolder.view.setEnabled(false);
+        holder.view.setClickable(false);
+        holder.view.setEnabled(false);
 
         //define the text color
-        viewHolder.name.setTextColor(ContextCompat.getColor(ctx, R.color.white));
+        holder.name.setTextColor(ContextCompat.getColor(ctx, R.color.white));
 
         //set the text for the name
-        StringHolder.applyTo(this.getName(), viewHolder.name);
+        StringHolder.applyTo(this.getName(), holder.name);
 
         //define the typeface for our textViews
         if (getTypeface() != null) {
-            viewHolder.name.setTypeface(getTypeface());
+            holder.name.setTypeface(getTypeface());
         }
 
         //call the onPostBindView method to trigger post bind view actions (like the listener to modify the item if required)
-        onPostBindView(this, viewHolder.itemView);
+        onPostBindView(this, holder.itemView);
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FadingViewPager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FadingViewPager.java
new file mode 100644
index 000000000..b1ef216fd
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FadingViewPager.java
@@ -0,0 +1,50 @@
+package com.habitrpg.android.habitica.ui.views;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+
+
+public class FadingViewPager extends ViewPager {
+    public FadingViewPager(Context context) {
+        super(context);
+
+        setTransformer();
+    }
+
+    public FadingViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setTransformer();
+    }
+
+    private void setTransformer() {
+        this.setPageTransformer(true, (page, position) -> {
+            page.setTranslationX(page.getWidth() * -position);
+
+            if(position <= -1.0F || position >= 1.0F) {
+                page.setAlpha(0.0F);
+                page.setVisibility(View.INVISIBLE);
+            } else if( position == 0.0F ) {
+                page.setVisibility(View.VISIBLE);
+                page.setAlpha(1.0F);
+            } else {
+                page.setVisibility(View.VISIBLE);
+                // position is between -1.0F & 0.0F OR 0.0F & 1.0F
+                page.setAlpha(1.0F - Math.abs(position));
+            }
+        });
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        return false;
+    }
+
+    @Override
+    public boolean onInterceptHoverEvent(MotionEvent event) {
+        return false;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.java
new file mode 100644
index 000000000..b4578275b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.java
@@ -0,0 +1,61 @@
+package com.habitrpg.android.habitica.ui.views.setup;
+
+
+import com.habitrpg.android.habitica.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class AvatarCategoryView extends LinearLayout {
+
+    private final Drawable icon;
+    @BindView(R.id.icon_view)
+    ImageView iconView;
+    @BindView(R.id.text_view)
+    TextView textView;
+
+    public AvatarCategoryView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        inflate(context, R.layout.avatar_category, this);
+
+        ButterKnife.bind(this);
+
+        TypedArray a = context.getTheme().obtainStyledAttributes(
+                attrs,
+                R.styleable.AvatarCategoryView,
+                0, 0);
+
+        textView.setText(a.getText(R.styleable.AvatarCategoryView_categoryTitle));
+
+        icon = a.getDrawable(R.styleable.AvatarCategoryView_iconDrawable);
+        if (icon != null) {
+            iconView.setImageDrawable(icon);
+        }
+        setActive(false);
+    }
+
+    public void setActive(boolean active) {
+        int color;
+        if (active) {
+            color = ContextCompat.getColor(getContext(), R.color.white);
+        } else {
+            color = ContextCompat.getColor(getContext(), R.color.white_50_alpha);
+        }
+        textView.setTextColor(color);
+        if (icon != null) {
+            icon.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
+            iconView.setImageDrawable(icon);
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.java
new file mode 100644
index 000000000..7d4a5117d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.java
@@ -0,0 +1,19 @@
+package com.habitrpg.android.habitica.ui.views.setup;
+
+
+import com.habitrpg.android.habitica.R;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+public class AvatarCustomizationDrawer extends LinearLayout {
+    public AvatarCustomizationDrawer(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+
+        inflate(context, R.layout.avatar_setup_drawer, this);
+    }
+
+
+}
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 9abc0b243..3f9491d8b 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
@@ -120,9 +120,10 @@ public class SubscriptionDetailsView extends LinearLayout {
         if (plan.paymentMethod != null) {
             Intent intent;
             if (plan.paymentMethod.equals("Google")) {
-                intent = new Intent("android.intent.action.VIEW");
-                intent.setComponent(new ComponentName("com.android.vending", "com.android.vending.MyDownloadsActivity"));
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent = new Intent(Intent.ACTION_VIEW)
+                        .setComponent(new ComponentName("com.android.vending",
+                                "com.google.android.finsky.activities.MainActivity"))
+                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             } else {
                 intent = new Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.BASE_URL + "/"));
             }
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
new file mode 100644
index 000000000..6bb6b9bd4
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
@@ -0,0 +1,351 @@
+package com.habitrpg.android.habitica.ui.views.tasks;
+
+import android.content.Context;
+import android.support.annotation.IdRes;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnCheckedChangeListener {
+
+    @Inject
+    TagRepository repository;
+
+    @BindView(R.id.task_type_title)
+    TextView taskTypeTitle;
+
+    @BindView(R.id.task_filter_wrapper)
+    RadioGroup taskFilters;
+    @BindView(R.id.all_task_filter)
+    RadioButton allTaskFilter;
+    @BindView(R.id.second_task_filter)
+    RadioButton secondTaskFilter;
+    @BindView(R.id.third_task_filter)
+    RadioButton thirdTaskFilter;
+
+    @BindView(R.id.tags_title)
+    TextView tagsTitleView;
+    @BindView(R.id.tag_edit_button)
+    Button tagsEditButton;
+    @BindView(R.id.tags_list)
+    LinearLayout tagsList;
+    private String taskType;
+    private OnFilterCompletedListener listener;
+
+    private String filterType;
+    private List<Tag> tags;
+    private List<String> activeTags;
+    private Map<String, Tag> editedTags = new HashMap<>();
+    private Map<String, Tag> createdTags = new HashMap<>();
+    private List<String> deletedTags = new ArrayList<>();
+
+    private boolean isEditing;
+
+    public TaskFilterDialog(Context context, AppComponent component) {
+        super(context);
+        component.inject(this);
+
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate(R.layout.dialog_task_filter, null);
+
+        ButterKnife.bind(this, view);
+
+        taskFilters.setOnCheckedChangeListener(this);
+
+        setTitle(R.string.filters);
+        setView(view);
+        this.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close), (dialog, which) -> {
+            if (isEditing) {
+                stopEditing();
+            }
+            if (listener != null) {
+                listener.onFilterCompleted(filterType, activeTags);
+            }
+            this.dismiss();
+        });
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        if (this.getWindow() != null) {
+            this.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        }
+    }
+
+    public void setTags(List<Tag> tags) {
+        this.tags = tags;
+        createTagViews();
+    }
+
+    private void createTagViews() {
+        for (Tag tag : tags) {
+            CheckBox tagCheckbox = new CheckBox(getContext());
+            tagCheckbox.setText(tag.getName());
+            tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,14);
+            tagCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (isChecked) {
+                    if (!activeTags.contains(tag.getId())) {
+                        activeTags.add(tag.getId());
+                    }
+                } else {
+                    if (activeTags.contains(tag.getId())) {
+                        activeTags.remove(tag.getId());
+                    }
+                }
+            });
+            tagsList.addView(tagCheckbox);
+        }
+        createAddTagButton();
+    }
+
+    private void createAddTagButton() {
+        Button button = new Button(getContext());
+        button.setText(R.string.add_tag);
+        button.setOnClickListener(v -> createTag());
+        tagsList.addView(button);
+    }
+
+    private void createTag() {
+        Tag tag = new Tag();
+        tag.id = UUID.randomUUID().toString();
+        tags.add(tag);
+        createdTags.put(tag.getId(), tag);
+        startEditing();
+    }
+
+    private void startEditing() {
+        isEditing = true;
+        tagsList.removeAllViews();
+        createTagEditViews();
+        tagsEditButton.setText(R.string.done);
+        if (this.getWindow() != null) {
+            this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        }
+    }
+
+    private void stopEditing() {
+        isEditing = false;
+        tagsList.removeAllViews();
+        createTagViews();
+        tagsEditButton.setText(R.string.edit_tag_btn_edit);
+        if (this.getWindow() != null) {
+            this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+        }
+        repository.updateTags(editedTags.values()).subscribe(tag -> editedTags.remove(tag.getId()), throwable -> {});
+        repository.createTags(createdTags.values()).subscribe(tag -> createdTags.remove(tag.getId()), throwable -> {});
+        repository.deleteTags(deletedTags).subscribe(tags1 -> deletedTags.clear(), throwable -> {});
+    }
+
+    private void createTagEditViews() {
+        LayoutInflater inflater = LayoutInflater.from(getContext());
+        for (int index = 0; index < tags.size(); index++) {
+            Tag tag = tags.get(index);
+            createTagEditView(inflater, index, tag);
+        }
+        createAddTagButton();
+    }
+
+    private void createTagEditView(LayoutInflater inflater, int index, Tag tag) {
+        LinearLayout wrapper = (LinearLayout) inflater.inflate(R.layout.edit_tag_item, tagsList, false);
+        EditText tagEditText = (EditText) wrapper.findViewById(R.id.edit_text);
+        tagEditText.setText(tag.getName());
+        tagEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                Tag tag = tags.get(index);
+                tag.setName(s.toString());
+                if (createdTags.containsKey(tag.getId())) {
+                    createdTags.put(tag.getId(), tag);
+                } else {
+                    editedTags.put(tag.getId(), tag);
+                }
+                tags.set(index, tag);
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+        Button deleteButton = (Button) wrapper.findViewById(R.id.delete_button);
+        deleteButton.setOnClickListener(v -> {
+            deletedTags.add(tag.getId());
+            if (createdTags.containsKey(tag.getId())) {
+                createdTags.remove(tag.getId());
+            }
+            if (editedTags.containsKey(tag.getId())) {
+                editedTags.remove(tag.getId());
+            }
+            tags.remove(tag);
+            tagsList.removeView(wrapper);
+        });
+        tagsList.addView(wrapper);
+    }
+
+    public void setActiveTags(List<String> tagIds) {
+        this.activeTags = tagIds;
+        for (String tagId : tagIds) {
+            int index = indexForId(tagId);
+            if (index >= 0) {
+                ((CheckBox)tagsList.getChildAt(index)).setChecked(true);
+            }
+        }
+    }
+
+    private int indexForId(String tagId) {
+        for (int index = 0; index < tags.size(); index++) {
+            if (tagId.equals(tags.get(index).id)) {
+                return index;
+            }
+        }
+        return -1;
+    }
+
+    public void setTaskType(String taskType, String activeFilter) {
+        this.taskType = taskType;
+        switch (taskType) {
+            case Task.TYPE_HABIT: {
+                taskTypeTitle.setText(R.string.habits);
+                allTaskFilter.setText(R.string.all);
+                secondTaskFilter.setText(R.string.weak);
+                thirdTaskFilter.setText(R.string.strong);
+                break;
+            }
+            case Task.TYPE_DAILY: {
+                taskTypeTitle.setText(R.string.dailies);
+                allTaskFilter.setText(R.string.all);
+                secondTaskFilter.setText(R.string.active);
+                thirdTaskFilter.setText(R.string.gray);
+                break;
+            }
+            case Task.TYPE_TODO: {
+                taskTypeTitle.setText(R.string.todos);
+                allTaskFilter.setText(R.string.active);
+                secondTaskFilter.setText(R.string.dated);
+                thirdTaskFilter.setText(R.string.completed);
+                break;
+            }
+        }
+        setActiveFilter(activeFilter);
+    }
+
+    private void setActiveFilter(String activeFilter) {
+        filterType = activeFilter;
+        int checkedId = -1;
+        if (activeFilter == null) {
+            checkedId = R.id.all_task_filter;
+        } else {
+            switch (activeFilter) {
+                case Task.FILTER_ALL:
+                    checkedId = R.id.all_task_filter;
+                    break;
+                case Task.FILTER_WEAK:
+                case Task.FILTER_DATED:
+                    checkedId = R.id.second_task_filter;
+                    break;
+                case Task.FILTER_STRONG:
+                case Task.FILTER_GRAY:
+                case Task.FILTER_COMPLETED:
+                    checkedId = R.id.third_task_filter;
+                    break;
+                case Task.FILTER_ACTIVE:
+                    if (taskType.equals(Task.TYPE_DAILY)) {
+                        checkedId = R.id.second_task_filter;
+                    } else {
+                        checkedId = R.id.all_task_filter;
+                    }
+                    break;
+            }
+        }
+        taskFilters.check(checkedId);
+    }
+
+    @Override
+    public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
+        if (checkedId == R.id.all_task_filter) {
+            if (!taskType.equals(Task.TYPE_TODO)) {
+                filterType = Task.FILTER_ALL;
+            } else {
+                filterType = Task.FILTER_ACTIVE;
+            }
+        } else if (checkedId == R.id.second_task_filter) {
+            switch (taskType) {
+                case Task.TYPE_HABIT:
+                    filterType = Task.FILTER_WEAK;
+                    break;
+                case Task.FREQUENCY_DAILY:
+                    filterType = Task.FILTER_ACTIVE;
+                    break;
+                case Task.TYPE_TODO:
+                    filterType = Task.FILTER_DATED;
+                    break;
+            }
+        } else if (checkedId == R.id.third_task_filter) {
+            switch (taskType) {
+                case Task.TYPE_HABIT:
+                    filterType = Task.FILTER_STRONG;
+                    break;
+                case Task.FREQUENCY_DAILY:
+                    filterType = Task.FILTER_GRAY;
+                    break;
+                case Task.TYPE_TODO:
+                    filterType = Task.FILTER_COMPLETED;
+                    break;
+            }
+        }
+    }
+
+    @OnClick(R.id.tag_edit_button)
+    void editButtonClicked() {
+        isEditing = !isEditing;
+        if (isEditing) {
+            startEditing();
+        } else {
+            stopEditing();
+        }
+    }
+
+    public void setListener(OnFilterCompletedListener listener) {
+        this.listener = listener;
+    }
+
+    public interface OnFilterCompletedListener {
+
+        void onFilterCompleted(String activeTaskFilter, List<String> activeTags);
+    }
+}
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 0b000cf0e..0ccb9e6d5 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,6 +1,6 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
@@ -28,10 +28,7 @@ import javax.inject.Inject;
 
 public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
     private static final String LOG = AvatarStatsWidgetProvider.class.getName();
-    @Inject
-    APIHelper apiHelper;
-    @Inject
-    HostConfig hostConfig;
+
     private AppWidgetManager appWidgetManager;
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
         @Override
@@ -55,8 +52,13 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
         return R.layout.widget_avatar_stats;
     }
 
+    @Inject
+    ApiClient apiClient;
+    @Inject
+    HostConfig hostConfig;
+
     private void setUp(Context context) {
-        if (apiHelper == null) {
+        if (apiClient == null) {
             HabiticaBaseApplication application = HabiticaApplication.getInstance(context);
             application.getComponent().inject(this);
         }
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 2b6825f2f..fec2a1886 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
@@ -12,11 +12,21 @@ import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.util.Pair;
 import android.widget.RemoteViews;
 import android.widget.Toast;
 
-import static com.habitrpg.android.habitica.ui.activities.MainActivity.MIN_LEVEL_FOR_SKILLS;
-import static com.habitrpg.android.habitica.ui.activities.MainActivity.round;
+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 {
 
@@ -67,31 +77,13 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider {
         return configureRemoteViews(remoteViews, widgetId, columns, rows);
     }
 
-    protected void showToastForTaskDirection(Context context, TaskDirectionData taskDirectionData, String userID) {
+    protected void showToastForTaskDirection(Context context, TaskDirectionData data, String userID) {
         HabitRPGUser user = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle();
-        Stats stats = user.getStats();
-        StringBuilder message = new StringBuilder();
-        if (taskDirectionData.exp > stats.getExp()) {
-            message.append(" + ").append(round(taskDirectionData.exp - stats.getExp(), 2)).append(" XP");
-            user.getStats().setExp(taskDirectionData.exp);
-        }
-        if (taskDirectionData.hp < stats.getHp()) {
-            message.append(" - ").append(round(stats.getHp() - taskDirectionData.hp, 2)).append(" HP");
-            user.getStats().setHp(taskDirectionData.hp);
-        }
-        if (taskDirectionData.gp > stats.getGp()) {
-            message.append(" + ").append(round(taskDirectionData.gp - stats.getGp(), 2)).append(" GP");
-            user.getStats().setGp(taskDirectionData.gp);
-        } else if (taskDirectionData.gp < stats.getGp()) {
-            message.append(" - ").append(round(stats.getGp() - taskDirectionData.gp, 2)).append(" GP");
-            stats.setGp(taskDirectionData.gp);
-        }
-        if (taskDirectionData.mp > stats.getMp() && stats.getLvl() >= MIN_LEVEL_FOR_SKILLS) {
-            message.append(" + ").append(round(taskDirectionData.mp - stats.getMp(), 2)).append(" MP");
-            user.getStats().setMp(taskDirectionData.mp);
-        }
+
+        Pair<String, UiUtils.SnackbarDisplayType> pair = NotifyUserUseCase.getNotificationAndAddStatsToUser(user, data.exp, data.hp, data.getGp(), data.mp);
+
         user.save();
-        Toast toast = Toast.makeText(context, message, Toast.LENGTH_LONG);
+        Toast toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG);
         toast.show();
     }
 
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 f794285ab..583d745d1 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.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
@@ -16,12 +16,12 @@ public class DailiesWidgetProvider extends TaskListWidgetProvider {
     public static final String TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM";
 
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
     @Inject
     HostConfig hostConfig;
 
     private void setUp(Context context) {
-        if (apiHelper == null) {
+        if (apiClient == null) {
             HabiticaBaseApplication application = HabiticaApplication.getInstance(context);
             application.getComponent().inject(this);
         }
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 3f6f66140..61b4dff9a 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
@@ -1,14 +1,5 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.habitrpg.android.habitica.APIHelper;
-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.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -17,6 +8,15 @@ import android.os.Build;
 import android.os.Bundle;
 import android.widget.RemoteViews;
 
+import com.magicmicky.habitrpgwrapper.lib.api.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.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
 import javax.inject.Inject;
 
 public class HabitButtonWidgetProvider extends BaseWidgetProvider {
@@ -25,12 +25,12 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
     public static final String TASK_ID = "com.habitrpg.android.habitica.TASK_ID_ITEM";
     public static final String TASK_DIRECTION = "com.habitrpg.android.habitica.TASK_DIRECTION";
     @Inject
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     @Inject
     public HostConfig hostConfig;
 
     private void setUp(Context context) {
-        if (apiHelper == null) {
+        if (apiClient == null) {
             HabiticaBaseApplication application = HabiticaApplication.getInstance(context);
             application.getComponent().inject(this);
         }
@@ -77,8 +77,8 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
             int[] ids = {appWidgetId};
 
             if (taskId != null) {
-                apiHelper.apiService.postTaskDirection(taskId, direction)
-                        .compose(apiHelper.configureApiCallObserver())
+                apiClient.postTaskDirection(taskId, direction)
+
                         .subscribe(taskDirectionData -> {
                             Task task = new Select().from(Task.class).where(Condition.column("id").eq(taskId)).querySingle();
                             task.value = task.value + taskDirectionData.getDelta();
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 8ce0bd9f6..ab73f7c48 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,6 +1,6 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
@@ -28,12 +28,12 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
     public static final String TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM";
 
     @Inject
-    APIHelper apiHelper;
+    ApiClient apiClient;
     @Inject
     HostConfig hostConfig;
 
     private void setUp(Context context) {
-        if (apiHelper == null) {
+        if (apiClient == null) {
             HabiticaBaseApplication application = HabiticaApplication.getInstance(context);
             application.getComponent().inject(this);
         }
@@ -56,8 +56,8 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
             String taskId = intent.getStringExtra(TASK_ID_ITEM);
 
             if (taskId != null) {
-                apiHelper.apiService.postTaskDirection(taskId, TaskDirection.up.toString())
-                        .compose(apiHelper.configureApiCallObserver())
+                apiClient.postTaskDirection(taskId, TaskDirection.up.toString())
+
                         .subscribe(taskDirectionData -> {
                             Task task = new Select().from(Task.class).where(Condition.column("id").eq(taskId)).querySingle();
                             task.completed = true;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiClient.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiClient.java
new file mode 100644
index 000000000..0239fab82
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiClient.java
@@ -0,0 +1,220 @@
+package com.magicmicky.habitrpgwrapper.lib.api;
+
+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.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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import retrofit2.adapter.rxjava.HttpException;
+import rx.Observable;
+
+public interface ApiClient {
+    void setLanguageCode(String languageCode);
+
+    Observable<Status> getStatus();
+
+    Observable<ContentResult> getContent();
+    Observable<ContentResult> getContent(String language);
+
+    /* user API */
+
+    Observable<HabitRPGUser> getUser();
+
+    Observable<HabitRPGUser> updateUser(Map<String, Object> updateDictionary);
+
+    Observable<HabitRPGUser> registrationLanguage(String registrationLanguage);
+
+    Observable<List<ItemData>> getInventoryBuyableGear();
+
+    Observable<Items> equipItem(String type, String itemKey);
+
+    Observable<BuyResponse> buyItem(String itemKey);
+
+    Observable<Void> purchaseItem(String type, String itemKey);
+
+    Observable<Void> purchaseHourglassItem(String type, String itemKey);
+
+    Observable<Void> purchaseMysterySet(String itemKey);
+
+    Observable<Void> purchaseQuest(String key);
+    Observable<Void> validateSubscription(SubscriptionValidationRequest request);
+
+    Observable<HabitRPGUser> sellItem(String itemType, String itemKey);
+
+    Observable<FeedResponse> feedPet(String petKey, String foodKey);
+
+    Observable<Items> hatchPet(String eggKey, String hatchingPotionKey);
+
+
+    Observable<TaskList> getTasks();
+
+    Observable<UnlockResponse> unlockPath(String path);
+
+    Observable<Task> getTask(String id);
+
+    Observable<TaskDirectionData> postTaskDirection(String id, String direction);
+
+    Observable<ArrayList<String>> postTaskNewPosition(String id, String position);
+
+    Observable<Task> scoreChecklistItem(String taskId,  String itemId);
+
+    Observable<Task> createItem(Task item);
+
+    Observable<List<Task>> createTasks(List<Task> tasks);
+
+    Observable<Task> updateTask(String id,  Task item);
+
+    Observable<Void> deleteTask( String id);
+
+
+    Observable<Tag> createTag(Tag tag);
+
+    Observable<Tag> updateTag(String id, Tag tag);
+
+    Observable<Void> deleteTag(String id);
+
+    Observable<UserAuthResponse> registerUser(String username, String email, String password, String confirmPassword);
+
+    Observable<UserAuthResponse> connectUser(String username, String password);
+
+    Observable<UserAuthResponse> connectSocial(String network, String userId, String accessToken);
+    Observable<Boolean> sleep();
+
+    Observable<HabitRPGUser> revive();
+
+    Observable<SkillResponse> useSkill( String skillName, String targetType,  String targetId);
+
+    Observable<SkillResponse> useSkill( String skillName,  String targetType);
+
+    Observable<HabitRPGUser> changeClass();
+
+    Observable<HabitRPGUser> changeClass(String className);
+
+    Observable<HabitRPGUser> disableClasses();
+
+    Observable<Void> markPrivateMessagesRead();
+
+    /* Group API */
+
+    Observable<List<Group>> listGroups(String type);
+
+    Observable<Group> getGroup(String groupId);
+
+    Observable<Void> updateGroup( String id, Group item);
+
+    Observable<List<ChatMessage>> listGroupChat( String groupId);
+
+    Observable<Group> joinGroup(String groupId);
+
+    Observable<Void> leaveGroup( String groupId);
+
+    Observable<PostChatMessageResult> postGroupChat( String groupId, HashMap<String, String> message);
+
+    Observable<Void> deleteMessage( String groupId,  String messageId);
+
+    Observable<List<HabitRPGUser>> getGroupMembers( String groupId,  Boolean includeAllPublicFields);
+
+    Observable<List<HabitRPGUser>> getGroupMembers( String groupId,  Boolean includeAllPublicFields,  String lastId);
+
+    // Like returns the full chat list
+    Observable<ChatMessage> likeMessage( String groupId, String mid);
+
+    Observable<Void> flagMessage(String groupId,  String mid);
+
+    Observable<Void> seenMessages(String groupId);
+
+    Observable<Void> inviteToGroup( String groupId,  Map<String, Object> inviteData);
+
+    Observable<Void> rejectGroupInvite(String groupId);
+
+    Observable<Void> acceptQuest(String groupId);
+
+    Observable<Void> rejectQuest(String groupId);
+
+    Observable<Void> cancelQuest( String groupId);
+
+    Observable<Quest> forceStartQuest( String groupId, Group group);
+
+    Observable<Quest> inviteToQuest( String groupId,String questKey);
+
+    Observable<Quest> abortQuest( String groupId);
+
+    Observable<Void> leaveQuest(String groupId);
+
+    Observable<PurchaseValidationResult> validatePurchase(PurchaseValidationRequest request);
+
+    Observable<HabitRPGUser> changeCustomDayStart(Map<String, Object> updateObject);
+
+    //Members URL
+    Observable<HabitRPGUser> GetMember(String memberId);
+
+    Observable<AchievementResult> GetMemberAchievements(String memberId);
+
+    Observable<PostChatMessageResult> postPrivateMessage(HashMap<String, String> messageDetails);
+
+    Observable<Shop> fetchShopInventory(String identifier);
+
+    //Push notifications
+    Observable<Void> addPushDevice( Map<String, String> pushDeviceData);
+
+    Observable<Void> deletePushDevice(String regId);
+
+    /* challenges api */
+
+    Observable<ArrayList<Challenge>> getUserChallenges();
+
+    Observable<TaskList> getChallengeTasks( String challengeId);
+
+    Observable<Challenge> getChallenge(String challengeId);
+
+    Observable<Challenge> joinChallenge(String challengeId);
+
+    Observable<Void> leaveChallenge(String challengeId, LeaveChallengeBody body);
+
+    //DEBUG: These calls only work on a local development server
+
+    Observable<Void> debugAddTenGems();
+
+    // Notifications
+    Observable<Void> readNotificaiton(String notificationId);
+
+    ErrorResponse getErrorResponse(HttpException throwable);
+
+    void updateAuthenticationCredentials(String userID, String apiToken);
+
+    boolean hasAuthenticationKeys();
+
+    Observable<HabitRPGUser> retrieveUser(boolean b);
+
+    <T> Observable.Transformer<HabitResponse<T>, T> configureApiCallObserver();
+
+    Observable<ItemData> openMysteryItem();
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
index a71a5dbb3..d442c23fa 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
@@ -295,7 +295,7 @@ public interface ApiService {
 
     // Notifications
     @POST("notifications/{notificationId}/read")
-    Observable<HabitResponse<Void>> readNotificaiton(@Path("notificationId") String notificationId);
+    Observable<HabitResponse<Void>> readNotification(@Path("notificationId") String notificationId);
 
     @POST("user/open-mystery-item")
     Observable<HabitResponse<ItemData>> openMysteryItem();
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index 6e2325681..0aba31254 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -399,6 +399,7 @@ public class HabitRPGUser extends BaseModel {
         List<Challenge> newChallenges = new ArrayList<>();
         if (getChallenges() != null) {
             for (String s : getChallenges()) {
+
                 boolean challengeExistInDatabase = false;
 
                 for (Challenge challenge : challenges) {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
index f4ae4e11a..edd9b76e8 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
@@ -185,8 +185,12 @@ public class Preferences extends BaseModel {
     }
 
     public String getChair() {
-        if (chair != null && !chair.equals("none") && chair.length() > 5 && !chair.substring(0, 6).equals("chair_")) {
-            return "chair_" + chair;
+        if (chair != null && !chair.equals("none")) {
+            if (chair.length() > 5 && !chair.substring(0, 6).equals("chair_")) {
+                return chair;
+            } else {
+                return "chair_" +chair;
+            }
         }
         return null;
     }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SetupCustomization.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SetupCustomization.java
new file mode 100644
index 000000000..e25ab6cca
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SetupCustomization.java
@@ -0,0 +1,111 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+
+public class SetupCustomization {
+
+    public String key;
+    public Integer drawableId;
+    public Integer colorId;
+    public String text;
+    public String path;
+    public String category;
+    public String subcategory;
+
+    public SetupCustomization() {
+        super();
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public static SetupCustomization createSize(String key, int drawableId, String text) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.drawableId = drawableId;
+        customization.text = text;
+        customization.path = "size";
+        customization.category = "body";
+        customization.subcategory = "size";
+        return customization;
+    }
+
+    public static SetupCustomization createShirt(String key, int drawableId) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.drawableId = drawableId;
+        customization.path = "shirt";
+        customization.category = "body";
+        customization.subcategory = "shirt";
+        return customization;
+    }
+
+    public static SetupCustomization createSkin(String key, Integer colorId) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.colorId = colorId;
+        customization.path = "skin";
+        customization.category = "skin";
+        return customization;
+    }
+
+    public static SetupCustomization createHairColor(String key, Integer colorId) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.colorId = colorId;
+        customization.path = "hair.color";
+        customization.category = "hair";
+        customization.subcategory = "color";
+        return customization;
+    }
+
+    public static SetupCustomization createHairBangs(String key, Integer drawableId) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.drawableId = drawableId;
+        customization.path = "hair.bangs";
+        customization.category = "hair";
+        customization.subcategory = "bangs";
+        return customization;
+    }
+
+    public static SetupCustomization createHairPonytail(String key, Integer drawableId) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.drawableId = drawableId;
+        customization.path = "hair.base";
+        customization.category = "hair";
+        customization.subcategory = "base";
+        return customization;
+    }
+
+    public static SetupCustomization createGlasses(String key, Integer drawableId) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.drawableId = drawableId;
+        customization.path = "glasses";
+        customization.category = "extras";
+        customization.subcategory = "glasses";
+        return customization;
+    }
+
+    public static SetupCustomization createFlower(String key, Integer drawableId) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.drawableId = drawableId;
+        customization.path = "hair.flower";
+        customization.category = "extras";
+        customization.subcategory = "flower";
+        return customization;
+    }
+
+    public static SetupCustomization createWheelchair(String key, Integer drawableId) {
+        SetupCustomization customization = new SetupCustomization();
+        customization.key = key;
+        customization.drawableId = drawableId;
+        customization.path = "chair";
+        customization.category = "extras";
+        customization.subcategory = "wheelchair";
+        return customization;
+    }
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ItemData.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ItemData.java
index ea35ee474..158431e54 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ItemData.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ItemData.java
@@ -20,8 +20,13 @@ public class ItemData extends BaseModel {
     @PrimaryKey
     @Column
     public String key;
+
     @Column
     public String klass;
+
+    @Column
+    public String specialClass;
+
     @Column(name = "_index")
     public String index;
     @Column
@@ -71,6 +76,15 @@ public class ItemData extends BaseModel {
         this.klass = klass;
     }
 
+    public String getSpecialClass() {
+        return specialClass;
+    }
+
+    public void setSpecialClass(String specialClass) {
+        this.specialClass = specialClass;
+    }
+
+
     public String getIndex() {
         return index;
     }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
index 243514a52..1ec9ba3c9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
@@ -38,6 +38,13 @@ public class Task extends BaseModel {
     public static final String TYPE_TODO = "todo";
     public static final String TYPE_DAILY = "daily";
     public static final String TYPE_REWARD = "reward";
+    public static final String FILTER_ALL = "all";
+    public static final String FILTER_WEAK = "weak";
+    public static final String FILTER_STRONG = "strong";
+    public static final String FILTER_ACTIVE = "active";
+    public static final String FILTER_GRAY = "gray";
+    public static final String FILTER_DATED = "dated";
+    public static final String FILTER_COMPLETED = "completed";
     public static final String FREQUENCY_WEEKLY = "weekly";
     public static final String FREQUENCY_DAILY = "daily";
     public static final String ATTRIBUTE_STRENGTH = "str";
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ItemDataListDeserializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ItemDataListDeserializer.java
index 0ef8fca41..ac78948e9 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ItemDataListDeserializer.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ItemDataListDeserializer.java
@@ -1,66 +1,67 @@
-package com.magicmicky.habitrpgwrapper.lib.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-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.raizlabs.android.dbflow.sql.language.Select;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class ItemDataListDeserializer implements JsonDeserializer<List<ItemData>> {
-    @Override
-    public List<ItemData> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<ItemData> vals = new ArrayList<>();
-        if (json.isJsonObject()) {
-            JsonObject object = json.getAsJsonObject();
-
-            List<ItemData> existingItems = new Select().from(ItemData.class).queryList();
-
-            for (ItemData item : existingItems) {
-                if (object.has(item.key)) {
-                    JsonElement itemObject = object.get(item.key);
-
-                    if (itemObject.isJsonObject()) {
-                        ItemData parsedItem = context.deserialize(itemObject.getAsJsonObject(), ItemData.class);
-                        item.text = parsedItem.text;
-                        item.value = parsedItem.value;
-                        item.type = parsedItem.type;
-                        item.klass = parsedItem.klass;
-                        item.index = parsedItem.index;
-                        item.notes = parsedItem.notes;
-                        item.con = parsedItem.con;
-                        item.str = parsedItem.str;
-                        item.per = parsedItem.per;
-                        item._int = parsedItem._int;
-                    }
-                    vals.add(item);
-                    object.remove(item.key);
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-                ItemData item;
-                if (entry.getValue().isJsonObject()) {
-                    item = context.deserialize(entry.getValue(), ItemData.class);
-                } else {
-                    item = new ItemData();
-                    item.key = entry.getKey();
-                }
-                vals.add(item);
-            }
-        } else {
-            for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((ItemData) context.deserialize(item.getAsJsonObject(), ItemData.class));
-            }
-        }
-
-        return vals;
-    }
-}
+package com.magicmicky.habitrpgwrapper.lib.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+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.raizlabs.android.dbflow.sql.language.Select;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ItemDataListDeserializer implements JsonDeserializer<List<ItemData>> {
+    @Override
+    public List<ItemData> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<ItemData> vals = new ArrayList<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            List<ItemData> existingItems = new Select().from(ItemData.class).queryList();
+
+            for (ItemData item : existingItems) {
+                if (object.has(item.key)) {
+                    JsonElement itemObject = object.get(item.key);
+
+                    if (itemObject.isJsonObject()) {
+                        ItemData parsedItem = context.deserialize(itemObject.getAsJsonObject(), ItemData.class);
+                        item.text = parsedItem.text;
+                        item.value = parsedItem.value;
+                        item.type = parsedItem.type;
+                        item.klass = parsedItem.klass;
+                        item.specialClass = parsedItem.specialClass;
+                        item.index = parsedItem.index;
+                        item.notes = parsedItem.notes;
+                        item.con = parsedItem.con;
+                        item.str = parsedItem.str;
+                        item.per = parsedItem.per;
+                        item._int = parsedItem._int;
+                    }
+                    vals.add(item);
+                    object.remove(item.key);
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                ItemData item;
+                if (entry.getValue().isJsonObject()) {
+                    item = context.deserialize(entry.getValue(), ItemData.class);
+                } else {
+                    item = new ItemData();
+                    item.key = entry.getKey();
+                }
+                vals.add(item);
+            }
+        } else {
+            for (JsonElement item : json.getAsJsonArray()) {
+                vals.add((ItemData) context.deserialize(item.getAsJsonObject(), ItemData.class));
+            }
+        }
+
+        return vals;
+    }
+}
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 c960f92a4..5a32217f9 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,7 +1,7 @@
 package com.habitrpg.android.habitica.api;
 
 
-import com.habitrpg.android.habitica.APIHelper;
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.HostConfig;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
@@ -18,7 +18,7 @@ import rx.observers.TestSubscriber;
 
 public class BaseAPITests {
 
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     public HostConfig hostConfig;
 
     public String username;
@@ -33,14 +33,14 @@ public class BaseAPITests {
                 BuildConfig.PORT,
                 "",
                 "");
-        apiHelper = new APIHelper(APIHelper.createGsonFactory(), hostConfig);
+        apiClient = new ApiClient(ApiClient.createGsonFactory(), hostConfig);
         generateUser();
     }
 
     public void generateUser() {
         TestSubscriber<HabitResponse<UserAuthResponse>> testSubscriber = new TestSubscriber<>();
         username = UUID.randomUUID().toString();
-        apiHelper.registerUser(username, username+"@example.com", password, password)
+        apiClient.registerUser(username, username+"@example.com", password, password)
         .subscribe(testSubscriber);
         testSubscriber.assertCompleted();
         UserAuthResponse response = testSubscriber.getOnNextEvents().get(0).getData();
@@ -51,7 +51,7 @@ public class BaseAPITests {
     public HabitRPGUser getUser() {
         TestSubscriber<HabitResponse<HabitRPGUser>> userSubscriber = new TestSubscriber<>();
 
-        apiHelper.apiService.getUser().subscribe(userSubscriber);
+        apiClient.getUser().subscribe(userSubscriber);
         userSubscriber.assertNoErrors();
         userSubscriber.assertCompleted();
         HabitRPGUser user = userSubscriber.getOnNextEvents().get(0).getData();
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 5aca0be29..76e4dbc09 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
@@ -38,7 +38,7 @@ public class SocialAPITests extends BaseAPITests {
         HashMap<String, String> messageObject = new HashMap<>();
         messageObject.put("message", "Foo Bar"+messageSuffix);
         TestSubscriber<HabitResponse<PostChatMessageResult>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.postGroupChat(groupID, messageObject).subscribe(testSubscriber);
+        apiClient.postGroupChat(groupID, messageObject).subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         PostChatMessageResult result = testSubscriber.getOnNextEvents().get(0).getData();
@@ -51,7 +51,7 @@ public class SocialAPITests extends BaseAPITests {
         postMessage(groupID, "1");
 
         TestSubscriber<HabitResponse<Group>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.getGroup(groupID).subscribe(testSubscriber);
+        apiClient.getGroup(groupID).subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         testSubscriber.assertValueCount(1);
@@ -64,7 +64,7 @@ public class SocialAPITests extends BaseAPITests {
         postMessage(groupID, "2");
 
         TestSubscriber<HabitResponse<List<ChatMessage>>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.listGroupChat(groupID).subscribe(testSubscriber);
+        apiClient.listGroupChat(groupID).subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         testSubscriber.assertValueCount(1);
@@ -74,7 +74,7 @@ public class SocialAPITests extends BaseAPITests {
     public void tearDown() {
         TestSubscriber<HabitResponse<Void>> testSubscriber = new TestSubscriber<>();
         for (String messageID : this.messagesIDs) {
-            apiHelper.apiService.deleteMessage("habitrpg", messageID)
+            apiClient.deleteMessage("habitrpg", messageID)
                     .subscribe(testSubscriber);
             testSubscriber.assertNoErrors();
             testSubscriber.assertCompleted();
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 66418f61e..5a7602111 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
@@ -26,7 +26,7 @@ public class TagAPITests extends BaseAPITests {
         TestSubscriber<HabitResponse<Tag>> testSubscriber = new TestSubscriber<>();
         Tag tag = new Tag();
         tag.setName("foo");
-        apiHelper.apiService.createTag(tag).subscribe(testSubscriber);
+        apiClient.createTag(tag).subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         testSubscriber.assertValueCount(1);
@@ -44,7 +44,7 @@ public class TagAPITests extends BaseAPITests {
 
         //Attempt to update the test user's first tag
         String testId = getUser().getTags().get(0).getId();
-        apiHelper.apiService.updateTag(testId,t).subscribe(testSubscriber);
+        apiClient.updateTag(testId,t).subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         Assert.assertEquals(newname,testSubscriber.getOnNextEvents().get(0).getData().getName());
@@ -56,7 +56,7 @@ public class TagAPITests extends BaseAPITests {
         TestSubscriber<HabitResponse<Void>> testSub = new TestSubscriber<>();
 
         String testId = getUser().getTags().get(0).getId();
-        apiHelper.apiService.deleteTag(testId).subscribe(testSub);
+        apiClient.deleteTag(testId).subscribe(testSub);
         testSub.assertNoErrors();
         testSub.assertCompleted();
     }
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 5797fd977..d80df7370 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
@@ -36,10 +36,10 @@ public class TaskAPITests extends BaseAPITests {
     public void setUp() {
         super.setUp();
         TestSubscriber<HabitResponse<TaskList>> oldTaskSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.getTasks().subscribe(oldTaskSubscriber);
+        apiClient.getTasks().subscribe(oldTaskSubscriber);
         TaskList tasks = oldTaskSubscriber.getOnNextEvents().get(0).getData();
         for (Task task : tasks.tasks.values()) {
-            apiHelper.apiService.deleteTask(task.getId()).subscribe(new TestSubscriber<>());
+            apiClient.deleteTask(task.getId()).subscribe(new TestSubscriber<>());
         }
 
         List<Task> randomTasks = new ArrayList<>();
@@ -56,7 +56,7 @@ public class TaskAPITests extends BaseAPITests {
         reward1 = randomTasks.get(6);
         randomTasks.add(createRandomTask("8", "reward"));
         TestSubscriber<HabitResponse<List<Task>>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.createTasks(randomTasks).subscribe(testSubscriber);
+        apiClient.createTasks(randomTasks).subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
     }
@@ -75,7 +75,7 @@ public class TaskAPITests extends BaseAPITests {
     @Test
     public void shouldLoadAllTasksFromServer() {
         TestSubscriber<HabitResponse<TaskList>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.getTasks().subscribe(testSubscriber);
+        apiClient.getTasks().subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         TaskList taskList = testSubscriber.getOnNextEvents().get(0).getData();
@@ -85,7 +85,7 @@ public class TaskAPITests extends BaseAPITests {
     @Test
     public void shouldBeAbleToScoreTaskUp() {
         TestSubscriber<HabitResponse<TaskDirectionData>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.postTaskDirection(habit1.getId(), "up").subscribe(testSubscriber);
+        apiClient.postTaskDirection(habit1.getId(), "up").subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         TaskDirectionData data = testSubscriber.getOnNextEvents().get(0).getData();
@@ -95,7 +95,7 @@ public class TaskAPITests extends BaseAPITests {
     @Test
     public void shouldBeAbleToScoreTaskDown() {
         TestSubscriber<HabitResponse<TaskDirectionData>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.postTaskDirection(habit1.getId(), "down").subscribe(testSubscriber);
+        apiClient.postTaskDirection(habit1.getId(), "down").subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         TaskDirectionData data = testSubscriber.getOnNextEvents().get(0).getData();
@@ -105,11 +105,11 @@ public class TaskAPITests extends BaseAPITests {
     @Test
     public void shouldBeAbleToDeleteATask() {
         TestSubscriber<HabitResponse<Void>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.deleteTask(habit1.getId()).subscribe(testSubscriber);
+        apiClient.deleteTask(habit1.getId()).subscribe(testSubscriber);
         testSubscriber.assertCompleted();
         testSubscriber.assertNoErrors();
         TestSubscriber<HabitResponse<TaskList>> newTaskListSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.getTasks().subscribe(newTaskListSubscriber);
+        apiClient.getTasks().subscribe(newTaskListSubscriber);
         TaskList taskList = newTaskListSubscriber.getOnNextEvents().get(0).getData();
         assertEquals(7, taskList.tasks.size());
     }
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 5036d11f9..89ed0bec7 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
@@ -27,7 +27,7 @@ public class UserAPITests extends BaseAPITests {
     @Test
     public void shouldLoadUserFromServer() {
         TestSubscriber<HabitResponse<HabitRPGUser>> testSubscriber = new TestSubscriber<>();
-        apiHelper.apiService.getUser().subscribe(testSubscriber);
+        apiClient.getUser().subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         testSubscriber.assertValueCount(1);
@@ -36,7 +36,7 @@ public class UserAPITests extends BaseAPITests {
     @Test
     public void shouldLoadCompleteUserFromServer() {
         TestSubscriber<HabitResponse<HabitRPGUser>> testSubscriber = new TestSubscriber<>();
-        apiHelper.retrieveUser(true).subscribe(testSubscriber);
+        apiClient.retrieveUser(true).subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         testSubscriber.assertValueCount(1);
@@ -48,7 +48,7 @@ public class UserAPITests extends BaseAPITests {
         hostConfig.setApi("");
         TestSubscriber<HabitResponse<UserAuthResponse>> testSubscriber = new TestSubscriber<>();
         username = UUID.randomUUID().toString();
-        apiHelper.registerUser(username, username+"@example.com", password, password)
+        apiClient.registerUser(username, username+"@example.com", password, password)
                 .subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
@@ -61,7 +61,7 @@ public class UserAPITests extends BaseAPITests {
     @Test
     public void shouldLoginExistingUser() {
         TestSubscriber<HabitResponse<UserAuthResponse>> testSubscriber = new TestSubscriber<>();
-        apiHelper.connectUser(username, password).subscribe(testSubscriber);
+        apiClient.connectUser(username, password).subscribe(testSubscriber);
         testSubscriber.assertNoErrors();
         testSubscriber.assertCompleted();
         UserAuthResponse response = testSubscriber.getOnNextEvents().get(0).getData();
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 e471383a0..d1d732fd4 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,6 +1,10 @@
 package com.habitrpg.android.habitica.helpers;
 
-import com.habitrpg.android.habitica.APIHelper;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.os.Build;
+
+import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
 import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
@@ -17,14 +21,10 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.ShadowApplication;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.os.Build;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify;
 @RunWith(RobolectricTestRunner.class)
 public class PopupNotificationsManagerTest {
 
-    public APIHelper apiHelper;
+    public ApiClient apiClient;
     public HostConfig hostConfig;
 
     public String username;
@@ -52,13 +52,13 @@ public class PopupNotificationsManagerTest {
                 "",
                 "");
 
-        apiHelper = new APIHelper(APIHelper.createGsonFactory(), hostConfig);
+        apiClient = new ApiClient(ApiClient.createGsonFactory(), hostConfig);
     }
 
     @Test
     public void itDoesNothingWhenNotificationsListIsEmpty() {
         List<Notification> notifications = new ArrayList<>();
-        PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(apiHelper, context);
+        PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(apiClient);
         popupNotificationsManager.showNotificationDialog(notifications);
 
         AlertDialog alert =
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
new file mode 100644
index 000000000..9e77d9aca
--- /dev/null
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
@@ -0,0 +1,120 @@
+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.Preferences;
+import com.magicmicky.habitrpgwrapper.lib.models.Stats;
+import com.magicmicky.habitrpgwrapper.lib.models.inventory.Item;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringJoiner;
+
+/**
+ * Created by Keith Holliday on 3/31/2017.
+ */
+
+public class UserStatComputerTest {
+
+    private UserStatComputer userStatComputer;
+    private HabitRPGUser user;
+    private ItemData itemData;
+    private List<ItemData> itemDataList;
+    private String key;
+    private String text;
+
+    int str = 1;
+    int intStat = 2;
+    int per = 3;
+    int con = 4;
+
+    public UserStatComputerTest () {
+        userStatComputer = new UserStatComputer();
+        user = new HabitRPGUser();
+        Stats stats = new Stats();
+        user.setStats(stats);
+
+        key = "example-key";
+        text = "example-text";
+
+        itemData = new ItemData();
+        itemData.setKey(key);
+        itemData.setText(text);
+        itemData.setStr(str);
+        itemData.set_int(intStat);
+        itemData.setPer(per);
+        itemData.setCon(con);
+
+        itemDataList = new ArrayList<>();
+        itemDataList.add(itemData);
+    }
+
+    @Test
+    public void shouldReturnCorrectEquipmentRow () {
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        UserStatComputer.EquipmentRow equipmentRow = (UserStatComputer.EquipmentRow) statsRows.get(0);
+
+        Assert.assertEquals(key, equipmentRow.gearKey);
+        Assert.assertEquals(text, equipmentRow.text);
+        Assert.assertEquals("STR 1, INT 2, CON 4, PER 3", equipmentRow.stats);
+    }
+
+    @Test
+    public void shouldReturnClassBonusRowWhenClassMatches () {
+        user.getStats().set_class(HabitRpgClass.rogue);
+        itemData.setKlass(HabitRpgClass.rogue.toString());
+
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
+
+        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
+        Assert.assertEquals(str * 0.5f, attributeRow.strVal);
+        Assert.assertEquals(intStat * 0.0f, attributeRow.intVal);
+        Assert.assertEquals(con * 0.0f, attributeRow.conVal);
+        Assert.assertEquals(per * 0.5f, attributeRow.perVal);
+        Assert.assertFalse(attributeRow.roundDown);
+        Assert.assertFalse(attributeRow.isSummary);
+    }
+
+    @Test
+    public void ShouldReturnClassBonusRowWhenSpecialClassMatches () {
+        user.getStats().set_class(HabitRpgClass.rogue);
+        itemData.setKlass("");
+        itemData.setSpecialClass(HabitRpgClass.rogue.toString());
+
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
+
+        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
+        Assert.assertEquals(str * 0.5f, attributeRow.strVal);
+        Assert.assertEquals(intStat * 0.0f, attributeRow.intVal);
+        Assert.assertEquals(con * 0.0f, attributeRow.conVal);
+        Assert.assertEquals(per * 0.5f, attributeRow.perVal);
+        Assert.assertFalse(attributeRow.roundDown);
+        Assert.assertFalse(attributeRow.isSummary);
+    }
+
+    @Test
+    public void shouldNotReturnClassBonusWhenClassDoesNotMatch () {
+        user.getStats().set_class(HabitRpgClass.rogue);
+        itemData.setKlass("");
+        itemData.setSpecialClass("");
+
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
+
+        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
+        Assert.assertEquals(str *0.0f, attributeRow.strVal);
+        Assert.assertEquals(intStat * 0.0f, attributeRow.intVal);
+        Assert.assertEquals(con * 0.0f, attributeRow.conVal);
+        Assert.assertEquals(per * 0.0f, attributeRow.perVal);
+        Assert.assertFalse(attributeRow.roundDown);
+        Assert.assertFalse(attributeRow.isSummary);
+    }
+}
diff --git a/_gsdata_/_cleanup.gss b/_gsdata_/_cleanup.gss
new file mode 100644
index 000000000..e69de29bb
diff --git a/_gsdata_/_file_state_v4._gs b/_gsdata_/_file_state_v4._gs
new file mode 100644
index 000000000..ca2f0029b
Binary files /dev/null and b/_gsdata_/_file_state_v4._gs differ
diff --git a/_gsdata_/_insync_v4.gsl b/_gsdata_/_insync_v4.gsl
new file mode 100644
index 000000000..27e070602
--- /dev/null
+++ b/_gsdata_/_insync_v4.gsl
@@ -0,0 +1,2 @@
+By: HabitRPG-Android.Eugen@XMG_P702 at: 2016.12.21 21:13:40 Mitteleuropäische Zeit
+C:/Users/Eugen/Documents/GitHub/habitrpg-android
\ No newline at end of file